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

Use Python 2.7.12 for Windows Build #34468

Merged
merged 1 commit into from
Jul 6, 2016

Conversation

twangboy
Copy link
Contributor

@twangboy twangboy commented Jul 5, 2016

What does this PR do?

Uses Python 2.7.12 for windows build

What issues does this PR fix or reference?

None

Previous Behavior

Bundled Python 2.7.11

New Behavior

Bundles Python 2.7.12

Tests written?

NA

@cachedout
Copy link
Contributor

I thought we had decided on the most recent release on each branch? I believe this needs to go in against 2015.8.

@cachedout cachedout added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Jul 6, 2016
@twangboy
Copy link
Contributor Author

twangboy commented Jul 6, 2016

2015.8 is built differently. The build files are in saltstack/salt-windows-dev. In 2016.3 we moved the build files into the main salt repo like all the other builds. Here's the PR that I used for 2015.8: vmware-archive/salt-windows-dev#40

@rallytime rallytime merged commit 17a3b23 into saltstack:2016.3 Jul 6, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jul 8, 2016
* upstream/develop: (168 commits)
  Pylint fix - import fnmatch
  documentation typo
  setup.py will not print each individual file
  Add apt key proxy support (saltstack#34407)
  Pylint fix
  for options method, authorization_type should always be NONE, otherwise CORS support will not work properly when other methods are using authorization_type  AWS_IAM.
  Add support to reject keys
  Add check.event (and clean a print)
  update docker_events dependency reference
  Lower the log level for modules which cannot be loaded to trace
  Integration test for grains data in templatized files (saltstack#34487)
  Rename some unit test files by adding _test (saltstack#34503)
  Improve top file merging documentation (saltstack#34505)
  Use correct resourcegroup for network interfaces
  Completely remove Python and verify
  Errors will stop the scripts
  Use Python 2.7.12 for Windows Build (saltstack#34468)
  Use -O in wget develop example in bootstrap tutorial
  remove unnecessary block parsing ip addrs for nova
  Gracefully handle non-XML output in GlusterFS execution module. (saltstack#34492)
  ...
@twangboy twangboy deleted the upgrade_python branch August 30, 2016 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants