Source: pytables
Severity: normal

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

Over in Ubuntu, we've started the transition to Python 3.5.  Currently
3.4 is still the default, with 3.5 as a supported version.  This
required an update to pytables 3.2.1, the latest upstream release.

Attached is a diff which enables 3.2.1 along with all the build
changes necessary to pass the test suite, etc.  I've also included an
example changelog entry.

- -- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.1.0-1-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJVy9R4AAoJEBJutWOnSwa/GBoQAKu47p36dws5FRFR2Qa/c8WS
ZTVztKSVh8fFuQy+VHy27nT3hpDt/fhpjBlNaLkFVgyiW6u++QZdAtO0KCKnOFW+
tMlv5Nwc0yQNlQTHiMV0fcaWGsFUZd90JpZh+erxvuRks7VMEfYoBN8bppVeLFnd
ihU+wHdRJEg4UbfDPbDZJ2iaP7ff1SXeGe1h+FBUi4vhcoyfZektLif1dyBtHUq9
KSKoadn2bSzc2ehDYxN/7jcd85/g6tplRTk8/0I/Ugs9V/hVnVFXmONGqFckL7An
OtcmoDxgDM6M3JO9H1GmDdTQuFEONDg4M4I925Bzkt46lAHvSn/kcj9dEiriudDT
lcVaida/Xx9YQkux8V82A+fr/QJ95SweHN4gI+dzNBanhpQCzlf5Oi3VrAQmAp+C
78s0/mvJt66muNRkwMxqIrj0xDItTw2jjXTOq7k9gAPUj9qhP0o3/j3b+FKXtSqS
fgGuUQxKYnHS8MF6vBaf1Jn9bgYRuoMMVQjXvliUdhPvLTLbAd+gXY2GPFP1Pauz
w9rhk5MNFdO53t1DvgHdUxgbI1a+GDDAQX9HgLpVx78RKuTAUKvOWRh9+Gr4LQHd
+yYaTKB2EvBuO2f7Ya+TVpYVPkD+sj+uz7U6jMtvE8OGlPwnh4Xkh5ctofaTwaCf
Dk+ANuyMsIIX/pEw+kW7
=KID3
-----END PGP SIGNATURE-----
=== modified file 'debian/changelog'
--- debian/changelog	2014-08-15 07:37:41 +0000
+++ debian/changelog	2015-08-12 22:59:21 +0000
@@ -1,3 +1,25 @@
+pytables (3.2.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Fixes Python 3.5 support. (LP: #1478146)
+  * Quilt patches updated:
+    - Deleted:
+      + 0003-Better-control-of-verbosity-in-unittests.patch
+      + 0006-fix-an-import-issue-with-cython-newer-than-0.20.2.patch
+      + 0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch
+    - Refreshed:
+      + 0001-use-dynamic-lib.patch
+      + 0002-Use-system-compression-libs.patch
+      + 0004-Never-use-the-msse2-flag-explicitly.patch
+      + 0005-Do-not-fetch-icons-for-external-web-sites.patch
+   * debian/control:
+     - Add to Build-Depends: python{,3}-setuptools, locales
+     - Bump Standards-Version to 3.9.6.
+   * debian/rules: Run the test suites under en_US.UTF-8 locale.
+   * debian/python-tables{,-doc}.docs: It's README.rst now.
+
+ -- Barry Warsaw <ba...@ubuntu.com>  Tue, 11 Aug 2015 18:11:30 -0400
+
 pytables (3.1.1-3) unstable; urgency=medium
 
   * New patch:

=== modified file 'debian/control'
--- debian/control	2014-08-04 21:29:17 +0000
+++ debian/control	2015-08-12 22:17:00 +0000
@@ -1,12 +1,13 @@
 Source: pytables
 Section: python
 Priority: optional
-Maintainer: Debian Science Maintainers <debian-science-maintain...@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Science Maintainers <debian-science-maintain...@lists.alioth.debian.org>
 Uploaders: Antonio Valentino <antonio.valent...@tiscali.it>, Yaroslav Halchenko <deb...@onerussian.com>
 Homepage: http://www.pytables.org
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/pytables.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pytables.git
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 Build-Depends: debhelper (>= 9.0.0),
@@ -24,6 +25,8 @@
                python-numexpr-dbg,
                python3-numexpr,
                python3-numexpr-dbg,
+               python-setuptools,
+               python3-setuptools,
                cython (>= 0.13),
                cython-dbg,
                cython3,
@@ -33,6 +36,7 @@
                liblz4-dev (>= 0.0~r114),
                libsnappy-dev,
                libbz2-dev,
+               locales (>= 0),
                python-sphinx (>= 1.0.7+dfsg),
                texlive-latex-recommended,
                texlive-latex-extra,

=== modified file 'debian/patches/0001-use-dynamic-lib.patch'
--- debian/patches/0001-use-dynamic-lib.patch	2014-04-12 19:02:49 +0000
+++ debian/patches/0001-use-dynamic-lib.patch	2015-08-11 22:22:23 +0000
@@ -13,11 +13,9 @@
  setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/setup.py b/setup.py
-index 0f2f3f7..555e3dc 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -302,7 +302,7 @@ class Package(object):
+@@ -327,7 +327,7 @@
  
  class PosixPackage(Package):
      _library_prefixes = ['lib']

=== modified file 'debian/patches/0002-Use-system-compression-libs.patch'
--- debian/patches/0002-Use-system-compression-libs.patch	2014-04-12 19:02:49 +0000
+++ debian/patches/0002-Use-system-compression-libs.patch	2015-08-11 22:22:18 +0000
@@ -9,11 +9,9 @@
  setup.py | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
-diff --git a/setup.py b/setup.py
-index 555e3dc..d9e2ef6 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -725,14 +725,15 @@ if 'BLOSC' not in optional_libs:
+@@ -735,14 +735,15 @@
      # Blosc + BloscLZ sources
      blosc_files += glob.glob('c-blosc/blosc/*.c')
      # LZ4 sources

=== modified file 'debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch'
--- debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch	2014-04-12 19:02:49 +0000
+++ debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch	2015-08-11 22:17:08 +0000
@@ -6,16 +6,14 @@
  setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/setup.py b/setup.py
-index d9e2ef6..ab55629 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -752,7 +752,7 @@ if 'BLOSC' not in optional_libs:
+@@ -762,7 +762,7 @@
          finally:
              os.remove(fd.name)
  
--    if compiler_has_flags(compiler, ["-msse2"]):
-+    if False and compiler_has_flags(compiler, ["-msse2"]):
-         print("Setting compiler flag '-msse2'")
-         CFLAGS.append("-msse2")
- else:
+-    try_flags = ["-march=native", "-msse2"]
++    try_flags = ["-march=native"]
+     for ff in try_flags:
+         if compiler_has_flags(compiler, [ff]):
+             print("Setting compiler flag: " + ff)

=== modified file 'debian/patches/0005-Do-not-fetch-icons-for-external-web-sites.patch'
--- debian/patches/0005-Do-not-fetch-icons-for-external-web-sites.patch	2014-04-12 19:02:49 +0000
+++ debian/patches/0005-Do-not-fetch-icons-for-external-web-sites.patch	2015-08-11 22:22:11 +0000
@@ -6,11 +6,9 @@
  doc/source/conf.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 3a1d04b..51eade8 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -182,7 +182,7 @@ html_static_path = ['_static']
+@@ -194,7 +194,7 @@
  # Custom sidebar templates, maps document names to template names.
  html_sidebars = {
      'index': ['globaltoc.html', 'relations.html', 'sourcelink.html',

=== added file 'debian/patches/0008-Fix-setitem-return-value.patch'
--- debian/patches/0008-Fix-setitem-return-value.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0008-Fix-setitem-return-value.patch	2015-08-12 22:13:11 +0000
@@ -0,0 +1,24 @@
+Description: Clear the exception set by PyArray_SETITEM() before raising a
+ TypeError.  Without this, the test suite will raise a SystemError.
+Author: Barry Warsaw <ba...@ubuntu.com>
+Bug: https://github.com/PyTables/PyTables/issues/486
+
+--- a/tables/tableextension.pyx
++++ b/tables/tableextension.pyx
+@@ -40,7 +40,7 @@
+ 
+ # numpy functions & objects
+ from hdf5extension cimport Leaf
+-from cpython cimport PY_MAJOR_VERSION
++from cpython cimport PY_MAJOR_VERSION, PyErr_Clear
+ from libc.stdio cimport snprintf
+ from libc.stdlib cimport malloc, free
+ from libc.string cimport memcpy, strdup, strcmp, strlen
+@@ -1596,6 +1596,7 @@
+       if field.ndim == 1:
+         ret = PyArray_SETITEM(field, field.data + offset * self._stride, value)
+         if ret < 0:
++          PyErr_Clear()
+           raise TypeError
+       ##### End of optimization for scalar values
+       else:

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-08-15 07:37:41 +0000
+++ debian/patches/series	2015-08-12 19:31:23 +0000
@@ -1,7 +1,5 @@
 0001-use-dynamic-lib.patch
 0002-Use-system-compression-libs.patch
-0003-Better-control-of-verbosity-in-unittests.patch
 0004-Never-use-the-msse2-flag-explicitly.patch
 0005-Do-not-fetch-icons-for-external-web-sites.patch
-0006-fix-an-import-issue-with-cython-newer-than-0.20.2.patch
-0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch
+0008-Fix-setitem-return-value.patch

=== modified file 'debian/python-tables-doc.docs'
--- debian/python-tables-doc.docs	2013-01-28 10:02:57 +0000
+++ debian/python-tables-doc.docs	2015-08-12 20:37:58 +0000
@@ -1,4 +1,4 @@
 ANNOUNCE.txt
-README.txt
+README.rst
 RELEASE_NOTES.txt
 THANKS

=== modified file 'debian/python-tables.docs'
--- debian/python-tables.docs	2012-01-22 22:18:32 +0000
+++ debian/python-tables.docs	2015-08-12 21:11:25 +0000
@@ -1,3 +1,3 @@
-README.txt
+README.rst
 THANKS
 VERSION

=== modified file 'debian/rules'
--- debian/rules	2014-08-04 21:29:17 +0000
+++ debian/rules	2015-08-12 15:49:51 +0000
@@ -95,17 +95,28 @@
 	dh_numpy3
 	# using override_dh_auto_test causes problems for dbg versions
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	# https://github.com/PyTables/PyTables/issues/485
+	mkdir -p $(CURDIR)/tmp-locales
+	localedef -i /usr/share/i18n/locales/en_US -c -f UTF-8 \
+		-A /usr/share/locale/locale.alias \
+		$(CURDIR)/tmp-locales/en_US.UTF-8
 	set -e -x; \
 	for py in $(PY2VERS); do \
 		cd $(CURDIR)/build/lib.*-$$py; \
-		env PYTHONPATH=. python$$py tables/tests/test_all.py -vvv; \
+		env PYTHONPATH=. \
+		    LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 \
+		    python$$py tables/tests/test_all.py -vvv; \
 		cd $(CURDIR)/debian/tmp/usr/lib/python$$py/dist-packages; \
-		env PYTHONPATH=. python$$py-dbg tables/tests/test_all.py -vvv; \
+		env PYTHONPATH=. \
+		    LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 \
+		    python$$py-dbg tables/tests/test_all.py -vvv; \
 	done
 	set -e -x; \
 	for py in $(PY3VERS); do \
 		cd $(CURDIR)/build/lib.*-$$py; \
-		env PYTHONPATH=. python$$py tables/tests/test_all.py -vvv; \
+		env PYTHONPATH=. \
+		    LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 \
+		    python$$py tables/tests/test_all.py -vvv; \
 		#cd $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages; \
 		#env PYTHONPATH=. python$$py-dbg tables/tests/test_all.py -vvv; \
 	done

Reply via email to