Skip to content

Commit

Permalink
Fix missing dependecy definition of 'packaging' (#6207)
Browse files Browse the repository at this point in the history
* 🩹 Added packaging to install_requires

* add packaging dep to ci, install instructions, and whatsnew page

* lint

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* uninstall packaging before installing upstream

* update requirements.txt

* update whats new and rerun linter

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: Illviljan <14371165+Illviljan@users.noreply.github.com>
Co-authored-by: Joseph Hamman <jhamman@ucar.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
4 people committed Jan 31, 2022
1 parent e939bfc commit 5973ef3
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies:
- netcdf4
- numba
- numpy
- packaging
- pandas
- pint
- pip
Expand Down
2 changes: 2 additions & 0 deletions ci/install-upstream-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ conda uninstall -y --force \
zarr \
cftime \
rasterio \
packaging \
pint \
sparse \
h5netcdf \
Expand Down Expand Up @@ -40,6 +41,7 @@ python -m pip install \
git+https://github.com/zarr-developers/zarr \
git+https://github.com/Unidata/cftime \
git+https://github.com/mapbox/rasterio \
git+https://github.com/pypa/packaging \
git+https://github.com/hgrecco/pint \
git+https://github.com/pydata/sparse \
git+https://github.com/intake/filesystem_spec \
Expand Down
1 change: 1 addition & 0 deletions ci/requirements/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies:
- netcdf4>=1.5
- numba
- numpy>=1.17
- packaging>=20.0
- pandas>=1.0
- pooch
- pip
Expand Down
1 change: 1 addition & 0 deletions ci/requirements/environment-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies:
- netcdf4
- numba
- numpy
- packaging
- pandas
- pint
- pip
Expand Down
1 change: 1 addition & 0 deletions ci/requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dependencies:
- numba
- numexpr
- numpy
- packaging
- pandas
- pint
- pip
Expand Down
1 change: 1 addition & 0 deletions ci/requirements/py38-bare-minimum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ dependencies:
- pytest-env
- pytest-xdist
- numpy=1.18
- packaging=20.0
- pandas=1.1
1 change: 1 addition & 0 deletions ci/requirements/py38-min-all-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies:
- netcdf4=1.5.3
- numba=0.51
- numpy=1.18
- packaging=20.0
- pandas=1.1
- pint=0.16
- pip
Expand Down
1 change: 1 addition & 0 deletions ci/requirements/py39-all-but-dask.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies:
- netcdf4
- numba
- numpy
- packaging
- pandas
- pint
- pip
Expand Down
1 change: 1 addition & 0 deletions doc/getting-started-guide/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Required dependencies

- Python (3.8 or later)
- `numpy <https://www.numpy.org/>`__ (1.18 or later)
- `packaging <https://packaging.pypa.io/en/latest/#>`__ (20.0 or later)
- `pandas <https://pandas.pydata.org/>`__ (1.1 or later)

.. _optional-dependencies:
Expand Down
3 changes: 2 additions & 1 deletion doc/whats-new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ Deprecations

Bug fixes
~~~~~~~~~

- Add `packaging` as a dependency to Xarray (:issue:`6216`, :pull:`6207`).
By `Sebastian Weigand <https://github.com/s-weigand>`_ and `Joe Hamman <https://github.com/jhamman>`_.

Documentation
~~~~~~~~~~~~~
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
# https://help.github.com/en/github/visualizing-repository-data-with-graphs/listing-the-packages-that-a-repository-depends-on

numpy >= 1.18
packaging >= 20.0
pandas >= 1.1
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ python_requires = >=3.8
install_requires =
numpy >= 1.18
pandas >= 1.1
packaging >= 20.0

[options.extras_require]
io =
Expand Down

0 comments on commit 5973ef3

Please sign in to comment.