Skip to content

Commit

Permalink
Merge pull request #868 from effigies/nep29/numpy_1_13
Browse files Browse the repository at this point in the history
NEP29: Bump minimum numpy to 1.13
  • Loading branch information
effigies authored Jan 28, 2020
2 parents 6863271 + d388bed commit 95c934b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion doc/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ Requirements
.. check these against setup.cfg
* Python_ 3.5.1 or greater
* NumPy_ 1.12 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)
Expand Down
1 change: 1 addition & 0 deletions doc/source/links_names.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion min-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Auto-generated by tools/update_requirements.py
numpy ==1.12
numpy ==1.13
packaging ==14.3
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Auto-generated by tools/update_requirements.py
numpy >=1.12
numpy >=1.13
packaging >=14.3
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ provides =
[options]
python_requires = >=3.5.1
install_requires =
numpy >=1.12
packaging
numpy >=1.13
packaging >=14.3
tests_require =
nose >=0.11
pytest
Expand Down

0 comments on commit 95c934b

Please sign in to comment.