summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@entrouvert.com>2020-02-02 18:43:38 (GMT)
committerFrédéric Péters <fpeters@entrouvert.com>2020-02-02 18:44:22 (GMT)
commit508fc9f217a27df35f59660cb01203c459da5de3 (patch)
tree486afeb44cb2d9e77de6a27bb61914a1536d8022
parent8b025db2a9a10fd4e0a5a8a828cb5af06bc83572 (diff)
downloadpasserelle-imio-extra-fees-508fc9f217a27df35f59660cb01203c459da5de3.zip
passerelle-imio-extra-fees-508fc9f217a27df35f59660cb01203c459da5de3.tar.gz
passerelle-imio-extra-fees-508fc9f217a27df35f59660cb01203c459da5de3.tar.bz2
misc: update setup.py for python 3
-rw-r--r--setup.py33
1 files changed, 21 insertions, 12 deletions
diff --git a/setup.py b/setup.py
index c5a8915..25659df 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
-import glob
import os
-import re
import subprocess
import sys
@@ -13,6 +11,7 @@ from distutils.command.sdist import sdist
from distutils.cmd import Command
from setuptools import setup, find_packages
+
class eo_sdist(sdist):
def run(self):
if os.path.exists('VERSION'):
@@ -25,20 +24,31 @@ class eo_sdist(sdist):
if os.path.exists('VERSION'):
os.remove('VERSION')
+
def get_version():
+ '''Use the VERSION, if absent generates a version with git describe, if not
+ tag exists, take 0.0- and add the length of the commit log.
+ '''
if os.path.exists('VERSION'):
- version_file = open('VERSION', 'r')
- version = version_file.read()
- version_file.close()
- return version
+ with open('VERSION', 'r') as v:
+ return v.read()
if os.path.exists('.git'):
- p = subprocess.Popen(['git', 'describe', '--dirty', '--match=v*'], stdout=subprocess.PIPE)
+ p = subprocess.Popen(['git', 'describe', '--dirty=.dirty', '--match=v*'],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
result = p.communicate()[0]
if p.returncode == 0:
- version = result.split()[0][1:]
- version = version.replace('-', '.')
+ result = result.decode('ascii').strip()[1:] # strip spaces/newlines and initial v
+ if '-' in result: # not a tagged version
+ real_number, commit_count, commit_hash = result.split('-', 2)
+ version = '%s.post%s+%s' % (real_number, commit_count, commit_hash)
+ else:
+ version = result
return version
- return '0'
+ else:
+ return '0.0.post%s' % len(
+ subprocess.check_output(
+ ['git', 'rev-list', 'HEAD']).splitlines())
+ return '0.0'
class compile_translations(Command):
@@ -93,8 +103,7 @@ setup(
'Programming Language :: Python',
'Programming Language :: Python :: 2',
],
- install_requires=['django>=1.8',
- ],
+ install_requires=['django>=1.11'],
zip_safe=False,
cmdclass={
'build': build,