Merge lp:~jkakar/subunit/ppa-build into lp:~subunit/subunit/trunk

Proposed by Jamu Kakar
Status: Rejected
Rejected by: Robert Collins
Proposed branch: lp:~jkakar/subunit/ppa-build
Merge into: lp:~subunit/subunit/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~jkakar/subunit/ppa-build
Reviewer Review Type Date Requested Status
Robert Collins Needs Fixing
Jelmer Vernooij Disapprove
Review via email: mp+5037@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jamu Kakar (jkakar) wrote :

This branch adds a debian/ directory to subunit with Debian
packaging files. It's setup to build the python-subunit package for
multiple versions of Ubuntu with AutoPPA.

Some things that might need improvement:

1. In the end I had to symlink python/subunit to subunit, so that
   setuptools could find the package (this happens in setup.py).
   Maybe there's a better way to do this? I Google'd a bit, but
   didn't find anything like a package_root_path or similar that I
   could pass to the setup function.

2. None of the C or C++ code is used/compiled/installed. I decided
   not to worry about this for now, though thinking about it more it
   probably would be a good idea to install libsubunit.so.

3. I didn't find a version number so I chose 0.0.1 arbitrarily.

I've built python-subunit packages using this code. They are
available in my PPA at:

https://edge.launchpad.net/~jkakar/+archive/ppa

I've installed the hardy package and verified that 'import subunit'
works in a Python interpreter. Anyway, if the packages built by
this branch are acceptable I'd like to rebuild and distribute them
in a subunit-focused PPA.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Jamu Kakar wrote:
> Jamu Kakar has proposed merging lp:~jkakar/subunit/ppa-build into
> lp:subunit.
>
> Requested reviews: Subunit Developers (subunit)
>
> This branch adds a debian/ directory to subunit with Debian
> packaging files. It's setup to build the python-subunit package
> for multiple versions of Ubuntu with AutoPPA.
>
Thanks for PPA-packaging subunit; I don't think distro-specific
packaging like this belongs in the main branch though - Subunit is not
a native package.

vote reject

Cheers,

Jelmer

Revision history for this message
Jelmer Vernooij (jelmer) :
review: Abstain
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Disapprove
Revision history for this message
Robert Collins (lifeless) wrote :

> This branch adds a debian/ directory to subunit with Debian
> packaging files. It's setup to build the python-subunit package for
> multiple versions of Ubuntu with AutoPPA.
>
> Some things that might need improvement:
>
> 1. In the end I had to symlink python/subunit to subunit, so that
> setuptools could find the package (this happens in setup.py).
> Maybe there's a better way to do this? I Google'd a bit, but
> didn't find anything like a package_root_path or similar that I
> could pass to the setup function.

package_dir = {'':python}

but distutils is heinous for non-python, and subunit is only partially python, which is why it doesn't use a setup.py.
...
> I've installed the hardy package and verified that 'import subunit'
> works in a Python interpreter. Anyway, if the packages built by
> this branch are acceptable I'd like to rebuild and distribute them
> in a subunit-focused PPA.

You're welcome to do that - in fact, if you join the subunit developers team you can use the subunit ppa. I've done somewhat more comprehensive packaging for subunit now though - so this branch is rather stale. We could do with more uploads etc :) I'm sorry that the effort you put in wasn't directly used.

review: Needs Fixing

Unmerged revisions

66. By Jamu Kakar

- Fix rules file.

65. By Jamu Kakar

- Moved setup.py back to the root directory and updated it to use a
  symlink to point to subunit.

64. By Jamu Kakar

- Fix broken path in rules file.

63. By Jamu Kakar

- Move setup.py into the python directory so that setuptools can
  find the subunit package.

62. By Jamu Kakar

