Merge lp:~takluyver/ubuntu/quantal/python-tz/merge-py3 into lp:ubuntu/quantal/python-tz

[Thomas Kluyver]

This merges packaging changes from Debian to build a python3-tz package.

I also cleaned up a couple of Lintian warnings, and I noticed that the zoneinfo data files weren't being removed from the Python 3 package, so I fixed that.

[Barry Warsaw (barry)]

Hi Thomas,

This is really great, and I appreciate your contribution to Ubuntu, especially because this adds Python 3 support to a very useful package. I was able to build it locally and try it out on both Python 2 and Python 3. Everything works great.

I get one warning when building the source package:

W: python-tz source: missing-license-paragraph-in-dep5-copyright public-domain (paragraph at line 27)

and I get one minor warning on the resulting .debs:

% lintian *.deb
W: python-tz: wrong-name-for-upstream-changelog usr/share/doc/python-tz/CHANGES.txt

The other thing I suggest is to structure your debian/rules file to be more in line with these recommendations:

http://wiki.debian.org/Python/LibraryStyleGuide

Pay attention specifically to the section on enabling the tests in all versions (which I see is currently disabled -- why?) and in avoiding the use of for-loops to build the Python 3 packages. If you fix these, I would happily sponsor your upload, but for Quantal only, as this is a new feature that isn't appropriate for SRU'ing into Precise.

review: Needs Fixing

[Barry Warsaw (barry)]

Oh, also it should be

%:
        dh $@ --with python2,python3

[Thomas Kluyver (takluyver)]

Thanks, Barry

A few questions:

- Missing license description for 'public domain' - the Debian manual says that the description should contain details of exactly what exemptions from copyright are made [1]. I had no involvement in making the timezone database, and the webpage about it just describes it as "the public domain time zone database"[2], so I don't know what details I can put.

- debian/rules structure: Is it worth restructuring just for Ubuntu, given that it will make a new diff against Debian's version? I'd prefer to keep the diff as small as practical, so that future merges are easy.

- Tests: They were disabled in Ubuntu earlier this year, a day after they were enabled [3]. Chuck doesn't give a reason in the commit message, but I assume he had one.

[1] http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#public-domain
[2] http://www.iana.org/time-zones/repository/tz-link.html
[3] http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/quantal/python-tz/quantal/revision/27

[Barry Warsaw (barry)]

On May 22, 2012, at 09:44 PM, Thomas Kluyver wrote:

>- Missing license description for 'public domain' - the Debian manual says
> that the description should contain details of exactly what exemptions from
> copyright are made [1]. I had no involvement in making the timezone
> database, and the webpage about it just describes it as "the public domain
> time zone database"[2], so I don't know what details I can put.

Okay, we'll leave this one alone.

>- debian/rules structure: Is it worth restructuring just for Ubuntu, given
> that it will make a new diff against Debian's version? I'd prefer to keep
> the diff as small as practical, so that future merges are easy.

It's a good question. Given that Ubuntu's python-tz is so far ahead of Debian
(which in itself is unfortunate), it might be worth making our package conform
to current standards, and then try to push those changes back to Debian. But
I can be convinced otherwise, if it makes merging whatever meager bits we
still can from Debian.

>- Tests: They were disabled in Ubuntu earlier this year, a day after they
> were enabled [3]. Chuck doesn't give a reason in the commit message, but I
> assume he had one.

I talked to Chuck on IRC about this one. I says that the tests got
re-disabled almost immediately because they weren't actually testing
python-tz. He wasn't sure what the tests were actually testing. So I guess
we can leave this one alone too.

Okay, I think it's worth getting Python 3 support to go ahead and do the
merge. I'll sponsor that. Eventually it would be good to modernize the
Debian package (with the d/rules improvements), but we can worry about that
later. Perhaps you'd care to file a bug with Debian on that?

[Barry Warsaw (barry)]

review: Approve

[Thomas Kluyver (takluyver)]

