Follow NEP 29: Python 3.7+ and NumPy 1.18+

hugovk · hugovk · commit 7c243aa4caa0 · 2021-09-25T22:44:42.000+03:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,48 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ "2.7", "3.5", "3.6", "3.7", "3.8" ]
-        numpy-version: [
-            "1.8.2",
-            "1.9.3",
-            "1.10.4",
-            "1.11.3",
-            "1.12.1",
-            "1.13.3",
-            "1.14.5",
-            "1.15.1",
-            "1.15.4",
-            "1.16.1",
-            "1.17.2",
-        ]
-        exclude:
-          - { python-version: "2.7", numpy-version: "1.16.1" }
-          - { python-version: "2.7", numpy-version: "1.17.2" }
-
-          - { python-version: "3.5", numpy-version: "1.15.1" }
-          - { python-version: "3.5", numpy-version: "1.15.4" }
-          - { python-version: "3.5", numpy-version: "1.16.1" }
-          - { python-version: "3.5", numpy-version: "1.17.2" }
-
-          - { python-version: "3.6", numpy-version: "1.17.2" }
-
-          - { python-version: "3.7", numpy-version: "1.8.2" }
-          - { python-version: "3.7", numpy-version: "1.9.3" }
-          - { python-version: "3.7", numpy-version: "1.10.4" }
-          - { python-version: "3.7", numpy-version: "1.11.3" }
-          - { python-version: "3.7", numpy-version: "1.12.1" }
-          - { python-version: "3.7", numpy-version: "1.13.3" }
-
-          - { python-version: "3.8", numpy-version: "1.8.2" }
-          - { python-version: "3.8", numpy-version: "1.9.3" }
-          - { python-version: "3.8", numpy-version: "1.10.4" }
-          - { python-version: "3.8", numpy-version: "1.11.3" }
-          - { python-version: "3.8", numpy-version: "1.12.1" }
-          - { python-version: "3.8", numpy-version: "1.13.3" }
-          - { python-version: "3.8", numpy-version: "1.14.5" }
-          - { python-version: "3.8", numpy-version: "1.15.1" }
-          - { python-version: "3.8", numpy-version: "1.15.4" }
-          - { python-version: "3.8", numpy-version: "1.16.1" }
+        python-version: [ "3.7", "3.8", "3.9" ]
+        numpy-version: [ "1.18", "1.19", "1.20", "1.21" ]
 
     steps:
       - uses: actions/checkout@v2
@@ -90,5 +50,5 @@ jobs:
 
       - name: Test
         run: |
-          pytest
+          PY_IGNORE_IMPORTMISMATCH=1 pytest
           python -m doctest README.rst
diff --git a/README.rst b/README.rst
@@ -10,7 +10,7 @@ quantities
     :target: http://travis-ci.org/python-quantities/python-quantities
 
 A Python package for handling physical quantities. The source code and issue 
-tracker are hosted on github:
+tracker are hosted on GitHub:
 
 https://www.github.com/python-quantities/python-quantities
 
@@ -19,7 +19,7 @@ Download
 Get the latest version of quantities from
 https://pypi.python.org/pypi/quantities/
 
-To get the git version do::
+To get the Git version do::
 
     $ git clone git://github.com/python-quantities/python-quantities.git
 
diff --git a/doc/user/installation.rst b/doc/user/installation.rst
@@ -8,14 +8,14 @@ Prerequisites
 
 Quantities has a few dependencies:
 
-* Python_ (>=2.7)
-* NumPy_ (>=1.8.2)
+* Python_ (>=3.7)
+* NumPy_ (>=1.18)
 
 
 Source Code Installation
 ========================
 
-To install Quantities, download the Quantites sourcecode from PyPi_
+To install Quantities, download the Quantites sourcecode from PyPI_
 and run "python setup.py install" in the quantities source directory,
 or run "pip install quantities".
 
@@ -26,11 +26,11 @@ You can follow and contribute to Quantities' development using git::
 
   git clone git@github.com:python-quantities/python-quantities.git
 
-Bugs, feature requests, and questions can be directed to the github_
+Bugs, feature requests, and questions can be directed to the GitHub_
 website.
 
 
 .. _Python: http://www.python.org/
 .. _NumPy: http://www.scipy.org
-.. _PyPi: http://pypi.python.org/pypi/quantities
-.. _github: http://github.com/python-quantities/python-quantities
+.. _PyPI: http://pypi.python.org/pypi/quantities
+.. _GitHub: http://github.com/python-quantities/python-quantities
diff --git a/setup.py b/setup.py
@@ -136,8 +136,8 @@ def run(self):
     packages = packages,
     platforms = 'Any',
     requires = [
-        'python (>=2.7.0)',
-        'numpy (>=1.8.2)',
+        'python (>=3.7)',
+        'numpy (>=1.18)',
         ],
     url = 'http://python-quantities.readthedocs.io/',
     version = versioneer.get_version(),
