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

Fix issues with setup.py in Windows #47824

Merged
merged 3 commits into from Jun 5, 2018

Conversation

Projects
None yet
3 participants
@twangboy
Contributor

twangboy commented May 24, 2018

What does this PR do?

Removes special m2crypto download for Windows. Everything is installed via pip with normal installers.
Fix pip issue with pip 10. In version 10, pip moved many things, including utils, to the _internal directory.
Removes libsodium.dll download. Not used anymore.

What issues does this PR fix or reference?

Found via slack

Tests written?

NA

Commits signed with GPG?

Yes

@rallytime

This comment has been minimized.

@rallytime rallytime requested a review from saltstack/team-core May 25, 2018

@twangboy

This comment has been minimized.

Contributor

twangboy commented May 30, 2018

@rallytime Is this good?

@rallytime

This comment has been minimized.

Contributor

rallytime commented May 31, 2018

@twangboy No, you need to fix the lint.

@twangboy twangboy force-pushed the twangboy:fix_setup.py branch from d651646 to cc57851 May 31, 2018

twangboy added some commits May 24, 2018

Remove m2crypto download for Windows
Fix pip issue with pip 10

@twangboy twangboy force-pushed the twangboy:fix_setup.py branch from cc57851 to 4538b3a Jun 1, 2018

@rallytime rallytime merged commit df50ce7 into saltstack:2017.7 Jun 5, 2018

6 of 9 checks passed

default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5430 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19486 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25627 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17698 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23364 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10403 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22328 — SUCCESS
Details

@twangboy twangboy deleted the twangboy:fix_setup.py branch Jun 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment