From 42f346b78ac4b7f299bd0e109c1457d9fe75c93b Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Wed, 11 Aug 2021 00:01:39 +1200 Subject: [PATCH 1/3] NEP29: Set minimum required version to NumPy 1.18+ Following NEP29 policy. Bumps minimum supported NumPy version to 1.18 in the setup.py, requirements.txt and environment.yml files. Also update installation documentation and set CI tests to run on NumPy 1.18. --- .github/workflows/ci_tests.yaml | 4 ++-- doc/install.rst | 2 +- environment.yml | 2 +- requirements.txt | 2 +- setup.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 88819f4fc2a..51c52804b91 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -44,11 +44,11 @@ jobs: # - os: ubuntu-latest # python-version: 3.7 # isDraft: true - # Pair Python 3.7 with NumPy 1.17 and Python 3.9 with NumPy 1.21 + # Pair Python 3.7 with NumPy 1.18 and Python 3.9 with NumPy 1.21 # Only install optional packages on Python 3.9/NumPy 1.21 include: - python-version: 3.7 - numpy-version: '1.17' + numpy-version: '1.18' optional-packages: '' - python-version: 3.9 numpy-version: '1.21' diff --git a/doc/install.rst b/doc/install.rst index fabaa8572ca..f8e37fc0fb7 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -80,7 +80,7 @@ Dependencies PyGMT requires the following libraries to be installed: -* `numpy `__ (>= 1.17) +* `numpy `__ (>= 1.18) * `pandas `__ * `xarray `__ * `netCDF4 `__ diff --git a/environment.yml b/environment.yml index 460710ba983..d2912e2bd9f 100644 --- a/environment.yml +++ b/environment.yml @@ -6,7 +6,7 @@ dependencies: # Required dependencies - pip - gmt=6.2.0 - - numpy>=1.17 + - numpy>=1.18 - pandas - xarray - netCDF4 diff --git a/requirements.txt b/requirements.txt index 8f5a7863bf8..37e10658db7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # Required packages -numpy>=1.17 +numpy>=1.18 pandas xarray netCDF4 diff --git a/setup.py b/setup.py index aacf552047a..510659db6ca 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ ] PLATFORMS = "Any" PYTHON_REQUIRES = ">=3.7" -INSTALL_REQUIRES = ["numpy>=1.17", "pandas", "xarray", "netCDF4", "packaging"] +INSTALL_REQUIRES = ["numpy>=1.18", "pandas", "xarray", "netCDF4", "packaging"] # Configuration for setuptools-scm SETUP_REQUIRES = ["setuptools_scm"] USE_SCM_VERSION = {"local_scheme": "node-and-date", "fallback_version": "unknown"} From d1d359b96193ab5fd98fe37a1e394c3c90cab0e5 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Wed, 11 Aug 2021 10:45:18 +1200 Subject: [PATCH 2/3] List NumPy >= 1.18 in compatibility table on main README.rst Also link to v0.5.0 milestone and development documentation page. --- README.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index cb5d1f18c30..e1b6d978503 100644 --- a/README.rst +++ b/README.rst @@ -228,16 +228,21 @@ Compatibility with GMT/Python/NumPy versions - GMT - Python - Numpy + * - `v0.5.0 `_ (upcoming release) + - `dev Documentation `_ + - >=6.2.0 + - >=3.7 + - >=1.18 * - `v0.4.1 `_ (latest release) - `v0.4.1 Documentation `_ - >=6.2.0 - >=3.7 - - >=1.17.0 + - >=1.17 * - `v0.4.0 `_ - `v0.4.0 Documentation `_ - >=6.2.0 - >=3.7 - - >=1.17.0 + - >=1.17 * - `v0.3.1 `_ - `v0.3.1 Documentation `_ - >=6.1.1 @@ -274,5 +279,6 @@ Compatibility with GMT/Python/NumPy versions - 3.6 - 3.8 - -The unstable development documentation, which reflects the `main branch `_ +The unstable development documentation, which reflects the +`main branch `_ on GitHub, can be found at https://www.pygmt.org/dev/. From 462d6a9648d106a7b4f0ac44bdabb52986d03dd4 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Wed, 11 Aug 2021 11:51:38 +1200 Subject: [PATCH 3/3] Mention dev docs directly in compatibility table Co-Authored-By: Meghan Jones --- README.rst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.rst b/README.rst index e1b6d978503..5ed16ecdc0a 100644 --- a/README.rst +++ b/README.rst @@ -229,7 +229,7 @@ Compatibility with GMT/Python/NumPy versions - Python - Numpy * - `v0.5.0 `_ (upcoming release) - - `dev Documentation `_ + - `Dev Documentation `_ (reflects `main branch `_) - >=6.2.0 - >=3.7 - >=1.18 @@ -278,7 +278,3 @@ Compatibility with GMT/Python/NumPy versions - >=6.0.0 - 3.6 - 3.8 - - -The unstable development documentation, which reflects the -`main branch `_ -on GitHub, can be found at https://www.pygmt.org/dev/.