- Added Debian packaging files and a setuptools setup.py file.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian'
2=== added file 'debian/changelog'
3--- debian/changelog 1970-01-01 00:00:00 +0000
4+++ debian/changelog 2009-03-30 02:50:56 +0000
5@@ -0,0 +1,5 @@
6+subunit (0.0.0~trunk) feisty; urgency=low
7+
8+ * New upstream release.
9+
10+ -- Jamshed Kakar <jkakar@kakar.ca> Sun, 29 Mar 2009 19:47:00 -0700
11
12=== added file 'debian/compat'
13--- debian/compat 1970-01-01 00:00:00 +0000
14+++ debian/compat 2009-03-30 02:50:56 +0000
15@@ -0,0 +1,1 @@
16+5
17
18=== added file 'debian/control'
19--- debian/control 1970-01-01 00:00:00 +0000
20+++ debian/control 2009-03-30 02:50:56 +0000
21@@ -0,0 +1,16 @@
22+Source: subunit
23+Section: universe/devel
24+Priority: optional
25+Maintainer: Jamshed Kakar <jkakar@kakar.ca>
26+Build-Depends: debhelper, python-central, lsb-release
27+Standards-Version: 3.7.2
28+XS-Python-Version: current
29+
30+Package: python-subunit
31+Architecture: any
32+Depends: ${python:Depends}, ${shlibs:Depends}
33+Provides: ${python:Provides}
34+XB-Python-Version: ${python:Versions}
35+Description: Subunit is attempting to extend unittest with a clean
36+ and simple api to run arbitrary external test suites and return the
37+ results to standard Python unittest.
38
39=== added file 'debian/control.autoppa'
40--- debian/control.autoppa 1970-01-01 00:00:00 +0000
41+++ debian/control.autoppa 2009-03-30 02:50:56 +0000
42@@ -0,0 +1,17 @@
43+Source: subunit
44+Section: universe/devel
45+Priority: optional
46+Maintainer: Jamshed Kakar <jkakar@kakar.ca>
47+AUTOPPA_INCLUDE(dapper):Build-Depends: debhelper, python-support, python2.4-dev, lsb-release
48+AUTOPPA_INCLUDE(hardy,intrepid,jaunty):Build-Depends: debhelper, python-central, python-dev, lsb-release
49+Standards-Version: 3.7.2
50+XS-Python-Version: current
51+
52+Package: python-subunit
53+Architecture: any
54+Depends: ${python:Depends}, ${shlibs:Depends}
55+Provides: ${python:Provides}
56+XB-Python-Version: ${python:Versions}
57+Description: Subunit is attempting to extend unittest with a clean
58+ and simple api to run arbitrary external test suites and return the
59+ results to standard Python unittest.
60
61=== added file 'debian/copyright'
62--- debian/copyright 1970-01-01 00:00:00 +0000
63+++ debian/copyright 2009-03-30 02:50:56 +0000
64@@ -0,0 +1,10 @@
65+Copyright:
66+
67+ Copyright (C) 2005 Robert Collins <robertc@robertcollins.net>
68+
69+License:
70+
71+ GPL
72+
73+On Ubuntu systems, the complete text of the GNU General Public
74+License is in `/usr/share/common-licenses/GPL'.
75
76=== added file 'debian/rules'
77--- debian/rules 1970-01-01 00:00:00 +0000
78+++ debian/rules 2009-03-30 06:53:18 +0000
79@@ -0,0 +1,55 @@
80+#!/usr/bin/make -f
81+
82+dist_release := $(shell lsb_release -cs)
83+ifneq ($(dist_release),dapper)
84+ use_pycentral = yes
85+endif
86+
87+package = python-subunit
88+root_dir = debian/$(package)
89+
90+build: build-stamp
91+build-stamp:
92+ dh_testdir
93+ python setup.py build
94+ touch build-stamp
95+
96+clean:
97+ dh_testdir
98+ dh_testroot
99+ rm -f build-stamp
100+ rm -rf build
101+ dh_clean
102+
103+install: build
104+ dh_testdir
105+ dh_testroot
106+ dh_clean -k
107+ python setup.py install --root $(root_dir)
108+
109+binary-indep: build install
110+
111+binary-arch: build install
112+ dh_testdir
113+ dh_testroot
114+ dh_installdocs
115+ dh_installchangelogs
116+ dh_installinit
117+ dh_installdebconf
118+ dh_installlogrotate
119+ dh_compress
120+ dh_fixperms
121+
122+ifeq ($(use_pycentral),yes)
123+ DH_PYCENTRAL=nomove dh_pycentral
124+else
125+ dh_python
126+endif
127+ dh_installdeb
128+ dh_gencontrol
129+ dh_md5sums
130+ dh_builddeb
131+
132+binary: binary-indep binary-arch
133+
134+.PHONY: binary binary-arch binary-indep clean
135
136=== added file 'setup.py'
137--- setup.py 1970-01-01 00:00:00 +0000
138+++ setup.py 2009-03-30 06:41:16 +0000
139@@ -0,0 +1,37 @@
140+#!/usr/bin/env python
141+import os
142+import re
143+
144+try:
145+ from setuptools import setup, Extension
146+except ImportError:
147+ from distutils.core import setup, Extension
148+
149+
150+if os.path.isfile("MANIFEST"):
151+ os.unlink("MANIFEST")
152+
153+assert not os.path.exists("subunit")
154+os.symlink("python/subunit", "subunit")
155+try:
156+ setup(
157+ name="subunit",
158+ version="0.0.1",
159+ description=("Extensions to Python unittest to get test results "
160+ "from subprocesses."),
161+ author="Robert Collins",
162+ author_email="robertc@robertcollins.net",
163+ license="GPL",
164+ url="https://launchpad.net/subunit",
165+ packages=["subunit"],
166+ zip_safe=False,
167+ classifiers=[
168+ "Development Status :: 4 - Beta",
169+ "Intended Audience :: Developers",
170+ "License :: OSI Approved :: GNU General Public License (GPL)",
171+ "Programming Language :: Python",
172+ "Topic :: Software Development :: Libraries :: Python Modules",
173+ ],
174+ )
175+finally:
176+ os.unlink("subunit")

Subscribers

People subscribed via source and target branches