|
| 1 | +Author: Andreas Tille < [email protected]> |
| 2 | +Last-Update: Thu, 20 Feb 2020 19:39:13 +0100 |
| 3 | +Description: Force usage of Python3 |
| 4 | + |
| 5 | +--- a/Makefile |
| 6 | ++++ b/Makefile |
| 7 | +@@ -2,7 +2,7 @@ |
| 8 | + # Files are then pushed to sourceforge using rsync with a command like this: |
| 9 | + # rsync -e ssh nipype-0.1-py2.5.egg cburns, [email protected]:/home/frs/project/n/ni/nipy/nipype/nipype-0.1/ |
| 10 | + |
| 11 | +-PYTHON ?= python |
| 12 | ++PYTHON ?= python3 |
| 13 | + |
| 14 | + .PHONY: zipdoc sdist egg upload_to_pypi trailing-spaces clean-pyc clean-so clean-build clean-ctags clean in inplace test-code test-coverage test html specs check-before-commit check gen-base-dockerfile gen-main-dockerfile gen-dockerfiles |
| 15 | + |
| 16 | +@@ -11,18 +11,18 @@ zipdoc: html |
| 17 | + |
| 18 | + sdist: zipdoc |
| 19 | + @echo "Building source distribution..." |
| 20 | +- python setup.py sdist |
| 21 | ++ python3 setup.py sdist |
| 22 | + @echo "Done building source distribution." |
| 23 | + # XXX copy documentation.zip to dist directory. |
| 24 | + |
| 25 | + egg: zipdoc |
| 26 | + @echo "Building egg..." |
| 27 | +- python setup.py bdist_egg |
| 28 | ++ python3 setup.py bdist_egg |
| 29 | + @echo "Done building egg." |
| 30 | + |
| 31 | + upload_to_pypi: zipdoc |
| 32 | + @echo "Uploading to PyPi..." |
| 33 | +- python setup.py sdist --formats=zip,gztar upload |
| 34 | ++ python3 setup.py sdist --formats=zip,gztar upload |
| 35 | + |
| 36 | + trailing-spaces: |
| 37 | + find . -name "*[.py|.rst]" -type f | xargs perl -pi -e 's/[ \t]*$$//' |
| 38 | +@@ -70,7 +70,7 @@ html: |
| 39 | + |
| 40 | + specs: |
| 41 | + @echo "Checking specs and autogenerating spec tests" |
| 42 | +- env PYTHONPATH=".:$(PYTHONPATH)" python tools/checkspecs.py |
| 43 | ++ env PYTHONPATH=".:$(PYTHONPATH)" python3 tools/checkspecs.py |
| 44 | + |
| 45 | + check: check-before-commit # just a shortcut |
| 46 | + check-before-commit: specs trailing-spaces html test |
| 47 | +--- a/tools/gitwash_dumper.py |
| 48 | ++++ b/tools/gitwash_dumper.py |
| 49 | +@@ -1,4 +1,4 @@ |
| 50 | +-#!/usr/bin/env python |
| 51 | ++#!/usr/bin/env python3 |
| 52 | + """ Checkout gitwash repo into directory and do search replace on name """ |
| 53 | + import os |
| 54 | + from os.path import join as pjoin |
| 55 | +--- a/doc/conf.py |
| 56 | ++++ b/doc/conf.py |
| 57 | +@@ -20,9 +20,9 @@ doc_path = os.path.abspath(os.path.dirna |
| 58 | + os.makedirs('users/examples', exist_ok=True) |
| 59 | + |
| 60 | + os.chdir(os.path.join(doc_path, 'users', 'examples')) |
| 61 | +-os.system("""python ../../../tools/ex2rst -x ../../../examples/test_spm.py \ |
| 62 | ++os.system("""python3 ../../../tools/ex2rst -x ../../../examples/test_spm.py \ |
| 63 | + --project Nipype --outdir . ../../../examples""") |
| 64 | +-os.system("""python ../../../tools/ex2rst --project Nipype --outdir . \ |
| 65 | ++os.system("""python3 ../../../tools/ex2rst --project Nipype --outdir . \ |
| 66 | + ../../../examples/frontiers_paper""") |
| 67 | + os.chdir(doc_path) |
| 68 | + |
0 commit comments