Skip to content

Commit

Permalink
Merge branch 'main' into changelog-0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
seisman committed Jul 2, 2022
2 parents 20fd816 + 1b5a60d commit 3f8607f
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ jobs:
isDraft: true
- os: windows-latest
isDraft: true
# Pair Python 3.8 with NumPy 1.19 and Python 3.10 with NumPy 1.22
# Pair Python 3.8 with NumPy 1.20 and Python 3.10 with NumPy 1.22
# Only install optional packages on Python 3.10/NumPy 1.22
include:
- python-version: '3.8'
numpy-version: '1.19'
numpy-version: '1.20'
optional-packages: ''
- python-version: '3.10'
numpy-version: '1.22'
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ Compatibility with GMT/Python/NumPy versions
- `Dev Documentation <https://www.pygmt.org/dev>`_ (reflects `main branch <https://github.com/GenericMappingTools/pygmt>`_)
- >=6.3.0
- >=3.8
- >=1.19
- >=1.20
* - `v0.7.0 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.7.0>`_ (latest release)
- `v0.7.0 Documentation <https://www.pygmt.org/v0.7.0>`_
- >=6.3.0
Expand Down
2 changes: 1 addition & 1 deletion doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Dependencies

PyGMT requires the following libraries to be installed:

* `numpy <https://numpy.org>`__ (>= 1.19)
* `numpy <https://numpy.org>`__ (>= 1.20)
* `pandas <https://pandas.pydata.org>`__
* `xarray <https://xarray.pydata.org>`__
* `netCDF4 <https://unidata.github.io/netcdf4-python>`__
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
# Required dependencies
- pip
- gmt=6.3.0
- numpy>=1.19
- numpy>=1.20
- pandas
- xarray
- netCDF4
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Required packages
numpy>=1.19
numpy>=1.20
pandas
xarray
netCDF4
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
]
PLATFORMS = "Any"
PYTHON_REQUIRES = ">=3.8"
INSTALL_REQUIRES = ["numpy>=1.19", "pandas", "xarray", "netCDF4", "packaging"]
INSTALL_REQUIRES = ["numpy>=1.20", "pandas", "xarray", "netCDF4", "packaging"]

if __name__ == "__main__":
setup(
Expand Down

0 comments on commit 3f8607f

Please sign in to comment.