Software Properties

Merge lp:~glatzor/software-properties/python3 into lp:software-properties

python3
Merge into main

Proposed by Sebastian Heinlein on 2012-05-15

Status:	Needs review
Proposed branch:	lp:~glatzor/software-properties/python3
Merge into:	lp:software-properties
Diff against target:	140 lines (+54/-10) 7 files modified debian/changelog (+10/-0) debian/control (+21/-2) debian/python-software-properties.install (+1/-1) debian/python3-software-properties.install (+1/-0) debian/rules (+16/-1) setup.cfg (+3/-0) setup.py (+2/-6)
To merge this branch:	bzr merge lp:~glatzor/software-properties/python3
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Barry Warsaw (community)		2012-05-15	Needs Fixing on 2012-05-22
Review via email: mp+105755@code.launchpad.net

Description of the change

Basic Python3 "port" to provide the depedencies of aptdaemon only.

Revision history for this message

Barry Warsaw (barry) wrote on 2012-05-22:

I had to add Build-Deps for python-setuptools and python3-setuptools in order for the branch to build correctly.

Also, while I'm glad the tests are run, I'm wondering why you chose to run them during source package build, and in the .bzr-builddeb/defaults.conf file instead of the debian/rules file? What do you think about moving the tests to rules and running them at binary package build time?

Other than that, this looks pretty good. Since it's required for python3 support in aptdaemon, I'd be fine if you fixed these small issues and uploaded the new package. Thanks!

review: Needs Fixing

lp:~glatzor/software-properties/python3 updated on 2012-06-02

757. By Sebastian Heinlein on 2012-06-02: Add build dependency on setuptools
758. By Sebastian Heinlein on 2012-06-02: * debian/control:
- Add new package python3-software-properties
- Add build dependencies on setuptools and python3

Unmerged revisions

758. By Sebastian Heinlein on 2012-06-02: * debian/control:
- Add new package python3-software-properties
- Add build dependencies on setuptools and python3
757. By Sebastian Heinlein on 2012-06-02: Add build dependency on setuptools
756. By Sebastian Heinlein on 2012-05-11: Update changelog
755. By Sebastian Heinlein on 2012-05-11: Add a new python3-software-properties package (which is required by aptdaemon)
754. By Sebastian Heinlein on 2012-05-11: Update debian/rules to also make a Python3 build
753. By Sebastian Heinlein on 2012-05-11: Switch to setuptools to get 2to3

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

lapi

Eduardo

Hans P. Möller

Hans Plenter

Michael Vogt

Sebastian Heinlein

airene

eytue768

jammers

josé carlos galvão vaz

to status/vote changes:

Rick McMeen

michael vannuffel

todaioan

 === modified file 'debian/changelog'
 --- debian/changelog	2012-04-25 19:47:49 +0000
 +++ debian/changelog	2012-06-02 09:47:18 +0000
@@ -1,3 +1,13 @@
++software-properties (0.82.7.2) UNRELEASED; urgency=low
++
++ [Sebastian Heinlein]
++ * debian/rules: Build with Python 2 and 3
++ * debian/control:
++ - Add new package python3-software-properties
++ - Add build dependencies on setuptools and python3
++
++ -- Sebastian Heinlein <glatzor@ubuntu.com> Fri, 11 May 2012 16:10:21 +0200
++
  software-properties (0.82.7.1) precise-proposed; urgency=low
  * manually shift the policy index to work around wrong upgrade policy being
 === modified file 'debian/control'
 --- debian/control	2012-03-13 18:12:53 +0000
 +++ debian/control	2012-06-02 09:47:18 +0000
@@ -7,21 +7,40 @@
  scrollkeeper,
  intltool,
  python-all (>= 2.6.6-3~),
++ python-setuptools,
  python-distutils-extra (>= 1.90),
