Merge lp:~coreygoldberg/uci-tests/ucitests-py3-packaging into lp:~canonical-ci-engineering/uci-tests/trunk

[Corey Goldberg]

updates to packaging to support Python 3

updates to packaging to support Python 3.

[Corey Goldberg (coreygoldberg)]

Notes:

I am getting some warnings during build. Should I be concerned with these?:

* dpkg-gencontrol: warning: Depends field of package python-uci-tests: unknown substitution variable ${python:Depends}
* dpkg-gencontrol: warning: Depends field of package python3-uci-tests: unknown substitution variable ${python:Depends}
* dpkg-deb: warning: 'debian/python-uci-tests/DEBIAN/control' contains user-defined field 'Original-Maintainer'
* dpkg-deb: warning: 'debian/python3-uci-tests/DEBIAN/control' contains user-defined field 'Original-Maintainer'

and I get the following errors/warnings when it runs lintian:

W: uci-tests source: out-of-date-standards-version 3.9.4 (current is 3.9.5)
E: python-uci-tests: copyright-should-refer-to-common-license-file-for-gpl
E: python-uci-tests: extended-description-is-empty
W: python-uci-tests: empty-binary-package
E: python3-uci-tests: copyright-should-refer-to-common-license-file-for-gpl
E: python3-uci-tests: extended-description-is-empty
W: python3-uci-tests: empty-binary-package

[Vincent Ladeuil (vila)]

> I am getting some warnings during build. Should I be concerned with these?:

No idea ;) But since they are the same for both versions I think it's ok. Someone with more packaging-fu than me will have to tell us ;)

> and I get the following errors/warnings when it runs lintian:

No idea here either but fixes highly welcome ;)

Some more comments inline, the most important one is that trunk wasn't up-to-date and should merge with it first thing.

review: Needs Fixing

[lp:~coreygoldberg/uci-tests/ucitests-py3-packaging]

140. By Corey Goldberg on 2014-09-18

updated build rules for py3

141. By Corey Goldberg on 2014-09-18

merged trunk and fixed conflicts

142. By Corey Goldberg on 2014-09-22

make unc-run-tests3 script for py3

143. By Corey Goldberg on 2014-09-28

update packaging

[Corey Goldberg (coreygoldberg)]

fixed build errors I was getting. I was missing *.install files for packaging a 2/3 bilingual package.
packaging should be good to go... though it obviously fails on py3 auto_tests tests since I am just getting to porting that code (in followup MPs).

[lp:~coreygoldberg/uci-tests/ucitests-py3-packaging]

144. By Corey Goldberg on 2014-09-29

update to packaging, remove shebang from console script

145. By Corey Goldberg on 2014-09-29

packaing updates

146. By Corey Goldberg on 2014-09-29

packaging updates

147. By Corey Goldberg on 2014-09-29

typo

[Barry Warsaw (barry)]

Generally don't worry about the warnings, but do worry about the lintian errors.

[Barry Warsaw (barry)]

I think 3.9.5 is the expected version for Ubuntu, though Debian now has 3.9.6. You probably won't have any problems, but do review the checklist before bumping: https://www.debian.org/doc/packaging-manuals/upgrading-checklist.txt

You probably want to adopt DEP-5: http://dep.debian.net/deps/dep5/

empty-binary-package is probably the biggest problem, and that indicates packaging bugs. I'll look more closely and try a local build.

[Barry Warsaw (barry)]

A few reviewy comments.

[Barry Warsaw (barry)]

Looks like you also need explicit B-D on python-setuptools and python3-setuptools

[Barry Warsaw (barry)]

Tests fail:

Traceback (most recent call last):
  File "uci-run-tests", line 24, in <module>
    sys.exit(runners.cli_run())
  File "/«PKGBUILDDIR»/ucitests/runners.py", line 114, in cli_run
    modules=ns.modules)
  File "/«PKGBUILDDIR»/ucitests/runners.py", line 139, in load_tests
    loader = loaders.Loader()
  File "/«PKGBUILDDIR»/ucitests/loaders.py", line 86, in __init__
    root = kwargs.pop('root', os.getcwdu())
