diff options
| author | varac <varacanero@zeromail.org> | 2017-02-16 16:24:26 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-02-16 16:24:26 +0100 |
| commit | c4d4554fb59f3e805bec927f531057196b9568c6 (patch) | |
| tree | e91f878028566560afb79733abae98e90e939040 | |
| parent | e0eea6e8d9c8a23aa3e9df24373f055ac2fb0d0c (diff) | |
Dont use hardcoded version from _version.py
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | src/leap/mx/_version.py | 21 |
2 files changed, 5 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f8eb3f..628d9b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,9 +7,13 @@ stages: stage: package image: "0xacab.org:4567/leap/gitlab-buildpackage:build_${DIST}_${ARCH}" script: + # Remove hardcoded pep440 version file so + # `python setup.py version` reports the correct one + # based on `git describe` + - rm src/leap/mx/_version.py - build-build-package # sleep 1h to allow debugging of running container - - sleep 3600 + #- sleep 3600 artifacts: expire_in: 1w paths: diff --git a/src/leap/mx/_version.py b/src/leap/mx/_version.py deleted file mode 100644 index 9be0a8e..0000000 --- a/src/leap/mx/_version.py +++ /dev/null @@ -1,21 +0,0 @@ - -# This file was generated by the `freeze_debianver` command in setup.py -# Using 'versioneer.py' (0.16) from -# revision-control system data, or from the parent directory name of an -# unpacked source archive. Distribution tarballs contain a pre-generated copy -# of this file. - -import json -import sys - -version_json = ''' -{ - "dirty": false, - "error": null, - "full-revisionid": "7cb18918711f54752b534af17fd93a26d7dce949", - "version": "0.8.1" -} -''' # END VERSION_JSON - -def get_versions(): - return json.loads(version_json) |