diff options
author | Matthew Jones <bsdmatburt@gmail.com> | 2017-08-03 16:39:04 +0200 |
---|---|---|
committer | Matthew Jones <bsdmatburt@gmail.com> | 2017-08-03 16:39:04 +0200 |
commit | af3652bb2fa94394e70a5f6663e2954c8fcb4092 (patch) | |
tree | 7f6417671786a45680342e4d989644ca5ac3d1d2 /setup.py | |
parent | Merge pull request #151 from chrismeyersfsu/fix-6555_2 (diff) | |
download | awx-af3652bb2fa94394e70a5f6663e2954c8fcb4092.tar.xz awx-af3652bb2fa94394e70a5f6663e2954c8fcb4092.zip |
Updates to production container builds for new repository
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 14 |
1 files changed, 1 insertions, 13 deletions
@@ -16,12 +16,7 @@ etcpath = "/etc/tower" homedir = "/var/lib/awx" bindir = "/usr/bin" sharedir = "/usr/share/awx" -docdir = "/usr/share/doc/ansible-tower" - -if os.getenv('OFFICIAL', 'no') == 'yes': - build_tag = '' -else: - build_tag = '-' + '0.git' + subprocess.Popen("git describe --long | cut -d - -f 2-2", shell=True, stdout=subprocess.PIPE).stdout.read().strip() +docdir = "/usr/share/doc/ansible-awx" def get_version(): @@ -65,10 +60,6 @@ class sdist_isolated(sdist): 'recursive-include awx/lib *.py', ] - def __init__(self, dist): - sdist.__init__(self, dist) - dist.metadata.version += build_tag - def get_file_list(self): self.filelist.process_template_line('include setup.py') for line in self.includes: @@ -173,9 +164,6 @@ setup( ("%s" % sosconfig, ["tools/sosreport/tower.py"])]), cmdclass = {'sdist_isolated': sdist_isolated}, options = { - 'egg_info': { - 'tag_build': build_tag, - }, 'aliases': { 'dev_build': 'clean --all egg_info sdist', 'release_build': 'clean --all egg_info -b "" sdist', |