versioning fixes and updates to appveyor config #310
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge pull request #307 from mwrlabs/develop
Fixes to versioning and appveyor
HenryHoggard
reviewed
Nov 9, 2017
|
|
||
| if platform == "linux2" or platform == "linux": | ||
| return subprocess.check_output(' '.join(version_cmd),shell=True) | ||
| elif platform == "win32": |
There was a problem hiding this comment.
Command doesn't work on windows.
There was a problem hiding this comment.
Which bits don't work on windows?
HenryHoggard
reviewed
Nov 9, 2017
| setuptools.setup( | ||
| name = meta.name, | ||
| version = str(meta.version), | ||
| version = get_version(), |
There was a problem hiding this comment.
No benefit over hardcoded version unless linked with build process.
There was a problem hiding this comment.
get_version() is called at build time when building binaries via setuptools
HenryHoggard
reviewed
Nov 9, 2017
| @@ -1,8 +1,6 @@ | |||
| environment: | |||
|
|
|||
| matrix: | |||
| - PYTHON: "C:\\Python27" | |||
| JAVA_HOME: "C:\\Program Files (x86)\\Java\\jdk1.7.0" | |||
| - PYTHON: "C:\\Python27-x64" | |||
There was a problem hiding this comment.
32 bit support is required.
HenryHoggard
reviewed
Nov 9, 2017
| @@ -117,9 +117,17 @@ def get_package_data(): | |||
| data[""].append(os.path.join(root, filename)[11:]) | |||
| return data | |||
|
|
|||
| def get_version(): | |||
| version_cmd = ['git', 'describe', '--tags', '|' ,'cut', '-c', '1-5'] | |||
There was a problem hiding this comment.
doesn't work if downloaded using release zip/tar.gz
There was a problem hiding this comment.
Yes unfortunately. I guess we're going to have to default to manual versioning for now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.