Skip to content

Commit 5973ef3

Browse files
s-weigandIllviljanJoseph Hammanpre-commit-ci[bot]
authored
Fix missing dependecy definition of 'packaging' (#6207)
* 🩹 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 <[email protected]> Co-authored-by: Joseph Hamman <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent e939bfc commit 5973ef3

12 files changed

+14
-1
lines changed

.binder/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies:
2323
- netcdf4
2424
- numba
2525
- numpy
26+
- packaging
2627
- pandas
2728
- pint
2829
- pip

ci/install-upstream-wheels.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ conda uninstall -y --force \
1111
zarr \
1212
cftime \
1313
rasterio \
14+
packaging \
1415
pint \
1516
sparse \
1617
h5netcdf \
@@ -40,6 +41,7 @@ python -m pip install \
4041
git+https://github.com/zarr-developers/zarr \
4142
git+https://github.com/Unidata/cftime \
4243
git+https://github.com/mapbox/rasterio \
44+
git+https://github.com/pypa/packaging \
4345
git+https://github.com/hgrecco/pint \
4446
git+https://github.com/pydata/sparse \
4547
git+https://github.com/intake/filesystem_spec \

ci/requirements/doc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies:
1919
- netcdf4>=1.5
2020
- numba
2121
- numpy>=1.17
22+
- packaging>=20.0
2223
- pandas>=1.0
2324
- pooch
2425
- pip

ci/requirements/environment-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies:
2222
- netcdf4
2323
- numba
2424
- numpy
25+
- packaging
2526
- pandas
2627
- pint
2728
- pip

ci/requirements/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ dependencies:
2525
- numba
2626
- numexpr
2727
- numpy
28+
- packaging
2829
- pandas
2930
- pint
3031
- pip

ci/requirements/py38-bare-minimum.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ dependencies:
1111
- pytest-env
1212
- pytest-xdist
1313
- numpy=1.18
14+
- packaging=20.0
1415
- pandas=1.1

ci/requirements/py38-min-all-deps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies:
3333
- netcdf4=1.5.3
3434
- numba=0.51
3535
- numpy=1.18
36+
- packaging=20.0
3637
- pandas=1.1
3738
- pint=0.16
3839
- pip

ci/requirements/py39-all-but-dask.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies:
2323
- netcdf4
2424
- numba
2525
- numpy
26+
- packaging
2627
- pandas
2728
- pint
2829
- pip

doc/getting-started-guide/installing.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Required dependencies
88

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

1314
.. _optional-dependencies:

doc/whats-new.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ Deprecations
3333

3434
Bug fixes
3535
~~~~~~~~~
36-
36+
- Add `packaging` as a dependency to Xarray (:issue:`6216`, :pull:`6207`).
37+
By `Sebastian Weigand <https://github.com/s-weigand>`_ and `Joe Hamman <https://github.com/jhamman>`_.
3738

3839
Documentation
3940
~~~~~~~~~~~~~

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
# https://help.github.com/en/github/visualizing-repository-data-with-graphs/listing-the-packages-that-a-repository-depends-on
44

55
numpy >= 1.18
6+
packaging >= 20.0
67
pandas >= 1.1

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ python_requires = >=3.8
7777
install_requires =
7878
numpy >= 1.18
7979
pandas >= 1.1
80+
packaging >= 20.0
8081

8182
[options.extras_require]
8283
io =

0 commit comments

Comments
 (0)