build: don't install manage.py

Jenkinsfile

@@ -44,7 +44,7 @@ pipeline {
                     if (env.JOB_NAME == 'passerelle-atreal-openads' && env.GIT_BRANCH == 'origin/master') {
                         sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder passerelle-atreal-openads'
                     } else if (env.GIT_BRANCH.startsWith('hotfix/')) {
-                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d stretch --branch ${env.GIT_BRANCH} --hotfix passerelle-atreal-openads"
+                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix passerelle-atreal-openads"
                     }
                 }
             }

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -2,7 +2,7 @@ Source: passerelle-atreal-openads
 Maintainer: Michael Bideau <mbideau+publik@atreal.fr>
 Section: python
 Priority: optional
-Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), python-django
+Build-Depends: python-setuptools, python-all, debhelper (>= 10), python-django, python3-setuptools, python3-all, python3-django
 Standards-Version: 3.9.1
 
 Package: python-passerelle-atreal-openads
@@ -11,3 +11,10 @@ Depends: ${misc:Depends}, ${python:Depends},
     python-magic
 Description: Passerelle connector to openADS.API
  .
+
+Package: python3-passerelle-atreal-openads
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends},
+    python3-magic
+Description: Passerelle connector to openADS.API (Python 3)
+ .

debian/rules

@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
 
+export PYBUILD_NAME=passerelle-atreal-openads
+export PYBUILD_DISABLE=test
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild

setup.py

@@ -23,11 +23,12 @@ import subprocess
 import sys
 
 from setuptools.command.install_lib import install_lib as _install_lib
+from setuptools.command.sdist import sdist
 from distutils.command.build import build as _build
-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'):
@@ -40,20 +41,32 @@ 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 = str(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):
@@ -67,17 +80,18 @@ class compile_translations(Command):
         pass
 
     def run(self):
+        curdir = os.getcwd()
         try:
             from django.core.management import call_command
             for path, dirs, files in os.walk('atreal_openads'):
                 if 'locale' not in dirs:
                     continue
-                curdir = os.getcwd()
                 os.chdir(os.path.realpath(path))
                 call_command('compilemessages')
-                os.chdir(curdir)
         except ImportError:
             sys.stderr.write('!!! Please install Django >= 1.4 to build translations\n')
+        finally:
+            os.chdir(curdir)
 
 
 class build(_build):
@@ -96,7 +110,6 @@ setup(
     author='atReal',
     author_email="support@atreal.fr",
     description="A Publik connector for Passerelle to openADS",
-    long_description=open('README').read(),
     classifiers=[
         "Programming Language :: Python :: 2.7",
         "Development Status :: Testing",
@@ -113,7 +126,7 @@ setup(
         'install_lib': install_lib,
         'sdist': eo_sdist
     },
-    scripts=['manage.py'],
+    scripts=[],
     install_requires=[
         'python-magic'
     ]