AttributeError: 'module' object has no attribute 'getcwdu'

Where does getcwdu() come from?

review: Needs Fixing

[lp:~coreygoldberg/uci-tests/ucitests-py3-packaging]

148. By Corey Goldberg on 2014-09-29

added dh_python for using pybuild

149. By Corey Goldberg on 2014-09-29

disable py3 tests

150. By Corey Goldberg on 2014-09-29

fix d/rules

151. By Corey Goldberg on 2014-09-29

fixed packaging

152. By Corey Goldberg on 2014-09-29

readded d/install files

153. By Corey Goldberg on 2014-09-29

fixed package installs

154. By Corey Goldberg on 2014-09-29

re-added shebang

155. By Corey Goldberg on 2014-09-29

shortened descriptions in d/control

156. By Corey Goldberg on 2014-09-29

shortened descriptions in d/control again

157. By Corey Goldberg on 2014-09-29

fixed lintian errors in d/control

158. By Corey Goldberg on 2014-09-29

fixed d/control description

159. By Corey Goldberg on 2014-09-29

fix lintian errors in packaging

160. By Corey Goldberg on 2014-09-30

fix whitespace in d/control

[Vincent Ladeuil (vila)]

Thanks for the hard work !

A few comments inline, this is going in the right direction but I have few remarks.

Also, thanks a ton for your attention to details regarding the typos but can you make a separate MP for that so we keep the focus here on the packaging ?

review: Needs Fixing

[lp:~coreygoldberg/uci-tests/ucitests-py3-packaging]

161. By Corey Goldberg on 2014-09-30

updated changelog comment

162. By Corey Goldberg on 2014-09-30

revert typos

163. By Corey Goldberg on 2014-09-30

revert typo

164. By Corey Goldberg on 2014-09-30

revert whitespace

165. By Corey Goldberg on 2014-09-30

revert whitespace again

166. By Corey Goldberg on 2014-09-30

revert whitespace again

[Corey Goldberg (coreygoldberg)]

removed extra whitespace and typo fixes to concentrate on packaging

[lp:~coreygoldberg/uci-tests/ucitests-py3-packaging]

167. By Corey Goldberg on 2014-09-30

added run-uci-tests2 for migration path

168. By Corey Goldberg on 2014-09-30

added current path

169. By Corey Goldberg on 2014-09-30

py3 fix

170. By Corey Goldberg on 2014-09-30

fix install

171. By Corey Goldberg on 2014-09-30

missing comma in B-D

172. By Corey Goldberg on 2014-09-30

fix dh_auto_test

[Corey Goldberg (coreygoldberg)]

now creating a python2 version of named run-uci-tests2, as a migration path for current CI... per conversation with vila.

review: Needs Resubmitting

Unmerged revisions

172. By Corey Goldberg on 2014-09-30

fix dh_auto_test

171. By Corey Goldberg on 2014-09-30

missing comma in B-D

170. By Corey Goldberg on 2014-09-30

fix install

169. By Corey Goldberg on 2014-09-30

py3 fix

168. By Corey Goldberg on 2014-09-30

added current path

167. By Corey Goldberg on 2014-09-30

added run-uci-tests2 for migration path

166. By Corey Goldberg on 2014-09-30

revert whitespace again

165. By Corey Goldberg on 2014-09-30

revert whitespace again

164. By Corey Goldberg on 2014-09-30

revert whitespace

163. By Corey Goldberg on 2014-09-30

revert typo

=== modified file 'NEWS.rst'
--- NEWS.rst	2014-09-17 16:12:18 +0000
+++ NEWS.rst	2014-09-30 15:58:14 +0000
@@ -7,6 +7,7 @@
 dev
 ===
 
