From 508fc9f217a27df35f59660cb01203c459da5de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 2 Feb 2020 19:43:38 +0100 Subject: [PATCH 1/8] misc: update setup.py for python 3 --- setup.py | 33 +++++++++++++++++++++------------ 1 file 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, From 8b8a1cb0ff52ec862329b15a0eab6479e8c7be4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 2 Feb 2020 19:43:54 +0100 Subject: [PATCH 2/8] debian: add package for python 3 --- debian/control | 7 ++++++- debian/rules | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 56de756..8096e7a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: passerelle-imio-extra-fees Maintainer: Frederic Peters Section: python Priority: optional -Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.7), debhelper (>= 9), python-django +Build-Depends: python-setuptools, python3-setuptools, python-all, python3-all, debhelper (>= 9), dh-python, python-django, python3-django Standards-Version: 3.9.1 Package: python-passerelle-imio-extra-fees @@ -10,3 +10,8 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends} Description: Passerelle connector to compute extra fees +Package: python3-passerelle-imio-extra-fees +Architecture: all +Depends: ${misc:Depends}, ${python3:Depends} +Description: Passerelle connector to compute extra fees (Python 3) + diff --git a/debian/rules b/debian/rules index 4647c9c..cf4a9a0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,8 @@ #!/usr/bin/make -f +export PYBUILD_NAME=passerelle_imio_extra_fees + %: - dh $@ --with python2 + dh $@ --with python2,python3 --buildsystem=pybuild + +override_dh_auto_test: From 563b40a24d5751e53ad4804f3644df92dac44600 Mon Sep 17 00:00:00 2001 From: Christophe Boulanger Date: Fri, 7 Feb 2020 09:24:34 +0100 Subject: [PATCH 3/8] change _ by - in PYBUILD debian/rules --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index cf4a9a0..1f2e7b1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export PYBUILD_NAME=passerelle_imio_extra_fees +export PYBUILD_NAME=passerelle-imio-extra-fees %: dh $@ --with python2,python3 --buildsystem=pybuild From 7a39db03dc9a65adbd56d7ca7f313d9bf218e4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 24 May 2020 15:36:25 +0200 Subject: [PATCH 4/8] jenkins: build for all default dists --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 72d27cb..04f0fb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,9 +7,9 @@ pipeline { steps { script { if (env.JOB_NAME == 'passerelle-imio-extra-fees' && env.GIT_BRANCH == 'origin/master') { - sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder -d stretch passerelle-imio-extra-fees' + sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder passerelle-imio-extra-fees' } else if (env.GIT_BRANCH.startsWith('hotfix/')) { - sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d stretch --branch ${env.GIT_BRANCH} --hotfix passerelle-imio-extra-fees" + sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix passerelle-imio-extra-fees" } } } From 6703bdd7f6c078033e5d2a371d68a4e647212127 Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Sun, 28 Jun 2020 11:53:32 +0200 Subject: [PATCH 5/8] [TELE-569] python 3 adapt. (classifier, install requires) --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 25659df..35601e3 100644 --- a/setup.py +++ b/setup.py @@ -100,10 +100,12 @@ setup( 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 3.5.3', ], - install_requires=['django>=1.11'], + install_requires=[ + 'django>=1.11', + 'python3-passerelle', + ], zip_safe=False, cmdclass={ 'build': build, From 45d6f2227757730fec91fae1e52cd07dd1eb3810 Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Sun, 28 Jun 2020 11:53:50 +0200 Subject: [PATCH 6/8] [TELE-569] add .vscode to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9c9a1af..95388b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.vscode /MANIFEST *.pyc /dist From a40ac02d8ead8a9fc238f93bd04b58e16487c6c0 Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Sun, 28 Jun 2020 13:43:22 +0200 Subject: [PATCH 7/8] [TELE-569] fix build-depends --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 35601e3..04ca897 100644 --- a/setup.py +++ b/setup.py @@ -104,7 +104,6 @@ setup( ], install_requires=[ 'django>=1.11', - 'python3-passerelle', ], zip_safe=False, cmdclass={ From 6dc2a2cd947d67da3f7457121e9856b770a12582 Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Fri, 3 Jul 2020 09:05:21 +0200 Subject: [PATCH 8/8] [TELE-592] add admints@imio.be to mail_notify --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 04f0fb7..6032d33 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { always { script { utils = new Utils() - utils.mail_notify(currentBuild, env, 'ci+jenkins-passerelle-imio-extra-fees@entrouvert.org') + utils.mail_notify(currentBuild, env, 'ci+jenkins-passerelle-imio-extra-fees@entrouvert.org, admints+jenkins-eo@imio.be') } } success {