Skip to content

Commit

Permalink
Update dependencies in setup.py and dev.yml (#174)
Browse files Browse the repository at this point in the history
* Update dependencies in `setup.py` and `dev.yml`
- Reorder dependencies alphabetically by section
- Update `dev.yml` pins to the latest versions
- Update `.pre-commit-config.yaml` to latest versions
- Add Python 3.9 to `setup.py` classifiers

* Update documentation for installing xcdat through conda-forge
  • Loading branch information
tomvothecoder authored Dec 7, 2021
1 parent 3c6f165 commit 201a575
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ repos:
- id: check-yaml

- repo: https://github.com/psf/black
rev: 21.9b0
rev: 21.11b1
hooks:
- id: black

- repo: https://github.com/timothycrosley/isort
rev: 5.9.3
rev: 5.10.1
hooks:
- id: isort

# Need to use flake8 GitHub mirror due to CentOS git issue with GitLab
# https://github.com/pre-commit/pre-commit/issues/1206
- repo: https://github.com/pycqa/flake8
rev: 3.9.2
rev: 4.0.1
hooks:
- id: flake8
args: ["--config=setup.cfg"]
Expand Down
32 changes: 17 additions & 15 deletions conda-env/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,36 @@ dependencies:
# Base
# ==================
- python=3.9.7
- pip=21.2.4
- typing_extensions=3.10.0.0 # Required to make use of Python >=3.8 backported types
- netcdf4=1.5.7
- xarray=0.19.0
- pip=21.3.1
- cf_xarray=0.6.1
- dask=2021.9.1
- dask=2021.11.2
- netcdf4=1.5.8
- numpy=1.21.4
- pandas=1.3.4
- typing_extensions=4.0.1 # Required to make use of Python >=3.8 backported types
- xarray=0.20.1
# Quality Assurance
# ==================
# If versions are updated, also update 'rev' in `.pre-commit.config.yaml`
- black=21.9b0
- isort=5.9.3
- flake8=3.9.2
- flake8-isort=4.0.0
- black=21.11b1
- flake8=4.0.1
- flake8-isort=4.1.1
- isort=5.10.1
- mypy=0.910
- pre-commit=2.15.0
- pre-commit=2.16.0
# Testing
# ==================
- pytest=6.2.5
- pytest-cov=3.0.0
# Developer Tools
- jupyterlab=3.1.17
- jupyterlab=3.2.4
# Documentation
# ==================
- sphinx=4.2.0
- sphinx=4.3.1
- sphinxcontrib-napoleon=0.7
- sphinx-copybutton=0.4.0
- sphinx-book-theme=0.1.5
- sphinx-autosummary-accessors=0.2.1
- sphinx-book-theme=0.1.7
- sphinx-copybutton=0.4.0
- pip:
- tbump==6.4.1
- tbump==6.6.0
prefix: /opt/miniconda3/envs/xcdat_dev
2 changes: 1 addition & 1 deletion docs/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To install XCDAT using Conda, run:

.. code-block:: console
$ conda install xcdat
$ conda install -c conda-forge xcdat
This is the preferred method to install XCDAT, as it will always install the most recent stable release.

Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
install_requires: List[str] = [
"cf_xarray",
"dask",
"netcdf4",
"numpy",
"pandas",
"xarray",
"typing_extensions",
"xarray",
]
test_requires = ["pytest>=3"]

Expand All @@ -36,6 +37,7 @@
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
description="Xarray Extended with Climate Data Analysis Tools",
install_requires=install_requires,
Expand Down

0 comments on commit 201a575

Please sign in to comment.