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

[2018.3] Swapping out collections imports #49487

Merged
merged 4 commits into from Sep 7, 2018

Conversation

Projects
None yet
3 participants
@garethgreenaway
Copy link
Member

commented Sep 2, 2018

What does this PR do?

Updating various imports that have been moved from collections to collections.abc, and will be deprecated in collections beginning in 3.8.

What issues does this PR fix or reference?

#49452

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.

Updating various imports that have been moved from collections to col…
…lections.abc, and will be deprecated in collections beginning in 3.8.

@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Sep 2, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Sep 2, 2018

@garethgreenaway garethgreenaway requested review from gtmanfred and rallytime Sep 2, 2018

@cachedout
Copy link
Collaborator

left a comment

Lint and tests didn't like this so much. :(

garethgreenaway and others added some commits Sep 3, 2018

Swapping out the version check for a try...except on the import from …
…collections.abc with a fallback to importing from collections.
@rallytime
Copy link
Contributor

left a comment

LGTM!

I updated the branch to start a new test run. :)

@rallytime rallytime merged commit baafd6e into saltstack:2018.3 Sep 7, 2018

5 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.