-- dh-translations
++ python3-all,
++ python3-setuptools,
++ python3-distutils-extra,
++ dh-translations,
  Standards-Version: 3.9.1
  Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/software-properties/main
++Package: python3-software-properties
++Section: python
++Architecture: all
++Depends: ${python3:Depends}, ${misc:Depends}, python, python-apt (>=
++ 0.6.20ubuntu16), lsb-release, python-gnupginterface,
++ unattended-upgrades, iso-codes, python-pycurl
++Description: manage the repositories that you install software from (Python 3)
++ This software provides an abstraction of the used apt repositories.
++ It allows you to easily manage your distribution and independent software
++ vendor software sources.
++ .
++ This is the Python 3 version of the package.
++
  Package: python-software-properties
  Section: python
  Architecture: all
  Depends: ${python:Depends}, ${misc:Depends}, python, python-apt (>=
 .6.20ubuntu16), lsb-release, python-gnupginterface,
  unattended-upgrades, iso-codes, python-pycurl
--Description: manage the repositories that you install software from
++Description: manage the repositories that you install software from (Python 2)
  This software provides an abstraction of the used apt repositories.
  It allows you to easily manage your distribution and independent software
  vendor software sources.
++ .
++ This is the Python 3 version of the package.
  Package: software-properties-common
  Architecture: all
 === modified file 'debian/python-software-properties.install'
 --- debian/python-software-properties.install	2010-03-26 13:03:42 +0000
 +++ debian/python-software-properties.install	2012-06-02 09:47:18 +0000
@@ -1,3 +1,3 @@
--debian/tmp/usr/lib/python*/*-packages/softwareproperties/*py
++debian/tmp/usr/lib/python2.*/*-packages/softwareproperties/*py
  debian/tmp/usr/share/locale/*
  debian/tmp/usr/bin/add-apt-repository
 === added file 'debian/python3-software-properties.install'
 --- debian/python3-software-properties.install	1970-01-01 00:00:00 +0000
 +++ debian/python3-software-properties.install	2012-06-02 09:47:18 +0000
@@ -0,0 +1,1 @@
++debian/tmp/usr/lib/python3/*-packages/softwareproperties/*py
 === modified file 'debian/rules'
 --- debian/rules	2011-11-21 15:47:12 +0000
 +++ debian/rules	2012-06-02 09:47:18 +0000
@@ -1,4 +1,19 @@
  #!/usr/bin/make -f
++#DH_VERBOSE=1
++
++PYTHON2=$(shell pyversions -vr)
++PYTHON3=$(shell py3versions -vr)
++
  %:
--	dh $@ --with python2,translations
++	dh $@ --with=python2,python3,translations
++
++install-python%:
++	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
++
++override_dh_auto_install: $(PYTHON3:%=install-python%)
++	dh_auto_install
++
++override_dh_auto_clean:
++	dh_auto_clean
++	rm -rf build *.egg-info
 === modified file 'setup.cfg'
 --- setup.cfg	2011-07-11 10:48:09 +0000
 +++ setup.cfg	2012-06-02 09:47:18 +0000
@@ -1,3 +1,6 @@
++[build]
++i18n=True
++icons=True
  [build_i18n]
  domain=software-properties
 === modified file 'setup.py'
 --- setup.py	2011-07-11 11:53:17 +0000
 +++ setup.py	2012-06-02 09:47:18 +0000
@@ -1,9 +1,8 @@
  #!/usr/bin/env python
--from distutils.core import setup
++from setuptools import setup
  import glob
  import os
--from DistUtilsExtra.command import *
  setup(name='software-properties',
  version='0.60',
@@ -35,8 +34,5 @@
  ['software-properties-dbus', ]
  ),
  ],
-- cmdclass = { "build" : build_extra.build_extra,
-- "build_i18n" : build_i18n.build_i18n,
--# "build_help" : build_help.build_help,
-- "build_icons" : build_icons.build_icons }
++ use_2to3=True,
+ )