Great, thanks. I've sent a report to Debian about the suggestions for debian/rules:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674083

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-28 10:36:56 +0000
+++ debian/changelog	2012-05-12 11:20:23 +0000
@@ -1,3 +1,12 @@
+python-tz (2011k-0ubuntu6) precise; urgency=low
+
+  * Merge with Debian unstable (now builds for Python 3)
+  * Bump standards version to 3.9.3
+  * Add metadata to tzdata patch
+  * Remove zoneinfo data from python3-tz package
+
+ -- Thomas Kluyver <[e-mail]>  Sat, 12 May 2012 11:25:52 +0100
+
 python-tz (2011k-0ubuntu5) precise; urgency=low
 
   * Disable testsuite
 
=== added file 'debian/clean'
--- debian/clean	1970-01-01 00:00:00 +0000
+++ debian/clean	2012-05-12 11:20:23 +0000
@@ -0,0 +1,1 @@
+pytz.egg-info/*
 
=== modified file 'debian/control'
--- debian/control	2012-01-06 10:29:22 +0000
+++ debian/control	2012-05-12 11:20:23 +0000
@@ -4,11 +4,17 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian/Ubuntu Zope Team <[e-mail]>
 Uploaders: Brian Sutherland <[e-mail]>, Fabio Tranchitella <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.0.50~),
+               python-all (>= 2.6.6-3~),
+               python3-all,
+               python-setuptools,
+               python3-setuptools
+Standards-Version: 3.9.3
 Homepage: http://pypi.python.org/pypi/pytz/
 X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-zope/python-tz/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-zope/python-tz/trunk
 
 Package: python-tz
 Architecture: all
@@ -19,3 +25,15 @@
  It also solves the issue of ambiguous times at the end of daylight savings,
  which you can read more about in the Python Library Reference
  (datetime.tzinfo).
+
+Package: python3-tz
+Architecture: all
+Depends: tzdata, ${python3:Depends}, ${misc:Depends}
+Description: Python3 version of the Olson timezone database
+ python-tz brings the Olson tz database into Python. This library allows
+ accurate and cross platform timezone calculations using Python 2.3 or higher.
+ It also solves the issue of ambiguous times at the end of daylight savings,
+ which you can read more about in the Python Library Reference
+ (datetime.tzinfo).
+ .
+ This package contains the Python 3 version of the library.
 
=== modified file 'debian/copyright'
--- debian/copyright	2008-10-27 07:29:54 +0000
+++ debian/copyright	2012-05-12 11:20:23 +0000
@@ -1,60 +1,31 @@
-This package was debianized by Brian Sutherland <[e-mail]> on
-Tue,  8 Feb 2005 02:14:33 +0100.
-
-It was downloaded from http://pypi.python.org/pypi/pytz/
-
-Copyright:
-
-Upstream Author: Stuart Bishop <[e-mail]>
-
-This package is the result of an automatic generation from the Olsen database
-(available from ftp://elsie.nci.nih.gov/pub). This means that there are two
-licenses involved, that of the original distribution and the automatic
-generation code. Fortunately both are BSD style.
-
-Both are included here as they are quite different from the standard BSD style
-license distributed with Debian.
-
-
-License:
-
-The files of the original database distribution contain this license text:
-
-/*
-** Copyright (c) 1989 The Regents of the University of California.
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms are permitted
-** provided that the above copyright notice and this paragraph are
-** duplicated in all such forms and that any documentation,
-** advertising materials, and other materials related to such
-** distribution and use acknowledge that the software was developed
-** by the University of California, Berkeley.  The name of the
-** University may not be used to endorse or promote products derived
-** from this software without specific prior written permission.
-** THIS SOFTWARE IS PROVIDED ``AS IS' AND WITHOUT ANY EXPRESS OR
-** IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-And the automatic generation code license is:
-
-Copyright (c) 2003-2008 Stuart Bishop <[e-mail]>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Upstream-Name: pytz
+Upstream-Contact: Stuart Bishop <[e-mail]>
+Source: http://pypi.python.org/pypi/pytz/
+
+Files: *
+Copyright: (c) 2003-2008 Stuart Bishop <[e-mail]>
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: pytz/zoneinfo/*
+Copyright: Arthur David Olson et.al. <[e-mail]>
+License: public-domain
+Comment: excluded from binary package
+
 
=== modified file 'debian/patches/tzdata'
--- debian/patches/tzdata	2011-11-08 15:47:51 +0000
+++ debian/patches/tzdata	2012-05-12 11:20:23 +0000
@@ -1,3 +1,8 @@
+Description: Use system zone information from the tzdata package
+Author: Kurt Roeckx <[e-mail]>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=416202
+Forwarded: not-needed
+
 Index: pytz-2011h/pytz/__init__.py
 ===================================================================
 --- pytz-2011h.orig/pytz/__init__.py	2011-10-21 15:14:54.048406509 +0900
 
=== modified file 'debian/rules' (properties changed: +x to -x)
--- debian/rules	2012-02-28 10:36:56 +0000
+++ debian/rules	2012-05-12 11:20:23 +0000
@@ -1,14 +1,44 @@
 #!/usr/bin/make -f
 
+PACKAGE=python-tz
+PACKAGE_PYTHON3=python3-tz
+
+PYVERS:=$(shell pyversions -r)
+PY3VERS:=$(shell py3versions -r)
+
 %:
-	dh --with python2 $@
+	dh --with python2 --with python3 $@
+
+override_dh_auto_build:
+	dh_auto_build -p$(PACKAGE)
+
+	set -e; \
+	for python in $(PY3VERS); do \
+		$$python setup.py build; \
+	done
+
+override_dh_auto_install:
+	dh_auto_install -p$(PACKAGE) --destdir=$(CURDIR)/debian/$(PACKAGE)
+
+	set -ex; \
+	for python in $(PY3VERS); do \
+		$$python setup.py install --install-layout=deb \
+			--root=$(CURDIR)/debian/$(PACKAGE_PYTHON3); \
+	done
+
+override_dh_clean:
+	dh_clean
+	rm -rf build
 
 override_dh_install:
 	dh_install
+
 	# install our testing package
 	install -D debian/test-pytz debian/python-tz/usr/lib/python-tz/test-pytz.py
+
 	# remove zoneinfo, our patch to pytz makes it use the one from tzdata
 	rm -rf debian/python-tz/usr/lib/python*/*-packages/pytz/zoneinfo
