[Python-apps-commits] r12416 - in packages/s3ql/trunk/debian (6 files)

nikratio-guest at users.alioth.debian.org nikratio-guest at users.alioth.debian.org
Fri Sep 25 21:07:58 UTC 2015


    Date: Friday, September 25, 2015 @ 21:07:56
  Author: nikratio-guest
Revision: 12416

* New upstream release.
* Dropped fix_setattr_test.diff (fixed upstream).
* Added use_cython3.diff and ignore_cython_warnings.diff to handle
  Debian-specific Cython peculiarities.

Added:
  packages/s3ql/trunk/debian/patches/ignore_cython_warnings.diff
  packages/s3ql/trunk/debian/patches/use_cython3.diff
Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/control
  packages/s3ql/trunk/debian/patches/series
Deleted:
  packages/s3ql/trunk/debian/patches/fix_setattr_test.diff

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2015-09-24 16:15:25 UTC (rev 12415)
+++ packages/s3ql/trunk/debian/changelog	2015-09-25 21:07:56 UTC (rev 12416)
@@ -1,10 +1,14 @@
-s3ql (2.14+dfsg-2) UNRELEASED; urgency=medium
+s3ql (2.15+dfsg-1) UNRELEASED; urgency=medium
 
   * Add Breaks and Replaces to prevent upgrade problems due to the
     extension for the debug interpreter having moved from s3ql-dbg to s3ql in
     2.14+dfsg-1. Closes: #799261.
+  * New upstream release.
+  * Dropped fix_setattr_test.diff (fixed upstream).
+  * Added use_cython3.diff and ignore_cython_warnings.diff to handle
+    Debian-specific Cython peculiarities.
 
- -- Nikolaus Rath <Nikolaus at rath.org>  Thu, 17 Sep 2015 08:25:09 -0700
+ -- Nikolaus Rath <Nikolaus at rath.org>  Fri, 25 Sep 2015 13:50:51 -0700
 
 s3ql (2.14+dfsg-1) unstable; urgency=medium
 

Modified: packages/s3ql/trunk/debian/control
===================================================================
--- packages/s3ql/trunk/debian/control	2015-09-24 16:15:25 UTC (rev 12415)
+++ packages/s3ql/trunk/debian/control	2015-09-25 21:07:56 UTC (rev 12416)
@@ -18,7 +18,7 @@
                python3-dugong (>= 3.4),
                python3-pytest (>= 2.3.3),
                python3-defusedxml,
-               cython3 (>= 0.17),
+               cython3 (>= 0.23),
                texlive-latex-base,
                texlive-latex-recommended,
                texlive-latex-extra,

Deleted: packages/s3ql/trunk/debian/patches/fix_setattr_test.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/fix_setattr_test.diff	2015-09-24 16:15:25 UTC (rev 12415)
+++ packages/s3ql/trunk/debian/patches/fix_setattr_test.diff	2015-09-25 21:07:56 UTC (rev 12416)
@@ -1,20 +0,0 @@
-Description: Fix failure of fs_api_tests::test_setattr with recent python3-llfuse
-Origin: debian
-Forwarded: yes
-Last-Update: <2015-09-10>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
-This test was relying on some undocumented behavior in Python-LLFUSE that
-has now changed. This patch makes the test working again.
-
---- a/tests/t3_fs_api.py
-+++ b/tests/t3_fs_api.py
-@@ -435,6 +435,8 @@
-         inode_old = self.server.getattr(inode.id).copy()
- 
-         attr = llfuse.EntryAttributes()
-+        for name in attr.__slots__:
-+            setattr(attr, name, None)
-         attr.st_mode = self.file_mode()
-         attr.st_uid = randint(0, 2 ** 32)
-         attr.st_gid = randint(0, 2 ** 32)

Added: packages/s3ql/trunk/debian/patches/ignore_cython_warnings.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/ignore_cython_warnings.diff	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/ignore_cython_warnings.diff	2015-09-25 21:07:56 UTC (rev 12416)
@@ -0,0 +1,26 @@
+Description: Ignore compiler warnings due to old Cython version
+Origin: debian
+Forwarded: not-needed
+Last-Update: <2015-09-28>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+Cython versions prior to 0.24 generate Gcc compiler warnings.
+Since Cython 0.24 isn't in Debian yet, we ignore these warnings.
+
+--- a/setup.py
++++ b/setup.py
+@@ -118,14 +118,6 @@
+ 
+     compile_args = ['-Wall', '-Wextra', '-Wconversion', '-Wsign-compare']
+ 
+-    # Value-changing conversions should always be explicit.
+-    compile_args.append('-Werror=conversion')
+-
+-    # Note that (i > -1) is false if i is unsigned (-1 will be converted to
+-    # a large positive value). We certainly don't want to do this by
+-    # accident.
+-    compile_args.append('-Werror=sign-compare')
+-
+     # Enable all fatal warnings only when compiling from Mercurial tip.
+     # (otherwise we break forward compatibility because compilation with newer
+     # compiler may fail if additional warnings are added)

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2015-09-24 16:15:25 UTC (rev 12415)
+++ packages/s3ql/trunk/debian/patches/series	2015-09-25 21:07:56 UTC (rev 12416)
@@ -1,4 +1,5 @@
-fix_setattr_test.diff
 proc_mount.diff
 clock-granularity.diff
 support_jessie_upgrade.diff
+ignore_cython_warnings.diff
+use_cython3.diff

Added: packages/s3ql/trunk/debian/patches/use_cython3.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/use_cython3.diff	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/use_cython3.diff	2015-09-25 21:07:56 UTC (rev 12416)
@@ -0,0 +1,30 @@
+Description: Use 'cython3' instead of 'cython' command
+Origin: debian
+Forwarded: not-needed
+Last-Update: <2015-09-25>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+In Debian, python3-cython provides only a 'cython3' command. To avoid
+pulling in the complete Python 2.x runtime environment for python-cython,
+we use 'cython3' instead.
+
+--- a/setup.py
++++ b/setup.py
+@@ -201,7 +201,7 @@
+ 
+     def run(self):
+         try:
+-            version = subprocess.check_output(['cython', '--version'],
++            version = subprocess.check_output(['cython3', '--version'],
+                                               universal_newlines=True, stderr=subprocess.STDOUT)
+         except FileNotFoundError:
+             raise SystemExit('Cython needs to be installed for this command') from None
+@@ -210,7 +210,7 @@
+         if not hit or LooseVersion(hit.group(1)) < "0.17":
+             raise SystemExit('Need Cython 0.17 or newer, found ' + version)
+ 
+-        cmd = ['cython', '-Wextra', '-f', '-3',
++        cmd = ['cython3', '-Wextra', '-f', '-3',
+                '-X', 'embedsignature=True' ]
+         if DEVELOPER_MODE:
+             cmd.append('-Werror')




More information about the Python-apps-commits mailing list