+* Add packaging for Python3.
 
 0.1.4
 =====

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-31 09:39:27 +0000
+++ debian/changelog	2014-09-30 15:58:14 +0000
@@ -1,3 +1,9 @@
+uci-tests (0.1.5) UNRELEASED; urgency=medium
+
+  * Added packaging code for Python 3.x.
+
+ -- Corey Goldberg <[e-mail]>  Tue, 16 Sep 2014 17:38:11 -0400
+
 uci-tests (0.1.4) precise; urgency=medium
 
   * Flush all output from the test result.

=== modified file 'debian/control'
--- debian/control	2014-04-20 11:26:43 +0000
+++ debian/control	2014-09-30 15:58:14 +0000
@@ -3,13 +3,21 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Vincent Ladeuil <[e-mail]>
-Build-Depends: pep8,
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               pep8,
                pyflakes,
+               python-all,
+               python-setuptools,
                python-subunit,
-               python-testtools, 
-               python-all,
-               debhelper (>= 9)
-Standards-Version: 3.9.4
+               python-testtools,
+               python3-all,
+               python3-setuptools,
+               python3-subunit,
+               python3-testtools
+Standards-Version: 3.9.5
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.2
 XS-Testsuite: autopkgtest
 
 Package: python-uci-tests
@@ -20,4 +28,30 @@
          python-testtools,
          ${misc:Depends},
          ${python:Depends}
-Description: Ubuntu Continuous Integration test tools.
+Description: Ubuntu Continuous Integration test tools for Python.
+ This is the Python 2 version.
+
+Package: python3-uci-tests
+Architecture: all
+Depends: pep8,
+         pyflakes,
+         python3-subunit,
+         python3-testtools,
+         ${misc:Depends},
+         ${python3:Depends}
+Description: Ubuntu Continuous Integration test tools for Python.
+ This is the Python 3 version.
+
+Package: uci-tests-cli
+Architecture: all
+Depends: pep8,
+         pyflakes,
+         python-subunit,
+         python-testtools,
+         python3-subunit,
+         python3-testtools,
+         ${misc:Depends},
+         ${python:Depends},
+         ${python3:Depends}
+Description: Ubuntu Continuous Integration test tools
+ This provides the ``uci-run-tests`` command-line interface.

=== added file 'debian/python-uci-tests.install'
--- debian/python-uci-tests.install	1970-01-01 00:00:00 +0000
+++ debian/python-uci-tests.install	2014-09-30 15:58:14 +0000
@@ -0,0 +1,1 @@
+usr/lib/python2*

=== added file 'debian/python3-uci-tests.install'
--- debian/python3-uci-tests.install	1970-01-01 00:00:00 +0000
+++ debian/python3-uci-tests.install	2014-09-30 15:58:14 +0000
@@ -0,0 +1,1 @@
+usr/lib/python3*

=== modified file 'debian/rules'
--- debian/rules	2014-01-28 15:14:15 +0000
+++ debian/rules	2014-09-30 15:58:14 +0000
@@ -2,7 +2,17 @@
 #export DH_VERBOSE=1
 
 %:
-	dh "$@" --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
 override_dh_auto_test:
-	./uci-run-tests
+	python uci-run-tests
+	# TODO: add py3 tests once code is ported:
+	# python3 uci-run-tests
+
+override_dh_install:
+	dh_install
+	cp debian/uci-tests-cli/usr/bin/uci-run-tests debian/uci-tests-cli/usr/bin/uci-run-tests2
+
+override_dh_python3:
+	dh_python3 --shebang /usr/bin/python3
+

=== added file 'debian/uci-tests-cli.install'
--- debian/uci-tests-cli.install	1970-01-01 00:00:00 +0000
+++ debian/uci-tests-cli.install	2014-09-30 15:58:14 +0000
@@ -0,0 +1,1 @@
+usr/bin/uci-run-tests