Merge pull request noironetworks#299 from noironetworks/new-py3-deb

First pass at python3 packaging for DEB

Author: tbachman

debian/build-deb.sh

@@ -10,6 +10,8 @@ if [ ! -f debian/changelog.in ]; then
    echo "Debian changelog file not found"
    exit 1
 fi
+
+# Build python2 package
 BUILD_DIR=${BUILD_DIR:-`pwd`/debbuild}
 mkdir -p $BUILD_DIR
 rm -rf $BUILD_DIR/*
@@ -28,3 +30,43 @@ mv $BUILD_DIR/$SOURCE_FILE $BUILD_DIR/${NAME}_${VERSION}.orig.tar.gz
 pushd ${SOURCE_DIR}
 debuild -d -us -uc
 popd
+
+# Save the python2 package
+cp debbuild/*.deb .
+rm -rf debbuild
+
+# Prepare build scripts for python3
+cp debian/control .
+cp debian/rules .
+sed -i "s/python/python3/g" debian/control
+sed -i "s/Package: aci-integration-module/Package: python3-aci-integration-module/g" debian/control
+sed -i "s/Python2.7/Python3/g" debian/control
+sed -i "s/2.7/3.3/g" debian/control
+sed -i "s/acitoolkit/python3-acitoolkit/g" debian/control
+sed -i "s/apicapi/python3-apicapi/g" debian/control
+sed -i "s/python2/python3/g" debian/rules
+
+# Build the python3 package
+BUILD_DIR=${BUILD_DIR:-`pwd`/debbuild}
+mkdir -p $BUILD_DIR
+rm -rf $BUILD_DIR/*
+NAME=`python3 setup.py --name`
+VERSION_PY=`python3 setup.py --version`
+VERSION=`echo $VERSION_PY | sed -nre 's,([^\.]+.[^\.]+.[^\.]+)((\.)(0[^\.]+))?((\.)(dev.*))?,\1 \4 \7,p' | sed -re 's/ *$//g' | sed -re 's/ +/~/g'`
+REVISION=${REVISION:-1}
+python3 setup.py sdist --dist-dir $BUILD_DIR
+SOURCE_FILE=${NAME}-${VERSION_PY}.tar.gz
+tar -C $BUILD_DIR -xf $BUILD_DIR/$SOURCE_FILE
+SOURCE_DIR=$BUILD_DIR/${NAME}-${VERSION_PY}
+cp -H -r debian $SOURCE_DIR/
+sed -e "s/@VERSION@/$VERSION/" -e "s/@REVISION@/$REVISION/" ${SOURCE_DIR}/debian/changelog.in > ${SOURCE_DIR}/debian/changelog
+
+mv $BUILD_DIR/$SOURCE_FILE $BUILD_DIR/${NAME}_${VERSION}.orig.tar.gz
+pushd ${SOURCE_DIR}
+debuild -d -us -uc
+popd
+
+# restore the original files and debian packages
+mv control debian/control
+mv rules debian/rules
+mv *.deb debbuild/

debian/control

@@ -1,7 +1,7 @@
 Source: aci-integration-module
 Section: python
 Priority: optional
-Maintainer: Cisco Systems, Inc. <apicapi@noironetworks.com>
+Maintainer: Cisco Systems, Inc. <aci-integration-module@noironetworks.com>
 Build-Depends: debhelper (>= 9), dh-systemd, python-setuptools (>= 3.3), python-all (>= 2.7)
 Standards-Version: 3.9.5
 Homepage: http://github.com/noironetworks/aci-integration-module/
@@ -11,7 +11,7 @@ Vcs-Browser: http://github.com/noironetworks/aci-integration-module
 Package: aci-integration-module
 Architecture: all
 Depends: python-click-cli (>=3.3) | python-click (>=6.2), python-oslo.config (>=1.4),
-         ${misc:Depends}, alembic, acitoolkit, python-apicapi, python-click, python-jsonschema,
+         ${misc:Depends}, alembic, acitoolkit, apicapi, python-click, python-jsonschema,
          python-pbr, python-tabulate, python-semantic-version
-Description: Python library for programming ACI
+Description: Python2.7 library for programming ACI
  Library for programming ACI 

debian/rules

@@ -6,11 +6,16 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
 %:
-	dh $@ --with systemd --with python2 --buildsystem=python_distutils
+	dh $@ --with systemd --with python2 --buildsystem=pybuild
 
 override_dh_auto_clean:
 	dh_clean
 
 override_dh_auto_install:
-	dh_auto_install --  -O1 --install-data /
+	dh_auto_install
 
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+	#testr init && ./run_tests.sh -N -P
+	true
+endif