Skip to content

Commit 95c934b

Browse files
authored
Merge pull request #868 from effigies/nep29/numpy_1_13
NEP29: Bump minimum numpy to 1.13
2 parents 6863271 + d388bed commit 95c934b

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

doc/source/installation.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ Requirements
8484
.. check these against setup.cfg
8585
8686
* Python_ 3.5.1 or greater
87-
* NumPy_ 1.12 or greater
87+
* NumPy_ 1.13 or greater
88+
* Packaging_ 14.3 or greater
8889
* SciPy_ (optional, for full SPM-ANALYZE support)
8990
* h5py_ (optional, for MINC2 support)
9091
* PyDICOM_ 0.9.9 or greater (optional, for DICOM support)

doc/source/links_names.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
.. _datapkg: https://pythonhosted.org/datapkg/
114114
.. _python imaging library: https://pypi.python.org/pypi/Pillow
115115
.. _h5py: https://www.h5py.org/
116+
.. _packaging: https://packaging.pypa.io
116117

117118
.. Python imaging projects
118119
.. _PyMVPA: http://www.pymvpa.org

min-requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Auto-generated by tools/update_requirements.py
2-
numpy ==1.12
2+
numpy ==1.13
3+
packaging ==14.3

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Auto-generated by tools/update_requirements.py
2-
numpy >=1.12
2+
numpy >=1.13
3+
packaging >=14.3

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ provides =
3030
[options]
3131
python_requires = >=3.5.1
3232
install_requires =
33-
numpy >=1.12
34-
packaging
33+
numpy >=1.13
34+
packaging >=14.3
3535
tests_require =
3636
nose >=0.11
3737
pytest

0 commit comments

Comments
 (0)