Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed StrictVersion checking of setuptools to LooseVersion #56218

Merged
merged 4 commits into from
Mar 10, 2020

Conversation

raddessi
Copy link
Contributor

What does this PR do?

Fixes an installation issue in conda envs

What issues does this PR fix or reference?

#56184

Previous Behavior

Install doesnt work

New Behavior

Install works

Tests written?

No

Commits signed with GPG?

No... I know I should know better it's on my list

@raddessi raddessi requested a review from a team as a code owner February 21, 2020 05:11
@ghost ghost requested a review from waynew February 21, 2020 05:11
setup.py Outdated Show resolved Hide resolved
@Ch3LL Ch3LL requested a review from s0undt3ch February 26, 2020 14:25
Copy link
Collaborator

@s0undt3ch s0undt3ch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As Megan pointed out. Let's remove the unused import.

@raddessi
Copy link
Contributor Author

raddessi commented Feb 26, 2020 via email

@s0undt3ch
Copy link
Collaborator

We will blacken salt as soon as we start merging into master.
Lint should have caught this but we might have disabled the check somewhere.

@raddessi
Copy link
Contributor Author

Will 3000.1 be the first merge to master?

@Ch3LL
Copy link
Contributor

Ch3LL commented Feb 26, 2020

Will 3000.1 be the first merge to master?

I'm not sure what you are asking? 3000.1 release will be tagged from the master branch if that is what you are asking.

@raddessi
Copy link
Contributor Author

Ah sorry I thought you all were going to do a mass merge of all the items marked for 3000.1 and then tag it, I must misunderstand something, I'll re read the new merge strategy doc. Thanks again

@Ch3LL
Copy link
Contributor

Ch3LL commented Feb 26, 2020

Oh no worries, i think i just misunderstood the question. This is the project board we are using to track what issues need to get in for 3000.1, looks like your issue is under commit, so looks like we will get this one in :)

@Ch3LL
Copy link
Contributor

Ch3LL commented Feb 26, 2020

errr sometimes it helps to include links you refer to lol https://github.com/saltstack/salt/projects/8

@raddessi
Copy link
Contributor Author

Totally, I got what you meant. Yes that was the board I was thinking of also :) thanks

@Ch3LL Ch3LL added the v3000.1 vulnerable version label Mar 6, 2020
@s0undt3ch s0undt3ch self-assigned this Mar 9, 2020
@dwoz dwoz merged commit 7c4d879 into saltstack:master Mar 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v3000.1 vulnerable version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants