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

Enable a new '--with-salt-version' parameter for the "setup.py" script #43955

Merged
merged 2 commits into from Oct 10, 2017

Conversation

Projects
None yet
6 participants
@meaksh
Copy link
Member

meaksh commented Oct 6, 2017

What does this PR do?

According to the discussion we had today during "SUSE - SaltStack" syncup meeting about using the github tarball to build the Salt package, this PR fixes the setup.py script in order to allow using a nbew --with-salt-version parameter where to specify a fixed value for the _version.py file which is going to be generated by the setup.py script.

This way, we allow to set a fixed Salt version instead of expecting that to be auto-generated using the .git information which is missing in the github tag tarball.

$ python setup.py --with-salt-version=2999.9.9rc9 build
...
 
$ cat build/lib/salt/_version.py 
# This file was auto-generated by salt's setup on Friday, 06 October 2017 @ 16:10:00 UTC.

from salt.version import SaltStackVersion

__saltstack_version__ = SaltStackVersion(2999, 9, 9, 0, u'rc', 9, 0, None)

@cachedout @thatch45 @isbm - What do you think about this?

@cachedout

This comment has been minimized.

Copy link
Collaborator

cachedout commented Oct 6, 2017

Exactly what I had in mind! I'd just like @s0undt3ch to sign off on this before we get it in, though.

@cachedout cachedout requested a review from s0undt3ch Oct 6, 2017

@s0undt3ch
Copy link
Member

s0undt3ch left a comment

Looks Great!

@isbm

This comment has been minimized.

Copy link
Contributor

isbm commented Oct 9, 2017

@cachedout @thatch45 as promised. :-) @meaksh 👍 👍 👍

Would be nice to have it nearby in timeline, so we could incorporate all that into the packaging.

@rallytime rallytime merged commit 364523f into saltstack:2016.11 Oct 10, 2017

5 of 6 checks passed

GPG All commits must have a verified GPG signature
Details
default Build finished.
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #18195 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #10907 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #15580 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #15465 — SUCCESS
Details

@meaksh meaksh deleted the meaksh:2016.11-fix-2291 branch Oct 16, 2017

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.