[Python-modules-commits] r34444 - in packages/wheel/trunk/debian (10 files)
barry at users.alioth.debian.org
barry at users.alioth.debian.org
Thu Oct 1 23:20:53 UTC 2015
Date: Thursday, October 1, 2015 @ 23:20:51
Author: barry
Revision: 34444
* New upstream release.
* d/patches/python35-support.patch: Removed; applied upstream.
* d/patches/reproducible-whls.diff:
- Update patch to use $SOURCE_DATE_EPOCH instead of $WHEEL_FORCE_TIMESTAMP.
(Closes: #795942)
- Use time.gmtime() instead of .localtime() to avoid timezone issues.
(Closes: #789981)
* d/rules: The test suite requires an installed package, so defer this
to DEP-8 tests. (Closes: #796520)
* d/tests/control: Add two tests of the package's test suite.
* d/control: Now that the test suite isn't run at package build time,
remove the Build-Depends on python-pytest and python3-pytest.
* wrap-and-sort
Modified:
packages/wheel/trunk/debian/changelog
packages/wheel/trunk/debian/control
packages/wheel/trunk/debian/patches/reproducible-whls.diff
packages/wheel/trunk/debian/patches/series
packages/wheel/trunk/debian/python-wheel-common.manpages
packages/wheel/trunk/debian/rules
packages/wheel/trunk/debian/tests/control
packages/wheel/trunk/debian/tests/reproduce-2
packages/wheel/trunk/debian/tests/reproduce-3
Deleted:
packages/wheel/trunk/debian/patches/python35-support.patch
Modified: packages/wheel/trunk/debian/changelog
===================================================================
--- packages/wheel/trunk/debian/changelog 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/changelog 2015-10-01 23:20:51 UTC (rev 34444)
@@ -1,3 +1,21 @@
+wheel (0.26.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * d/patches/python35-support.patch: Removed; applied upstream.
+ * d/patches/reproducible-whls.diff:
+ - Update patch to use $SOURCE_DATE_EPOCH instead of $WHEEL_FORCE_TIMESTAMP.
+ (Closes: #795942)
+ - Use time.gmtime() instead of .localtime() to avoid timezone issues.
+ (Closes: #789981)
+ * d/rules: The test suite requires an installed package, so defer this
+ to DEP-8 tests. (Closes: #796520)
+ * d/tests/control: Add two tests of the package's test suite.
+ * d/control: Now that the test suite isn't run at package build time,
+ remove the Build-Depends on python-pytest and python3-pytest.
+ * wrap-and-sort
+
+ -- Barry Warsaw <barry at debian.org> Thu, 01 Oct 2015 16:49:32 -0400
+
wheel (0.24.0-3) unstable; urgency=medium
* d/patches/python35-support.patch: Fix a bug on Python 3.5.
Modified: packages/wheel/trunk/debian/control
===================================================================
--- packages/wheel/trunk/debian/control 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/control 2015-10-01 23:20:51 UTC (rev 34444)
@@ -9,11 +9,9 @@
Build-Depends: debhelper (>= 9),
dh-python,
python-all (>= 2.6.6-3~),
- python-pytest,
python-setuptools,
python-sphinx,
python3-all,
- python3-pytest,
python3-setuptools
Standards-Version: 3.9.6
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/wheel/trunk/
Deleted: packages/wheel/trunk/debian/patches/python35-support.patch
===================================================================
--- packages/wheel/trunk/debian/patches/python35-support.patch 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/patches/python35-support.patch 2015-10-01 23:20:51 UTC (rev 34444)
@@ -1,26 +0,0 @@
-Description: Fixes for Python 3.5 compatibility.
-Origin: https://bitbucket.org/pypa/wheel/pull-request/53/use-split-instead-of-rsplit-to-create/diff
-Author: Barry Warsaw <barry at debian.org>
-
---- a/wheel/bdist_wheel.py
-+++ b/wheel/bdist_wheel.py
-@@ -148,7 +148,7 @@
- # sys.pypy_version_info.minor)
- abi_tag = sysconfig.get_config_vars().get('SOABI', 'none')
- if abi_tag.startswith('cpython-'):
-- abi_tag = 'cp' + abi_tag.rsplit('-', 1)[-1]
-+ abi_tag = 'cp' + abi_tag.split('-')[1]
-
- tag = (impl_name + impl_ver, abi_tag, plat_name)
- # XXX switch to this alternate implementation for non-pure:
---- a/wheel/pep425tags.py
-+++ b/wheel/pep425tags.py
-@@ -60,7 +60,7 @@
-
- soabi = sysconfig.get_config_var('SOABI')
- if soabi and soabi.startswith('cpython-'):
-- abis[0:0] = ['cp' + soabi.split('-', 1)[-1]]
-+ abis[0:0] = ['cp' + soabi.split('-')[1]]
-
- abi3s = set()
- import imp
Modified: packages/wheel/trunk/debian/patches/reproducible-whls.diff
===================================================================
--- packages/wheel/trunk/debian/patches/reproducible-whls.diff 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/patches/reproducible-whls.diff 2015-10-01 23:20:51 UTC (rev 34444)
@@ -26,11 +26,11 @@
+ # Some applications need reproducible .whl files, but they can't do this
+ # without forcing the timestamp of the individual ZipInfo objects. See
+ # issue #143.
-+ timestamp = os.environ.get('WHEEL_FORCE_TIMESTAMP')
++ timestamp = os.environ.get('SOURCE_DATE_EPOCH')
+ if timestamp is None:
+ date_time = None
+ else:
-+ date_time = time.localtime(int(timestamp))[0:6]
++ date_time = time.gmtime(int(timestamp))[0:6]
+
# XXX support bz2, xz when available
zip = zipfile.ZipFile(open(zip_filename, "wb+"), "w",
@@ -44,7 +44,7 @@
+ def writefile(path, date_time):
+ if date_time is None:
+ st = os.stat(path)
-+ mtime = time.localtime(st.st_mtime)
++ mtime = time.gmtime(st.st_mtime)
+ date_time = mtime[0:6]
+ zinfo = zipfile.ZipInfo(path, date_time)
+ with open(path, 'rb') as fp:
@@ -68,7 +68,7 @@
--- a/wheel/bdist_wheel.py
+++ b/wheel/bdist_wheel.py
-@@ -409,7 +409,7 @@
+@@ -410,7 +410,7 @@
pymeta['extensions']['python.details']['document_names']['license'] = license_filename
with open(metadata_json_path, "w") as metadata_json:
@@ -79,7 +79,7 @@
--- a/wheel/metadata.py
+++ b/wheel/metadata.py
-@@ -69,7 +69,14 @@
+@@ -74,7 +74,14 @@
if may_requires:
metadata['run_requires'] = []
@@ -92,7 +92,7 @@
+ return ''
+ return key.condition
+ for key, value in sorted(may_requires.items(), key=sort_key):
- may_requirement = {'requires':value}
+ may_requirement = OrderedDict((('requires', value),))
if key.extra:
may_requirement['extra'] = key.extra
--- a/wheel/test/test_wheelfile.py
@@ -164,7 +164,7 @@
+ fp.write(filename + '\n')
+ zip_base_name = os.path.join(tempdir, 'dummy')
+ # The earliest date representable in TarInfos, 1980-01-01
-+ with environ('WHEEL_FORCE_TIMESTAMP', '315576060'):
++ with environ('SOURCE_DATE_EPOCH', '315576060'):
+ zip_filename = wheel.archive.make_wheelfile_inner(
+ zip_base_name, tempdir)
+ with readable_zipfile(zip_filename) as zf:
Modified: packages/wheel/trunk/debian/patches/series
===================================================================
--- packages/wheel/trunk/debian/patches/series 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/patches/series 2015-10-01 23:20:51 UTC (rev 34444)
@@ -1,2 +1 @@
reproducible-whls.diff
-python35-support.patch
Modified: packages/wheel/trunk/debian/python-wheel-common.manpages
===================================================================
--- packages/wheel/trunk/debian/python-wheel-common.manpages 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/python-wheel-common.manpages 2015-10-01 23:20:51 UTC (rev 34444)
@@ -1,3 +1,3 @@
+debian/manpages/_build/man/egg2wheel.1
debian/manpages/_build/man/wheel.1
-debian/manpages/_build/man/egg2wheel.1
debian/manpages/_build/man/wininst2wheel.1
Modified: packages/wheel/trunk/debian/rules
===================================================================
--- packages/wheel/trunk/debian/rules 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/rules 2015-10-01 23:20:51 UTC (rev 34444)
@@ -31,6 +31,10 @@
rm -rf debian/python3-wheel/usr/lib/python3.?/*-packages/*.egg-info
+# The tests require that the package be installed, so defer them to DEP-8.
+override_dh_auto_test:
+
+
override_dh_auto_clean:
dh_auto_clean
rm -rf debian/manpages/_build
Modified: packages/wheel/trunk/debian/tests/control
===================================================================
--- packages/wheel/trunk/debian/tests/control 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/tests/control 2015-10-01 23:20:51 UTC (rev 34444)
@@ -9,3 +9,9 @@
Tests: reproduce-3
Depends: @, python3-setuptools, coreutils
+
+Test-Command: python2 -m pytest --ignore=debian
+Depends: @, python-setuptools, python-pytest, python-pytest-cov, python-jsonschema, python-xdg, python-keyring
+
+Test-Command: python3 -m pytest --ignore=debian
+Depends: @, python3-setuptools, python3-pytest, python3-pytest-cov, python3-jsonschema, python3-xdg, python3-keyring
Modified: packages/wheel/trunk/debian/tests/reproduce-2
===================================================================
--- packages/wheel/trunk/debian/tests/reproduce-2 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/tests/reproduce-2 2015-10-01 23:20:51 UTC (rev 34444)
@@ -1,7 +1,7 @@
#!/bin/bash
# For reproducible .whl files. See bug ##776026.
-export WHEEL_FORCE_TIMESTAMP=315576060
+export SOURCE_DATE_EPOCH=315576060
# Change to the directory with the setup.py.
cd debian/tests/dummy
Modified: packages/wheel/trunk/debian/tests/reproduce-3
===================================================================
--- packages/wheel/trunk/debian/tests/reproduce-3 2015-10-01 23:10:07 UTC (rev 34443)
+++ packages/wheel/trunk/debian/tests/reproduce-3 2015-10-01 23:20:51 UTC (rev 34444)
@@ -1,7 +1,7 @@
#!/bin/bash
# For reproducible .whl files. See bug ##776026.
-export WHEEL_FORCE_TIMESTAMP=315576060
+export SOURCE_DATE_EPOCH=315576060
# Change to the directory with the setup.py.
cd debian/tests/dummy
More information about the Python-modules-commits
mailing list