Package: datalad
Followup-For: Bug #935015
User: [email protected]
Usertags: origin-ubuntu eoan ubuntu-patch
Sorry, I overlooked that there was still an undeclared build-dependency on
python/python-setuptools which I happened to have present in my test build
environment. The attached patch or something like it is also needed in
order for datalad to build without python2.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
[email protected] [email protected]
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 2019-08-16 21:28:05.000000000
-0700
+++ datalad-0.11.6/debian/patches/python3.patch 2019-08-19 10:49:52.000000000
-0700
@@ -40,3 +40,38 @@
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