+	rm -rf debian/python3-tz/usr/lib/python*/*-packages/pytz/zoneinfo
 
 #override_dh_auto_test:
 #	set -e ; for pyversion in $(shell pyversions -r); do $$pyversion $(CURDIR)/pytz/tests/test_tzinfo.py ; done
 
=== modified file 'debian/test-pytz'
--- debian/test-pytz	2008-10-27 07:29:54 +0000
+++ debian/test-pytz	2012-05-12 11:20:23 +0000
@@ -13,5 +13,5 @@
     tests += mod_tests
 
 if not errors:
-    print "Ran %s tests successfully." % tests
+    print("Ran %s tests successfully." % tests)
 sys.exit(errors)
 
=== modified file 'debian/watch'
--- debian/watch	2008-10-27 07:29:54 +0000
+++ debian/watch	2012-05-12 11:20:23 +0000
@@ -1,2 +1,2 @@
 version=3
-http://pypi.python.org/pypi/pytz http://pypi.python.org/packages/source/p/pytz/pytz-(.*).tar.gz#md5=.*
+http://pypi.python.org/packages/source/p/pytz/pytz-(.*).tar.gz
 
=== modified file 'pytz.egg-info/SOURCES.txt'
--- pytz.egg-info/SOURCES.txt	2011-10-21 14:01:38 +0000
+++ pytz.egg-info/SOURCES.txt	2012-05-12 11:20:23 +0000
@@ -2,7 +2,6 @@
 LICENSE.txt
 MANIFEST.in
 README.txt
-setup.cfg
 setup.py
 pytz/__init__.py
 pytz/exceptions.py