[Python-modules-commits] r29895 - in packages/python-cffi/trunk/debian (13 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Thu Jul 24 12:55:54 UTC 2014
Date: Thursday, July 24, 2014 @ 12:55:53
Author: stefanor
Revision: 29895
* New upstream release.
* Drop patches, applied upstream.
* Patch: arm64: Test suite passes on arm64 (LP: #1271256)
* Bump Standards-Version to 3.9.5, no changes needed.
* Use pybuild's --name feature. Bump B-D appropriately.
* Use --tb=native for ADT tests, so that logs won't get GB long
(Closes: #743244)
* Depend on build-essential in ADT tests.
* Build-Depend (and ADT Depend) on the new virtualenv package, rather than
python-virtualenv, for the zintegration tests.
* Add DEP-12 upstream metadata.
Added:
packages/python-cffi/trunk/debian/patches/
packages/python-cffi/trunk/debian/patches/arm64
packages/python-cffi/trunk/debian/patches/series
packages/python-cffi/trunk/debian/upstream/
packages/python-cffi/trunk/debian/upstream/metadata
Modified:
packages/python-cffi/trunk/debian/changelog
packages/python-cffi/trunk/debian/control
packages/python-cffi/trunk/debian/copyright
packages/python-cffi/trunk/debian/rules
packages/python-cffi/trunk/debian/tests/control
packages/python-cffi/trunk/debian/tests/unittests
packages/python-cffi/trunk/debian/tests/unittests3
Deleted:
packages/python-cffi/trunk/debian/patches/
Modified: packages/python-cffi/trunk/debian/changelog
===================================================================
--- packages/python-cffi/trunk/debian/changelog 2014-07-24 09:18:33 UTC (rev 29894)
+++ packages/python-cffi/trunk/debian/changelog 2014-07-24 12:55:53 UTC (rev 29895)
@@ -1,3 +1,19 @@
+python-cffi (0.8.6-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop patches, applied upstream.
+ * Patch: arm64: Test suite passes on arm64 (LP: #1271256)
+ * Bump Standards-Version to 3.9.5, no changes needed.
+ * Use pybuild's --name feature. Bump B-D appropriately.
+ * Use --tb=native for ADT tests, so that logs won't get GB long
+ (Closes: #743244)
+ * Depend on build-essential in ADT tests.
+ * Build-Depend (and ADT Depend) on the new virtualenv package, rather than
+ python-virtualenv, for the zintegration tests.
+ * Add DEP-12 upstream metadata.
+
+ -- Stefano Rivera <stefanor at debian.org> Thu, 24 Jul 2014 10:55:19 +0200
+
python-cffi (0.8.1-2) unstable; urgency=medium
* Team upload
Modified: packages/python-cffi/trunk/debian/control
===================================================================
--- packages/python-cffi/trunk/debian/control 2014-07-24 09:18:33 UTC (rev 29894)
+++ packages/python-cffi/trunk/debian/control 2014-07-24 12:55:53 UTC (rev 29895)
@@ -5,7 +5,7 @@
Uploaders: Stefano Rivera <stefanor at debian.org>
Build-Depends:
debhelper (>= 9),
- dh-python,
+ dh-python (>= 1.20130901),
libffi-dev,
python-all-dbg,
python-all-dev (>= 2.6.6-3~),
@@ -13,14 +13,14 @@
python-pycparser,
python-pytest,
python-setuptools,
- python-virtualenv,
+ virtualenv | python-virtualenv (<< 1.11.6),
python3-all-dbg,
python3-all-dev (>= 3.1.2-6~),
python3-py,
python3-pycparser,
python3-pytest,
python3-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://cffi.readthedocs.org/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-cffi/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-cffi/trunk/
Modified: packages/python-cffi/trunk/debian/copyright
===================================================================
--- packages/python-cffi/trunk/debian/copyright 2014-07-24 09:18:33 UTC (rev 29894)
+++ packages/python-cffi/trunk/debian/copyright 2014-07-24 12:55:53 UTC (rev 29895)
@@ -4,8 +4,8 @@
Source: http://pypi.python.org/pypi/cffi/
Files: *
-Copyright: 2012-2013, Armin Rigo
- 2012-2013, Maciej Fijalkowski
+Copyright: 2012-2014, Armin Rigo
+ 2012-2014, Maciej Fijalkowski
License: Expat
Files: c/libffi_msvc/*
Added: packages/python-cffi/trunk/debian/patches/arm64
===================================================================
--- packages/python-cffi/trunk/debian/patches/arm64 (rev 0)
+++ packages/python-cffi/trunk/debian/patches/arm64 2014-07-24 12:55:53 UTC (rev 29895)
@@ -0,0 +1,59 @@
+Description: ARM64 support
+Author: Will Newton <will.newton at linaro.org>
+Author: Stefano Rivera <stefanor at debian.org>
+Bug-Upstream: https://bitbucket.org/cffi/cffi/issue/136/cffi-tests-fail-on-aarch64
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-cffi/+bug/1271256
+Origin: upstream, https://bitbucket.org/cffi/cffi/commits/af4e381b5e99c27c466377145a84eeece6e5c199/
+Last-Update: 2014-07-24
+
+--- a/c/_cffi_backend.c
++++ b/c/_cffi_backend.c
+@@ -3622,7 +3622,7 @@
+ #ifdef MS_WIN32
+ sflags |= SF_MSVC_BITFIELDS;
+ #else
+-# ifdef __arm__
++# if defined(__arm__) || defined(__aarch64__)
+ sflags |= SF_GCC_ARM_BITFIELDS;
+ # else
+ sflags |= SF_GCC_X86_BITFIELDS;
+--- a/testing/test_ffi_backend.py
++++ b/testing/test_ffi_backend.py
+@@ -122,7 +122,7 @@
+ self.check("int a:2; short b:15; char c:2; char y;", 5, 4, 8)
+ self.check("int a:2; char b:1; char c:1; char y;", 1, 4, 4)
+
+- @pytest.mark.skipif("platform.machine().startswith('arm')")
++ @pytest.mark.skipif("platform.machine().startswith(('arm', 'aarch64'))")
+ def test_bitfield_anonymous_no_align(self):
+ L = FFI().alignof("long long")
+ self.check("char y; int :1;", 0, 1, 2)
+@@ -135,7 +135,8 @@
+ self.check("char x; long long z:57; char y;", L + 8, L, L + 8 + L)
+ self.check("char x; long long :57; char y;", L + 8, 1, L + 9)
+
+- @pytest.mark.skipif("not platform.machine().startswith('arm')")
++ @pytest.mark.skipif(
++ "not platform.machine().startswith(('arm', 'aarch64'))")
+ def test_bitfield_anonymous_align_arm(self):
+ L = FFI().alignof("long long")
+ self.check("char y; int :1;", 0, 4, 4)
+@@ -148,7 +149,7 @@
+ self.check("char x; long long z:57; char y;", L + 8, L, L + 8 + L)
+ self.check("char x; long long :57; char y;", L + 8, L, L + 8 + L)
+
+- @pytest.mark.skipif("platform.machine().startswith('arm')")
++ @pytest.mark.skipif("platform.machine().startswith(('arm', 'aarch64'))")
+ def test_bitfield_zero(self):
+ L = FFI().alignof("long long")
+ self.check("char y; int :0;", 0, 1, 4)
+@@ -159,7 +160,8 @@
+ self.check("char x; int :0; short b:1; char y;", 5, 2, 6)
+ self.check("int a:1; int :0; int b:1; char y;", 5, 4, 8)
+
+- @pytest.mark.skipif("not platform.machine().startswith('arm')")
++ @pytest.mark.skipif(
++ "not platform.machine().startswith(('arm', 'aarch64'))")
+ def test_bitfield_zero_arm(self):
+ L = FFI().alignof("long long")
+ self.check("char y; int :0;", 0, 4, 4)
Added: packages/python-cffi/trunk/debian/patches/series
===================================================================
--- packages/python-cffi/trunk/debian/patches/series (rev 0)
+++ packages/python-cffi/trunk/debian/patches/series 2014-07-24 12:55:53 UTC (rev 29895)
@@ -0,0 +1 @@
+arm64
Modified: packages/python-cffi/trunk/debian/rules
===================================================================
--- packages/python-cffi/trunk/debian/rules 2014-07-24 09:18:33 UTC (rev 29894)
+++ packages/python-cffi/trunk/debian/rules 2014-07-24 12:55:53 UTC (rev 29895)
@@ -1,9 +1,6 @@
#!/usr/bin/make -f
-export PYBUILD_DESTDIR_python2=debian/python-cffi/
-export PYBUILD_DESTDIR_python2-dbg=debian/python-cffi-dbg/
-export PYBUILD_DESTDIR_python3=debian/python3-cffi/
-export PYBUILD_DESTDIR_python3-dbg=debian/python3-cffi-dbg/
+export PYBUILD_NAME=cffi
%:
dh $@ --with python2,python3 --buildsystem pybuild
Modified: packages/python-cffi/trunk/debian/tests/control
===================================================================
--- packages/python-cffi/trunk/debian/tests/control 2014-07-24 09:18:33 UTC (rev 29894)
+++ packages/python-cffi/trunk/debian/tests/control 2014-07-24 12:55:53 UTC (rev 29895)
@@ -1,19 +1,21 @@
Tests: unittests
Depends:
+ build-essential,
python-all-dbg,
python-all-dev,
python-cffi,
python-cffi-dbg,
python-py,
python-pytest,
- python-virtualenv
+ virtualenv | python-virtualenv (<< 1.11.6)
Tests: unittests3
Depends:
- python-virtualenv,
+ build-essential,
python3-all-dbg,
python3-all-dev,
python3-cffi,
python3-cffi-dbg,
python3-py,
- python3-pytest
+ python3-pytest,
+ virtualenv | python-virtualenv (<< 1.11.6)
Modified: packages/python-cffi/trunk/debian/tests/unittests
===================================================================
--- packages/python-cffi/trunk/debian/tests/unittests 2014-07-24 09:18:33 UTC (rev 29894)
+++ packages/python-cffi/trunk/debian/tests/unittests 2014-07-24 12:55:53 UTC (rev 29895)
@@ -13,7 +13,7 @@
cd "$ADTTMP"
for py in $pythons; do
echo "======= $py ======="
- $py -m pytest c testing
+ $py -m pytest --tb=native c testing
echo "======= $py-dbg ======="
- $py-dbg -m pytest c testing 2>&1
+ $py-dbg -m pytest --tb=native c testing 2>&1
done
Modified: packages/python-cffi/trunk/debian/tests/unittests3
===================================================================
--- packages/python-cffi/trunk/debian/tests/unittests3 2014-07-24 09:18:33 UTC (rev 29894)
+++ packages/python-cffi/trunk/debian/tests/unittests3 2014-07-24 12:55:53 UTC (rev 29895)
@@ -13,7 +13,7 @@
cd "$ADTTMP"
for py in $pythons; do
echo "======= $py ======="
- $py -m pytest c testing
+ $py -m pytest --tb=native c testing
echo "======= $py-dbg ======="
- $py-dbg -m pytest c testing 2>&1
+ $py-dbg -m pytest --tb=native c testing 2>&1
done
Added: packages/python-cffi/trunk/debian/upstream/metadata
===================================================================
--- packages/python-cffi/trunk/debian/upstream/metadata (rev 0)
+++ packages/python-cffi/trunk/debian/upstream/metadata 2014-07-24 12:55:53 UTC (rev 29895)
@@ -0,0 +1,8 @@
+Archive: PyPI
+Bug-Database: https://bitbucket.org/cffi/cffi/issues
+Bug-Submit: https://bitbucket.org/cffi/cffi/issues/new
+Contact: https://groups.google.com/forum/#!forum/python-cffi
+Name: CFFI
+Homepage: http://cffi.readthedocs.org/
+Repository: https://bitbucket.org/cffi/cffi
+Repository-Browse: https://bitbucket.org/cffi/cffi
More information about the Python-modules-commits
mailing list