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.

Sign up for GitHub

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
Merged

Changed StrictVersion checking of setuptools to LooseVersion #56218

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31bb0f7
Changed StrictVersion checking of setuptools to LooseVersion
Feb 21, 2020
82773a9
Removed now-unused StrictVersion import from setup.py
Feb 26, 2020
566c03b
Merge branch 'master' into master.v3000-conda
dwoz Mar 10, 2020
44556f6
Merge branch 'master' into master.v3000-conda
s0undt3ch Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Changed StrictVersion checking of setuptools to LooseVersion
  • Loading branch information
Ryan Addessi (raddessi) committed Feb 21, 2020
commit 31bb0f7cd198a08e6e5cf488c49cb6aac7134f47
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ def finalize_options(self):

def run(self):
from distutils.version import StrictVersion
Ch3LL marked this conversation as resolved.
Show resolved Hide resolved
if StrictVersion(setuptools.__version__) < StrictVersion('9.1'):
if LooseVersion(setuptools.__version__) < LooseVersion('9.1'):
sys.stderr.write(
'\n\nInstalling Salt requires setuptools >= 9.1\n'
'Available setuptools version is {}\n\n'.format(setuptools.__version__)
Expand Down