Control: tags 936732 + patch
Control: tags 936732 + pending
Dear maintainer,
I've prepared an NMU for indexed-gzip (versioned as 0.8.6-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru indexed-gzip-0.8.6/debian/changelog indexed-gzip-0.8.6/debian/changelog
--- indexed-gzip-0.8.6/debian/changelog 2018-06-27 10:07:10.000000000 -0400
+++ indexed-gzip-0.8.6/debian/changelog 2019-10-19 17:02:11.000000000 -0400
@@ -1,3 +1,12 @@
+indexed-gzip (0.8.6-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop python2 support; Closes: #936732
+ * debian/patches/fix-fixtures.patch
+ - fix how fixtures are used, needed by pytest >= 4
+
+ -- Sandro Tosi <mo...@debian.org> Sat, 19 Oct 2019 17:02:11 -0400
+
indexed-gzip (0.8.6-1) unstable; urgency=medium
* Fresh upstream version, dropping CPed patches
diff -Nru indexed-gzip-0.8.6/debian/control indexed-gzip-0.8.6/debian/control
--- indexed-gzip-0.8.6/debian/control 2018-06-27 10:07:10.000000000 -0400
+++ indexed-gzip-0.8.6/debian/control 2019-10-19 16:24:37.000000000 -0400
@@ -8,47 +8,17 @@
Priority: optional
Build-Depends: debhelper (>= 9),
zlib1g-dev,
- cython,
cython3,
dh-python,
- python-all-dev,
python3-all-dev,
- python-pytest,
python3-pytest,
- python-pytest-runner,
python3-pytest-runner,
- python-setuptools,
python3-setuptools,
- python-numpy,
python3-numpy,
Standards-Version: 3.9.8
Homepage: https://github.com/pauldmccarthy/indexed_gzip
Vcs-Browser: https://github.com/neurodebian/indexed_gzip
Vcs-Git: git://github.com/neurodebian/indexed_gzip -b debian
-X-Python-Version: >= 2.7
-
-Package: python-indexed-gzip
-Architecture: any
-Section: python
-Depends: cython,
- python-numpy,
- ${misc:Depends},
- ${shlibs:Depends},
- ${python:Depends},
-Provides: ${python:Provides}
-Description: fast random access of gzip files in Python
- Drop-in replacement `IndexedGzipFile` for the built-in Python `gzip.GzipFile`
- class that does not need to start decompressing from the beginning of the
- file when for every `seek()`. It gets around this performance limitation by
- building an index, which contains *seek points*, mappings between
- corresponding locations in the compressed and uncompressed data streams. Each
- seek point is accompanied by a chunk (32KB) of uncompressed data which is
- used to initialise the decompression algorithm, allowing to start reading
- from any seek point. If the index is built with a seek point spacing of 1MB,
- only 512KB (on average) of data have to be decompressed to read from any
- location in the file.
- .
- This package provides the Python 2 module.
Package: python3-indexed-gzip
Architecture: any
diff -Nru indexed-gzip-0.8.6/debian/patches/fix-fixtures.patch indexed-gzip-0.8.6/debian/patches/fix-fixtures.patch
--- indexed-gzip-0.8.6/debian/patches/fix-fixtures.patch 1969-12-31 19:00:00.000000000 -0500
+++ indexed-gzip-0.8.6/debian/patches/fix-fixtures.patch 2019-10-19 17:01:50.000000000 -0400
@@ -0,0 +1,24 @@
+--- a/conftest.py
++++ b/conftest.py
+@@ -80,17 +80,16 @@ def seed(request):
+
+
+ @pytest.fixture
+-def testfile(request):
++def testfile(request, nelems, concat):
+
+ filename = request.config.getoption('--testfile')
+- _nelems = nelems(request)
+- _concat = concat(request)
+
+ if filename is None:
+ filename = op.join(os.getcwd(),
+- 'ctest_zran_{}_{}.gz'.format(_nelems, _concat))
++ 'ctest_zran_{}_{}.gz'.format(nelems, concat))
+
+ if not op.exists(filename):
+- gen_test_data(filename, _nelems, _concat)
++ gen_test_data(filename, nelems, concat)
+
+ return filename
++
diff -Nru indexed-gzip-0.8.6/debian/patches/series indexed-gzip-0.8.6/debian/patches/series
--- indexed-gzip-0.8.6/debian/patches/series 2018-06-27 10:07:10.000000000 -0400
+++ indexed-gzip-0.8.6/debian/patches/series 2019-10-19 17:01:30.000000000 -0400
@@ -1 +1,2 @@
deb_nocov_tests
+fix-fixtures.patch
diff -Nru indexed-gzip-0.8.6/debian/rules indexed-gzip-0.8.6/debian/rules
--- indexed-gzip-0.8.6/debian/rules 2018-06-27 10:07:10.000000000 -0400
+++ indexed-gzip-0.8.6/debian/rules 2019-10-19 16:27:50.000000000 -0400
@@ -15,11 +15,11 @@
# one ring to rule them all ...
%:
- dh $@ --with python2,python3 --buildsystem=pybuild
+ dh $@ --with python3 --buildsystem=pybuild
clean::
- python setup.py clean
+ python3 setup.py clean
dh_clean
# Ahhhhhhh!
rm -rf .pybuild build
@@ -30,13 +30,12 @@
# explicitely run the tests via distutils,as the maintainer appears to be
# too stupid to understand how to get pybuild to not fail on test invocation
override_dh_auto_test:
- python2 setup.py test --addopts '--niter 1'
python3 setup.py test --addopts '--niter 1'
override_dh_install:
dh_install
# to get the ABI dependency
- dh_numpy
+ dh_numpy3
# make orig tarball from repository content
get-orig-source:
diff -Nru indexed-gzip-0.8.6/debian/tests/control indexed-gzip-0.8.6/debian/tests/control
--- indexed-gzip-0.8.6/debian/tests/control 2018-06-27 10:07:10.000000000 -0400
+++ indexed-gzip-0.8.6/debian/tests/control 2019-10-19 16:26:46.000000000 -0400
@@ -1,7 +1,3 @@
-Test-Command: python setup.py test
-Depends: @, @builddeps@
-Restrictions: allow-stderr
-
Test-Command: python3 setup.py test
Depends: @, @builddeps@
Restrictions: allow-stderr
