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

Import StrictVersion and LooseVersion from setuptools.distutils.verison or setuptools._distutils.version #63352

Merged
merged 4 commits into from
Dec 22, 2022

Conversation

dmurphy18
Copy link
Contributor

What does this PR do?

Import StrictVersion and LooseVersion from setuptools.distutils.verison or setuptools._distutils.version if the first attempt to import fails, thus allow for old and newer versions of setuptools.

What issues does this PR fix or reference?

Fixes: #63350

Previous Behavior

Test would fail on Debian 10, due to ImportError, since setuptools._distutils is not available in setuptools v40.8.0 which is current for Debian 10

New Behavior

Works with new and old versions of setuptools, and tests pass.

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes/

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@dmurphy18 dmurphy18 added the Sulfur v3006.0 release code name and version label Dec 21, 2022
@dmurphy18 dmurphy18 requested a review from a team as a code owner December 21, 2022 00:49
@dmurphy18 dmurphy18 requested review from whytewolf and s0undt3ch and removed request for a team December 21, 2022 00:49
@s0undt3ch
Copy link
Collaborator

re-run full all

salt/utils/versions.py Outdated Show resolved Hide resolved
@s0undt3ch
Copy link
Collaborator

This PR needs to go through the full test suite.

@dmurphy18
Copy link
Contributor Author

@s0undt3ch Actually when I checked late last night it had gone through the full test suite, or whatever test suites we have for PRs with no problem. Which raises the question, why are they failing now ?.
Also the original PR also made it through the full PR test suite, so why didn't they catch the issue then ?

Wondering what holes we have in testing to explain the inconsistencies ?

David Murphy added 2 commits December 21, 2022 09:27
@dmurphy18
Copy link
Contributor Author

re-run full all

salt/utils/versions.py Outdated Show resolved Hide resolved
salt/utils/pkg/win.py Outdated Show resolved Hide resolved
@dmurphy18
Copy link
Contributor Author

re-run full all

@waynew
Copy link
Contributor

waynew commented Dec 22, 2022

When this gets merged, can someone update #63257 ?

That should get all of the tests passing there 👍

@dmurphy18
Copy link
Contributor Author

I feel like I am 'Waiting for Godot' these two tests, RHEL 7 & 9 are taking forever, over two hours now.
@waynew can you review and approve, if find nothing, so have 3 approvals when the tests finally finish

@garethgreenaway garethgreenaway merged commit ac6ccb8 into saltstack:master Dec 22, 2022
@dmurphy18 dmurphy18 deleted the fix_63350 branch May 3, 2023 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sulfur v3006.0 release code name and version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] setuptools._distutils not available on Debian 10 (setuptools v40.8.0)
4 participants