From 3163df4f84fff067a2f226705b0cb41b18a461f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 12:02:09 +0000 Subject: [PATCH 1/2] MNT: (deps): Bump pooch from 1.3.0 to 1.4.0 in /ci Bumps [pooch](https://github.com/fatiando/pooch) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/fatiando/pooch/releases) - [Changelog](https://github.com/fatiando/pooch/blob/master/doc/changes.rst) - [Commits](https://github.com/fatiando/pooch/compare/v1.3.0...v1.4.0) --- updated-dependencies: - dependency-name: pooch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- ci/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements.txt b/ci/requirements.txt index 51661226354..05ee5a6c0e6 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -3,7 +3,7 @@ importlib_resources==5.1.4 matplotlib==3.4.2 numpy==1.20.3 pandas==1.2.4 -pooch==1.3.0 +pooch==1.4.0 pint==0.17 pyproj==3.0.1 scipy==1.6.3 From 94ac6ff898c96b811117e49e3d3988ae24d95f63 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Wed, 9 Jun 2021 12:34:08 -0600 Subject: [PATCH 2/2] MNT: Update code for getting Pooch version for tests Pooch 1.2 added __version__, and 1.4 removed .version.full_version, so we need to deal with this somewhat ugly (but unimportant) solution for awhile. --- conftest.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conftest.py b/conftest.py index 204a1e61987..14c1fe75020 100644 --- a/conftest.py +++ b/conftest.py @@ -22,12 +22,17 @@ os.environ['PINT_ARRAY_PROTOCOL_FALLBACK'] = '0' import pint # noqa: I100, E402 +try: + pooch_version = pooch.__version__ +except AttributeError: + pooch_version = pooch.version.full_version + def pytest_report_header(config, startdir): """Add dependency information to pytest output.""" return (f'Dep Versions: Matplotlib {matplotlib.__version__}, ' f'NumPy {numpy.__version__}, Pandas {pandas.__version__}, ' - f'Pint {pint.__version__}, Pooch {pooch.version.full_version}\n' + f'Pint {pint.__version__}, Pooch {pooch_version}\n' f'\tPyProj {pyproj.__version__}, SciPy {scipy.__version__}, ' f'Traitlets {traitlets.__version__}, Xarray {xarray.__version__}')