[Python-modules-commits] r33566 - in packages/python-traits/trunk/debian (6 files)

[jcjaskula-guest at users.alioth.debian.org]

    Date: Saturday, August 1, 2015 @ 00:30:46
  Author: jcjaskula-guest
Revision: 33566

Updated changelog and docs compilation fix

Added:
  packages/python-traits/trunk/debian/patches/invalid_tokens_fix.patch
Modified:
  packages/python-traits/trunk/debian/changelog
  packages/python-traits/trunk/debian/control
  packages/python-traits/trunk/debian/patches/series
  packages/python-traits/trunk/debian/rules
  packages/python-traits/trunk/debian/watch

Modified: packages/python-traits/trunk/debian/changelog
===================================================================
--- packages/python-traits/trunk/debian/changelog	2015-07-31 17:05:24 UTC (rev 33565)
+++ packages/python-traits/trunk/debian/changelog	2015-08-01 00:30:46 UTC (rev 33566)
@@ -1,10 +1,17 @@
-python-traits (4.5.0-0.1) UNRELEASED; urgency=low
+python-traits (4.5.0-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
   * New upstream release
-  * Building a python3 package
+  * Building python3 package
   * Bump Standards-Version to 3.9.6 (no changes needed)
   * Dropped cdbs in favor of dh-* and pybuild
+  * debian/patches/
+    - remove_testing_dependencies_class.patch: Remove unused, undocumented 
+      ImportManager and ImportSpy classes, needed for python23 compatibility 
+      (from upstream)
+    - py3_sort_fix.patch: Fix TraitListObject.sort for Python 3, along with 
+      tests. (from upstream)
+    - invalid_tokens_fix.patch: Fix the trait_documenter machinery. (upstream)
 
  -- Jean-Christophe Jaskula <jchristophe.debian at gmail.com>  Mon, 06 Oct 2014 23:08:11 -0400
 

Modified: packages/python-traits/trunk/debian/control
===================================================================
--- packages/python-traits/trunk/debian/control	2015-07-31 17:05:24 UTC (rev 33565)
+++ packages/python-traits/trunk/debian/control	2015-08-01 00:30:46 UTC (rev 33566)
@@ -10,6 +10,7 @@
 		python-setuptools,
 		python3-all,
 		python3-all-dev,
+		python-sphinx | python3-sphinx,
 		python3-setuptools
 Standards-Version: 3.9.6
 Homepage: http://pypi.python.org/pypi/traits
@@ -42,7 +43,6 @@
 Package: python3-traits
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
-Suggests: python3-traitsui
 Description: Manifest typing and reactive programming for Python (Python 3)
  The traits package provides a metaclass with special attributes that
  are called traits. A trait is a type definition that can be used for

Added: packages/python-traits/trunk/debian/patches/invalid_tokens_fix.patch
===================================================================
--- packages/python-traits/trunk/debian/patches/invalid_tokens_fix.patch	                        (rev 0)
+++ packages/python-traits/trunk/debian/patches/invalid_tokens_fix.patch	2015-08-01 00:30:46 UTC (rev 33566)
@@ -0,0 +1,24 @@
+
+m cc36c2dc61275c4a51d82445db104211550868d7 Mon Sep 17 00:00:00 2001
+From: Mark Dickinson <mdickinson at enthought.com>
+Date: Tue, 24 Feb 2015 13:53:52 +0000
+Subject: [PATCH] Fix invalid tokens (with line number zero) in
+ trait_documenter machinery.
+
+---
+ traits/util/trait_documenter.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/traits/util/trait_documenter.py b/traits/util/trait_documenter.py
+index 59a01bf..8f2258f 100644
+--- a/traits/util/trait_documenter.py
++++ b/traits/util/trait_documenter.py
+@@ -135,7 +135,7 @@ def _get_trait_definition(self):
+         for type, name, start, stop, line in tokens:
+             if type == token.NEWLINE:
+                 break
+-            item = (type, name, (0, start[1]), (0, stop[1]), line)
++            item = (type, name, (1, start[1]), (1, stop[1]), line)
+             definition_tokens.append(item)
+ 
+         return tokenize.untokenize(definition_tokens).strip()

Modified: packages/python-traits/trunk/debian/patches/series
===================================================================
--- packages/python-traits/trunk/debian/patches/series	2015-07-31 17:05:24 UTC (rev 33565)
+++ packages/python-traits/trunk/debian/patches/series	2015-08-01 00:30:46 UTC (rev 33566)
@@ -1,2 +1,3 @@
 remove_testing_dependencies_class.patch
 py3_sort_fix.patch
+invalid_tokens_fix.patch

Modified: packages/python-traits/trunk/debian/rules
===================================================================
--- packages/python-traits/trunk/debian/rules	2015-07-31 17:05:24 UTC (rev 33565)
+++ packages/python-traits/trunk/debian/rules	2015-08-01 00:30:46 UTC (rev 33566)
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 export PYBUILD_NAME=traits
 
 # Install egg-info directories
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_compress:
 	dh_compress -X.py

Modified: packages/python-traits/trunk/debian/watch
===================================================================
--- packages/python-traits/trunk/debian/watch	2015-07-31 17:05:24 UTC (rev 33565)
+++ packages/python-traits/trunk/debian/watch	2015-08-01 00:30:46 UTC (rev 33566)
@@ -1,4 +1,3 @@
 version=3
-opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
-http://pypi.python.org/pypi/traits .*traits-(.*).tar.gz \
-debian debian/orig-tar.sh
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
+https://github.com/enthought/traits/tags .*/archive/v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))