From 0dbd8a0a013bf7718b6a45494dcbf2b62a8e6a1c Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Mon, 27 Jan 2020 12:05:37 -0500 Subject: [PATCH 1/2] NEP29: Bump minimum numpy to 1.13 --- doc/source/installation.rst | 2 +- min-requirements.txt | 3 ++- requirements.txt | 3 ++- setup.cfg | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/source/installation.rst b/doc/source/installation.rst index a7d6507995..c7be36c658 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -84,7 +84,7 @@ Requirements .. check these against setup.cfg * Python_ 3.5.1 or greater -* NumPy_ 1.12 or greater +* NumPy_ 1.13 or greater * SciPy_ (optional, for full SPM-ANALYZE support) * h5py_ (optional, for MINC2 support) * PyDICOM_ 0.9.9 or greater (optional, for DICOM support) diff --git a/min-requirements.txt b/min-requirements.txt index ed4ed75bf2..febcba7885 100644 --- a/min-requirements.txt +++ b/min-requirements.txt @@ -1,2 +1,3 @@ # Auto-generated by tools/update_requirements.py -numpy ==1.12 +numpy ==1.13 +packaging diff --git a/requirements.txt b/requirements.txt index 365f19556b..0cac05bb05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ # Auto-generated by tools/update_requirements.py -numpy >=1.12 +numpy >=1.13 +packaging diff --git a/setup.cfg b/setup.cfg index 0ae5619db2..9dee1a88a8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ provides = [options] python_requires = >=3.5.1 install_requires = - numpy >=1.12 + numpy >=1.13 packaging tests_require = nose >=0.11 From d388beddd83299c53ede9e6d4d23e3762b45493e Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Mon, 27 Jan 2020 16:14:18 -0500 Subject: [PATCH 2/2] MNT: Minimum packaging of 14.3 --- doc/source/installation.rst | 1 + doc/source/links_names.txt | 1 + min-requirements.txt | 2 +- requirements.txt | 2 +- setup.cfg | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/source/installation.rst b/doc/source/installation.rst index c7be36c658..ed390578ff 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -85,6 +85,7 @@ Requirements * Python_ 3.5.1 or greater * NumPy_ 1.13 or greater +* Packaging_ 14.3 or greater * SciPy_ (optional, for full SPM-ANALYZE support) * h5py_ (optional, for MINC2 support) * PyDICOM_ 0.9.9 or greater (optional, for DICOM support) diff --git a/doc/source/links_names.txt b/doc/source/links_names.txt index 8a936dc72e..1a1b688cd4 100644 --- a/doc/source/links_names.txt +++ b/doc/source/links_names.txt @@ -113,6 +113,7 @@ .. _datapkg: https://pythonhosted.org/datapkg/ .. _python imaging library: https://pypi.python.org/pypi/Pillow .. _h5py: https://www.h5py.org/ +.. _packaging: https://packaging.pypa.io .. Python imaging projects .. _PyMVPA: http://www.pymvpa.org diff --git a/min-requirements.txt b/min-requirements.txt index febcba7885..0d749072bf 100644 --- a/min-requirements.txt +++ b/min-requirements.txt @@ -1,3 +1,3 @@ # Auto-generated by tools/update_requirements.py numpy ==1.13 -packaging +packaging ==14.3 diff --git a/requirements.txt b/requirements.txt index 0cac05bb05..3134ffd33c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ # Auto-generated by tools/update_requirements.py numpy >=1.13 -packaging +packaging >=14.3 diff --git a/setup.cfg b/setup.cfg index 9dee1a88a8..d425dd2371 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,7 +31,7 @@ provides = python_requires = >=3.5.1 install_requires = numpy >=1.13 - packaging + packaging >=14.3 tests_require = nose >=0.11 pytest