Skip to content

Commit

Permalink
Update xarray master ci (MITgcm#248)
Browse files Browse the repository at this point in the history
* py36->py37 for latest xarray

* filename

* drop ci for 2.7, 3.6. Add 3.9

* update url, drop 2-3.6

* specify python>=3.7

* update dependencies in docs/readme
  • Loading branch information
timothyas authored Jan 19, 2021
1 parent 95c708f commit fb87e5c
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 33 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
python-version: ["2.7","3.6", "3.7", "3.8"]
python-version: ["3.7", "3.8", "3.9"]
steps:
- uses: actions/checkout@v2
- name: Cache conda
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
activate-environment: test_env # Defined in ci/environment-*.yml
auto-update-conda: false
python-version: 3.6
environment-file: ci/environment-py36-xarraymaster.yml
environment-file: ci/environment-py37-xarraymaster.yml
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
- name: Set up conda environment
shell: bash -l {0}
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Installation
Requirements
^^^^^^^^^^^^

xmitgcm is compatible with python 3 and python 2.7. It requires xarray_
(>= version 0.8.2) and dask_ (>= version 0.11.2).
xmitgcm is compatible with python >=3.7. It requires xarray_
(>= version 0.11.0) and dask_ (>= version 1.0).
These packages are most reliably installed via the
`conda <https://conda.pydata.org/docs/>`_ environment management
system, which is part of the Anaconda_ python distribution. Assuming you have
Expand Down
14 changes: 0 additions & 14 deletions ci/environment-py2.7.yml

This file was deleted.

11 changes: 5 additions & 6 deletions ci/environment-py3.6.yml → ci/environment-py3.9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test_env
channels:
- conda-forge
dependencies:
- python=3.6
- python=3.9
- xarray
- dask
- numpy
Expand All @@ -11,8 +11,7 @@ dependencies:
- zarr
- cftime
- aiohttp
- pip:
- cachetools
- fsspec
- codecov
- pytest-cov
- pytest-cov
- codecov
- fsspec
- cachetools
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test_env
channels:
- conda-forge
dependencies:
- python=3.6
- python=3.7
- dask
- numpy
- pytest
Expand Down
4 changes: 2 additions & 2 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Installation
Requirements
^^^^^^^^^^^^

xmitgcm is compatible with python 3 and python 2.7. It requires xarray_
(>= version 0.8.2) and dask_ (>= version 0.11.2).
xmitgcm is compatible with python >=3.7. It requires xarray_
(>= version 0.11.0) and dask_ (>= version 1.0).
These packages are most reliably installed via the
`conda <http://conda.pydata.org/docs/>`_ environment management
system, which is part of the Anaconda_ python distribution. Assuming you have
Expand Down
11 changes: 5 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,21 @@
LICENSE = 'Apache'
AUTHOR = 'Ryan Abernathey'
AUTHOR_EMAIL = '[email protected]'
URL = 'https://github.com/xgcm/xmitgcm'
URL = 'https://github.com/MITgcm/xmitgcm'
CLASSIFIERS = [
'Development Status :: 4 - Beta',
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
'Intended Audience :: Science/Research',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Topic :: Scientific/Engineering',
]

INSTALL_REQUIRES = ['xarray >= 0.10.1', 'dask >= 1.0', 'cachetools']
INSTALL_REQUIRES = ['xarray >= 0.11.0', 'dask >= 1.0', 'cachetools']
SETUP_REQUIRES = ['pytest-runner']
TESTS_REQUIRE = ['pytest >= 4.0', 'coverage']

Expand All @@ -49,4 +47,5 @@ def readme():
setup_requires=SETUP_REQUIRES,
tests_require=TESTS_REQUIRE,
url=URL,
packages=find_packages())
packages=find_packages(),
python_requires='>=3.7')

0 comments on commit fb87e5c

Please sign in to comment.