Control: tags 935015 + patch
Control: tags 935015 + pending
Dear maintainer,
I've prepared an NMU for datalad (versioned as 0.11.6-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru datalad-0.11.6/debian/changelog datalad-0.11.6/debian/changelog
--- datalad-0.11.6/debian/changelog 2019-07-29 12:07:25.000000000 -0400
+++ datalad-0.11.6/debian/changelog 2019-08-23 17:58:36.000000000 -0400
@@ -1,3 +1,11 @@
+datalad (0.11.6-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop python2 support and switch to python 3; patches by Steve Langasek;
+ Closes: #935015
+
+ -- Sandro Tosi <mo...@debian.org> Fri, 23 Aug 2019 17:58:36 -0400
+
datalad (0.11.6-1) unstable; urgency=medium
* Fresh upstream release
diff -Nru datalad-0.11.6/debian/control datalad-0.11.6/debian/control
--- datalad-0.11.6/debian/control 2019-07-29 12:07:25.000000000 -0400
+++ datalad-0.11.6/debian/control 2019-08-23 17:40:59.000000000 -0400
@@ -11,39 +11,6 @@
git-annex (>= 6.20180913~) | git-annex-standalone (>= 6.20180913~),
help2man,
patool,
- python-all,
- python-appdirs,
- python-argcomplete,
- python-boto,
- python-dateutil,
- python-exif,
- python-fasteners,
- python-iso8601,
- python-jsmin,
- python-git (>= 2.1.6~),
- python-github,
- python-html5lib,
- python-httpretty,
- python-humanize,
- python-keyrings.alt | python-keyring (<=8),
- python-keyring,
- python-secretstorage | python-keyring (<<9.2),
- python-nose (>= 1.3.7-2) | python-libxmp,
- python-lzma,
- python-mock,
- python-msgpack,
- python-mutagen,
- python-nose,
- python-pil,
- python-pyperclip,
- python-requests,
- python-setuptools,
- python-simplejson,
- python-six (>= 1.8.0~),
- python-tqdm,
- python-whoosh,
- python-vcr,
- python-wrapt,
python3-all,
python3-appdirs,
python3-argcomplete,
@@ -89,7 +56,7 @@
python3-datalad (= ${binary:Version}),
python3-argcomplete,
${misc:Depends},
- ${python:Depends}
+ ${python3:Depends}
Suggests:
datalad-containers,
datalad-crawler,
@@ -113,69 +80,6 @@
This package provides the command line tools. Install without
Recommends if you need only core functionality.
-Package: python-datalad
-Architecture: all
-Section: python
-Provides: ${python:Provides}
-Depends:
- git-annex (>= 6.20180913~) | git-annex-standalone (>= 6.20180913~),
- patool,
- python-appdirs,
- python-fasteners,
- python-git (>= 2.1.6~),
- python-humanize,
- python-iso8601,
- python-keyrings.alt | python-keyring (<=8),
- python-secretstorage,
- python-keyring,
- python-mock,
- python-msgpack,
- python-pil,
- python-requests,
- python-simplejson,
- python-six (>= 1.8.0~),
- python-tqdm,
- python-wrapt,
- ${misc:Depends},
- ${python:Depends}
-Recommends:
- python-exif,
- python-github,
- python-jsmin,
- python-html5lib,
- python-httpretty,
- python-libxmp,
- python-lzma,
- python-mutagen,
- python-nose,
- python-pyperclip,
- python-requests-ftp,
- python-vcr,
- python-whoosh,
-Suggests:
- python-duecredit,
- python-bs4,
- python-numpy,
-Description: data files management and distribution platform
- DataLad is a data management and distribution platform providing
- access to a wide range of data resources already available online.
- Using git-annex as its backend for data logistics it provides following
- facilities built-in or available through additional extensions
- .
- - command line and Python interfaces for manipulation of collections of
- datasets (install, uninstall, update, publish, save, etc.) and
- separate files/directories (add, get)
- - extract, aggregate, and search through various sources of metadata
- (xmp, EXIF, etc; install datalad-neuroimaging for DICOM, BIDS, NIfTI
- support)
- - crawl web sites to automatically prepare and update git-annex
- repositories with content from online websites, S3, etc (install
- datalad-crawler)
- .
- This package installs the module for Python 2, and Recommends install
- all dependencies necessary for searching and managing datasets, publishing,
- and testing. If you need base functionality, install without Recommends.
-
Package: python3-datalad
Architecture: all
Section: python
diff -Nru datalad-0.11.6/debian/patches/python3.patch datalad-0.11.6/debian/patches/python3.patch
--- datalad-0.11.6/debian/patches/python3.patch 1969-12-31 19:00:00.000000000 -0500
+++ datalad-0.11.6/debian/patches/python3.patch 2019-08-23 17:41:01.000000000 -0400
@@ -0,0 +1,77 @@
+Description: use python3 interpreter, not python
+ datalad will automatically try to run .py scripts it's been given under
+ 'python' but that is python2 and no longer guaranteed to be available by
+ default. Dispatch these instead to python3.
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Last-Modified: 2019-08-17
+
+Index: datalad-0.11.6/datalad/interface/run_procedure.py
+===================================================================
+--- datalad-0.11.6.orig/datalad/interface/run_procedure.py
++++ datalad-0.11.6/datalad/interface/run_procedure.py
+@@ -189,7 +189,7 @@
+ 'state': state}
+ elif script_file.endswith('.py'):
+ return {'type': u'python_script',
+- 'template': u'python "{script}" "{ds}" {args}',
++ 'template': u'python3 "{script}" "{ds}" {args}',
+ 'state': state}
+ else:
+ return {'type': None, 'template': None, 'state': None}
+Index: datalad-0.11.6/datalad/interface/tests/test_run_procedure.py
+===================================================================
+--- datalad-0.11.6.orig/datalad/interface/tests/test_run_procedure.py
++++ datalad-0.11.6/datalad/interface/tests/test_run_procedure.py
+@@ -238,7 +238,7 @@
+ # for run:
+ ds.config.add(
+ 'datalad.procedures.datalad_test_proc.call-format',
+- 'python "{script}" "{ds}" {{mysub}} {args}',
++ 'python3 "{script}" "{ds}" {{mysub}} {args}',
+ where='dataset'
+ )
+ ds.config.add(
+@@ -258,7 +258,7 @@
+ # config on dataset level:
+ ds.config.add(
+ 'datalad.procedures.datalad_test_proc.call-format',
+- 'python "{script}" "{ds}" local {args}',
++ 'python3 "{script}" "{ds}" local {args}',
+ where='local'
+ )
+ ds.unlock("fromproc.txt")
+Index: datalad-0.11.6/Makefile
+===================================================================
+--- datalad-0.11.6.orig/Makefile
++++ datalad-0.11.6/Makefile
+@@ -1,8 +1,8 @@
+ # simple makefile to simplify repetetive build env management tasks under posix
+ # Ideas borrowed from scikit-learn's and PyMVPA Makefiles -- thanks!
+
+-PYTHON ?= python
+-NOSETESTS ?= nosetests
++PYTHON ?= python3
++NOSETESTS ?= nosetests3
+
+ MODULE ?= datalad
+
+@@ -16,7 +16,7 @@
+
+ bin:
+ mkdir -p $@
+- PYTHONPATH=bin:$(PYTHONPATH) python setup.py develop --install-dir $@
++ PYTHONPATH=bin:$(PYTHONPATH) $(PYTHON) setup.py develop --install-dir $@
+
+ test-code: bin
+ PATH=bin:$(PATH) PYTHONPATH=bin:$(PYTHONPATH) $(NOSETESTS) -s -v $(MODULE)
+@@ -45,8 +45,8 @@
+ release-pypi: update-changelog
+ # better safe than sorry
+ test ! -e dist
+- python setup.py sdist
+- python setup.py bdist_wheel --universal
++ $(PYTHON) setup.py sdist
++ $(PYTHON) setup.py bdist_wheel --universal
+ twine upload dist/*
+
+ render-casts: docs/source/usecases/simple_provenance_tracking.rst.in
diff -Nru datalad-0.11.6/debian/patches/series datalad-0.11.6/debian/patches/series
--- datalad-0.11.6/debian/patches/series 2019-07-29 12:07:25.000000000 -0400
+++ datalad-0.11.6/debian/patches/series 2019-08-23 17:40:59.000000000 -0400
@@ -1,3 +1,4 @@
deb_loosenup_setup_requires
deb_setup_no_msgpack_and_duecredit
deb_no_utf8
+python3.patch
diff -Nru datalad-0.11.6/debian/rules datalad-0.11.6/debian/rules
--- datalad-0.11.6/debian/rules 2019-07-29 12:07:25.000000000 -0400
+++ datalad-0.11.6/debian/rules 2019-08-23 17:40:59.000000000 -0400
@@ -24,7 +24,7 @@
export WRAPT_DISABLE_EXTENSIONS=1
%:
- dh $@ --with python2,python3 --buildsystem=pybuild
+ dh $@ --with python3 --buildsystem=pybuild
clean::
dh_clean
@@ -55,7 +55,7 @@
mkdir -p build/man
HOME=$(CURDIR)/build python3 setup.py build_manpage
# Generating argcomplete helper for bash_completion.d
- register-python-argcomplete datalad > debian/datalad/usr/share/bash-completion/completions/datalad
+ register-python-argcomplete3 datalad > debian/datalad/usr/share/bash-completion/completions/datalad
override_dh_installchangelogs:
dh_installchangelogs CHANGELOG.md
