From 956df9912a1bec53feecec0504a0383f0dab7ea5 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Wed, 26 May 2021 17:34:56 +0100 Subject: [PATCH 01/12] Update black et al (#4155) * update pre-commit packages * blackify files to new version * review actions * update pyproject.toml --- .pre-commit-config.yaml | 6 +++--- lib/iris/fileformats/netcdf.py | 2 +- lib/iris/tests/integration/test_netcdf.py | 2 +- lib/iris/tests/test_cube_to_pp.py | 2 +- lib/iris/tests/test_file_save.py | 6 +++--- lib/iris/tests/unit/fileformats/test_rules.py | 2 +- noxfile.py | 2 +- pyproject.toml | 2 +- requirements/ci/py36.yml | 2 +- requirements/ci/py37.yml | 2 +- requirements/ci/py38.yml | 2 +- requirements/test.txt | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cea9d3585d..0833790fc2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: 'v3.4.0' + rev: 'v4.0.1' hooks: # Prevent giant files from being committed. - id: check-added-large-files @@ -17,14 +17,14 @@ repos: # Don't commit to master branch. - id: no-commit-to-branch - repo: https://github.com/psf/black - rev: '20.8b1' + rev: '21.5b1' hooks: - id: black # Force black to run on whole repo, using settings from pyproject.toml pass_filenames: false args: [--config=./pyproject.toml, .] - repo: https://github.com/PyCQA/flake8 - rev: '3.9.0' + rev: '3.9.2' hooks: # Run flake8. - id: flake8 diff --git a/lib/iris/fileformats/netcdf.py b/lib/iris/fileformats/netcdf.py index def393f0a3..206f7526c6 100644 --- a/lib/iris/fileformats/netcdf.py +++ b/lib/iris/fileformats/netcdf.py @@ -2655,7 +2655,7 @@ def save( local_keys.update(different_value_keys) def is_valid_packspec(p): - """ Only checks that the datatype is valid. """ + """Only checks that the datatype is valid.""" if isinstance(p, dict): if "dtype" in p: return is_valid_packspec(p["dtype"]) diff --git a/lib/iris/tests/integration/test_netcdf.py b/lib/iris/tests/integration/test_netcdf.py index 267e5beb50..3bf1e6032e 100644 --- a/lib/iris/tests/integration/test_netcdf.py +++ b/lib/iris/tests/integration/test_netcdf.py @@ -516,7 +516,7 @@ def test_single_packed_signed(self): self._single_test("i2", "single_packed_signed.cdl") def test_single_packed_unsigned(self): - """Test saving a single CF-netCDF file with packing into unsigned. """ + """Test saving a single CF-netCDF file with packing into unsigned.""" self._single_test("u1", "single_packed_unsigned.cdl") def test_single_packed_manual_scale(self): diff --git a/lib/iris/tests/test_cube_to_pp.py b/lib/iris/tests/test_cube_to_pp.py index d0a1e0dcbb..f5d7a4482c 100644 --- a/lib/iris/tests/test_cube_to_pp.py +++ b/lib/iris/tests/test_cube_to_pp.py @@ -275,7 +275,7 @@ def test_365_calendar_export(self): class FakePPEnvironment: - """ fake a minimal PP environment for use in cross-section coords, as in PP save rules """ + """fake a minimal PP environment for use in cross-section coords, as in PP save rules""" y = [1, 2, 3, 4] z = [111, 222, 333, 444] diff --git a/lib/iris/tests/test_file_save.py b/lib/iris/tests/test_file_save.py index 1c2a27c70b..ee48969865 100644 --- a/lib/iris/tests/test_file_save.py +++ b/lib/iris/tests/test_file_save.py @@ -33,7 +33,7 @@ def save_by_filename(filename1, filename2, cube, saver_fn, iosaver=None): - """ Saves a cube to two different filenames using iris.save and the save method of the object representing the file type directly""" + """Saves a cube to two different filenames using iris.save and the save method of the object representing the file type directly""" # Save from object direct saver_fn(cube, filename1) @@ -46,7 +46,7 @@ def save_by_filename(filename1, filename2, cube, saver_fn, iosaver=None): def save_by_filehandle( filehandle1, filehandle2, cube, fn_saver, binary_mode=True ): - """ Saves a cube to two different filehandles using iris.save and the save method of the object representing the file type directly""" + """Saves a cube to two different filehandles using iris.save and the save method of the object representing the file type directly""" mode = "wb" if binary_mode else "w" # Save from object direct @@ -60,7 +60,7 @@ def save_by_filehandle( @tests.skip_data class TestSaveMethods(tests.IrisTest): - """ Base class for file saving tests. Loads data and creates/deletes tempfiles""" + """Base class for file saving tests. Loads data and creates/deletes tempfiles""" def setUp(self): self.cube1 = iris.load_cube( diff --git a/lib/iris/tests/unit/fileformats/test_rules.py b/lib/iris/tests/unit/fileformats/test_rules.py index 00b0e5c540..730ef13f23 100644 --- a/lib/iris/tests/unit/fileformats/test_rules.py +++ b/lib/iris/tests/unit/fileformats/test_rules.py @@ -238,7 +238,7 @@ def converter(field): class Test_scalar_cell_method(tests.IrisTest): - """ Tests for iris.fileformats.rules.scalar_cell_method() function """ + """Tests for iris.fileformats.rules.scalar_cell_method() function""" def setUp(self): self.cube = stock.simple_2d() diff --git a/noxfile.py b/noxfile.py index bf6c95acf6..848243eac4 100755 --- a/noxfile.py +++ b/noxfile.py @@ -190,7 +190,7 @@ def black(session: nox.sessions.Session): """ # Pip install the session requirements. - session.install("black==20.8b1") + session.install("black==21.5b1") # Execute the black format checker on the package. session.run("black", "--check", PACKAGE) # Execute the black format checker on this file. diff --git a/pyproject.toml b/pyproject.toml index 353f3df53f..31bc0bca0e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.black] line-length = 79 -target-version = ['py36', 'py37'] +target-version = ['py36', 'py37', 'py38'] include = '\.pyi?$' exclude = ''' diff --git a/requirements/ci/py36.yml b/requirements/ci/py36.yml index f778704803..1543075948 100644 --- a/requirements/ci/py36.yml +++ b/requirements/ci/py36.yml @@ -34,7 +34,7 @@ dependencies: # Test dependencies. - asv - - black=20.8b1 + - black=21.5b1 - filelock - flake8 - imagehash>=4.0 diff --git a/requirements/ci/py37.yml b/requirements/ci/py37.yml index 5b21e9f778..b7d0ff4157 100644 --- a/requirements/ci/py37.yml +++ b/requirements/ci/py37.yml @@ -34,7 +34,7 @@ dependencies: # Test dependencies. - asv - - black=20.8b1 + - black=21.5b1 - filelock - flake8 - imagehash>=4.0 diff --git a/requirements/ci/py38.yml b/requirements/ci/py38.yml index e09a7a7164..7458b367cd 100644 --- a/requirements/ci/py38.yml +++ b/requirements/ci/py38.yml @@ -34,7 +34,7 @@ dependencies: # Test dependencies. - asv - - black=20.8b1 + - black=21.5b1 - filelock - flake8 - imagehash>=4.0 diff --git a/requirements/test.txt b/requirements/test.txt index ff0e388b03..32c8db4d0a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,7 +1,7 @@ # Test dependencies. asv -black==20.8b1 +black==21.5b1 filelock imagehash>=4.0 nose From 6cab22794c4684a4c322181308f64e7ab21f2a9c Mon Sep 17 00:00:00 2001 From: Yunyi <38201142+Badboy-16@users.noreply.github.com> Date: Thu, 27 May 2021 23:55:46 +0800 Subject: [PATCH 02/12] Add a method to return a CubeList from CubeList.copy() (#4094) * Add a method to return a CubeList from CubeList.copy() * Created an entry in What's New * Added test for CubeList.copy() * Moved CubeList.copy() test into the correct file * Creating a link to the username --- docs/src/whatsnew/latest.rst | 6 +++++- lib/iris/cube.py | 7 +++++++ lib/iris/tests/unit/cube/test_CubeList.py | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst index 3caf386ef6..538b6b1142 100644 --- a/docs/src/whatsnew/latest.rst +++ b/docs/src/whatsnew/latest.rst @@ -52,6 +52,9 @@ This document explains the changes made to Iris for this release printing these objects skips metadata elements that are set to None or an empty string or dictionary. (:pull:`4040`) +#. `@Badboy-16`_ implemented a ``CubeList.copy()`` method to return a + ``CubeList`` object instead of a ``list``. (:pull:`4094`) + 🐛 Bugs Fixed ============= @@ -170,6 +173,7 @@ This document explains the changes made to Iris for this release core dev names are automatically included by the common_links.inc: .. _@akuhnregnier: https://github.com/akuhnregnier +.. _@Badboy-16: https://github.com/Badboy-16 .. _@gcaria: https://github.com/gcaria .. _@MHBalsmeier: https://github.com/MHBalsmeier @@ -189,4 +193,4 @@ This document explains the changes made to Iris for this release .. _Python 3.8: https://www.python.org/downloads/release/python-380/ .. _README.md: https://github.com/SciTools/iris#----- .. _xxhash: http://cyan4973.github.io/xxHash/ -.. _conda-lock: https://github.com/conda-incubator/conda-lock \ No newline at end of file +.. _conda-lock: https://github.com/conda-incubator/conda-lock diff --git a/lib/iris/cube.py b/lib/iris/cube.py index a15951900b..90b233ff5a 100644 --- a/lib/iris/cube.py +++ b/lib/iris/cube.py @@ -707,6 +707,13 @@ def realise_data(self): """ _lazy.co_realise_cubes(*self) + def copy(self): + """ + Return a CubeList when CubeList.copy() is called. + """ + if type(self) == CubeList: + return deepcopy(self) + def _is_single_item(testee): """ diff --git a/lib/iris/tests/unit/cube/test_CubeList.py b/lib/iris/tests/unit/cube/test_CubeList.py index 2e7b110d60..82c4280fff 100644 --- a/lib/iris/tests/unit/cube/test_CubeList.py +++ b/lib/iris/tests/unit/cube/test_CubeList.py @@ -602,5 +602,14 @@ def test_realise_data(self): ) +class Test_CubeList_copy(tests.IrisTest): + def setUp(self): + self.cube_list = iris.cube.CubeList() + self.copied_cube_list = self.cube_list.copy() + + def test_copy(self): + self.assertIsInstance(self.copied_cube_list, iris.cube.CubeList) + + if __name__ == "__main__": tests.main() From bcd0885ec5e760df5a7dff7d07555d59e9b81ffd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 1 Jun 2021 09:24:03 +0100 Subject: [PATCH 03/12] [pre-commit.ci] pre-commit autoupdate (#4161) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 21.5b1 → 21.5b2](https://github.com/psf/black/compare/21.5b1...21.5b2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0833790fc2..dff95c1ad1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: # Don't commit to master branch. - id: no-commit-to-branch - repo: https://github.com/psf/black - rev: '21.5b1' + rev: '21.5b2' hooks: - id: black # Force black to run on whole repo, using settings from pyproject.toml From 8a7e6aa0bc2668c760f5a7b1823879bedc05f896 Mon Sep 17 00:00:00 2001 From: James Penn Date: Tue, 1 Jun 2021 09:25:54 +0100 Subject: [PATCH 04/12] Stop CI from clobbering commits on lockfile updates (#4157) * Adding a clobber check to update lockfile workflow * actions syntax error * actions syntax error * debugging context * debugging context * debugging context * Clobber override support * Clobber with yes/true only * refresh-lockfiles workflow comment cleanup * Added documentation --- .github/workflows/refresh-lockfiles.yml | 42 ++++++++++++++++++- .../contributing_ci_tests.rst | 11 +++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/.github/workflows/refresh-lockfiles.yml b/.github/workflows/refresh-lockfiles.yml index 4ff58affd4..e565e95c75 100755 --- a/.github/workflows/refresh-lockfiles.yml +++ b/.github/workflows/refresh-lockfiles.yml @@ -14,6 +14,12 @@ name: Refresh Lockfiles on: workflow_dispatch: + inputs: + clobber: + description: | + Force the workflow to run, potentially clobbering any commits already made to the branch. + Enter "yes" or "true" to run. + default: "no" schedule: # Run once a week on a Saturday night - cron: 1 0 * * 6 @@ -21,6 +27,37 @@ on: jobs: + no_clobber: + runs-on: ubuntu-latest + steps: + # check if the auto-update-lockfiles branch exists. If it does, and someone other than + # the lockfile bot has made the head commit, abort the workflow. + # This job can be manually overridden by running directly from the github actions panel + # (known as a "workflow_dispatch") and setting the `clobber` input to "yes". + - uses: actions/script@v4 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + if (context.eventName == "workflow_dispatch") { + const clobber = context.payload.inputs.clobber || "no"; + if (["yes", "true", "y"].includes(clobber.trim().toLowerCase())) { + core.info("Manual override, continuing workflow, potentially overwriting previous commits to auto-update-lockfiles"); + return + } + } + github.repos.getBranch({...context.repo, branch: "auto-update-lockfiles"}).then(res => { + const committer = res.data.commit.commit.committer; + if (committer && committer.name === "Lockfile bot") { + core.info("Lockfile bot was the last to push to auto-update-lockfiles. Continue."); + } else { + core.setFailed("New commits to auto-update-lockfiles since bot last ran. Abort!"); + } + }).catch(err => { + if (err.status === 404) { + core.info("auto-update-lockfiles branch not found, continue"); + } + }) + gen_lockfiles: # this is a matrix job: it splits to create new lockfiles for each # of the CI test python versions. @@ -28,6 +65,7 @@ jobs: # TODO: generate this matrix automatically from the list of available py**.yml files # ref: https://tomasvotruba.com/blog/2020/11/16/how-to-make-dynamic-matrix-in-github-actions/ runs-on: ubuntu-latest + needs: no_clobber strategy: matrix: @@ -62,7 +100,7 @@ jobs: path: artifacts - name: Update lock files in repo - run: | + run: | cp artifacts/artifact/*.lock requirements/ci/nox.lock rm -r artifacts @@ -70,6 +108,8 @@ jobs: uses: peter-evans/create-pull-request@052fc72b4198ba9fbc81b818c6e1859f747d49a8 with: commit-message: Updated environment lockfiles + committer: "Lockfile bot " + author: "Lockfile bot " delete-branch: true branch: auto-update-lockfiles title: Update CI environment lockfiles diff --git a/docs/src/developers_guide/contributing_ci_tests.rst b/docs/src/developers_guide/contributing_ci_tests.rst index b059bf88e6..cdced71fd1 100644 --- a/docs/src/developers_guide/contributing_ci_tests.rst +++ b/docs/src/developers_guide/contributing_ci_tests.rst @@ -66,6 +66,16 @@ and add the changed lockfiles to your pull request. New lockfiles are generated automatically each week to ensure that Iris continues to be tested against the latest available version of its dependencies. +Each week the yaml files in ``requirements/ci`` are resolved by a GitHub Action. +If the resolved environment has changed, a pull request is created with the new lock files. +The CI test suite will run on this pull request and fixes for failed tests can be pushed to +the ``auto-update-lockfiles`` branch to be included in the PR. +Once a developer has pushed to this branch, the auto-update process will not run again until +the PR is merged, to prevent overwriting developer commits. +The auto-updater can still be invoked manually in this situation by going to the `GitHub Actions`_ +page for the workflow, and manually running using the "Run Workflow" button. +By default, this will also not override developer commits. To force an update, you must +confirm "yes" in the "Run Worflow" prompt. .. _skipping Cirrus-CI tasks: @@ -137,3 +147,4 @@ See the `pre-commit.ci dashboard`_ for details of recent past and active Iris jo .. _Cirrus-CI Documentation: https://cirrus-ci.org/guide/writing-tasks/ .. _.pre-commit-config.yaml: https://github.com/SciTools/iris/blob/master/.pre-commit-config.yaml .. _pre-commit.ci dashboard: https://results.pre-commit.ci/repo/github/5312648 +.. _GitHub Actions: https://github.com/SciTools/iris/actions/workflows/refresh-lockfiles.yml \ No newline at end of file From 31ea17cd2f38c3484254e9c34a71a7e5fc2dcbe1 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Tue, 1 Jun 2021 11:13:07 +0100 Subject: [PATCH 05/12] Bump black version (#4162) * bump black version * unpin black * pin black --- noxfile.py | 2 +- requirements/ci/py36.yml | 2 +- requirements/ci/py37.yml | 2 +- requirements/ci/py38.yml | 2 +- requirements/test.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/noxfile.py b/noxfile.py index 848243eac4..3e598a99da 100755 --- a/noxfile.py +++ b/noxfile.py @@ -190,7 +190,7 @@ def black(session: nox.sessions.Session): """ # Pip install the session requirements. - session.install("black==21.5b1") + session.install("black==21.5b2") # Execute the black format checker on the package. session.run("black", "--check", PACKAGE) # Execute the black format checker on this file. diff --git a/requirements/ci/py36.yml b/requirements/ci/py36.yml index 1543075948..f5a2e0a765 100644 --- a/requirements/ci/py36.yml +++ b/requirements/ci/py36.yml @@ -34,7 +34,7 @@ dependencies: # Test dependencies. - asv - - black=21.5b1 + - black=21.5b2 - filelock - flake8 - imagehash>=4.0 diff --git a/requirements/ci/py37.yml b/requirements/ci/py37.yml index b7d0ff4157..52d4f27926 100644 --- a/requirements/ci/py37.yml +++ b/requirements/ci/py37.yml @@ -34,7 +34,7 @@ dependencies: # Test dependencies. - asv - - black=21.5b1 + - black=21.5b2 - filelock - flake8 - imagehash>=4.0 diff --git a/requirements/ci/py38.yml b/requirements/ci/py38.yml index 7458b367cd..42b8a061d0 100644 --- a/requirements/ci/py38.yml +++ b/requirements/ci/py38.yml @@ -34,7 +34,7 @@ dependencies: # Test dependencies. - asv - - black=21.5b1 + - black=21.5b2 - filelock - flake8 - imagehash>=4.0 diff --git a/requirements/test.txt b/requirements/test.txt index 32c8db4d0a..8a720c3e78 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,7 +1,7 @@ # Test dependencies. asv -black==21.5b1 +black==21.5b2 filelock imagehash>=4.0 nose From 894f363fe165e49f74d5c4a390e8a19c3f1770ad Mon Sep 17 00:00:00 2001 From: Bill Little Date: Tue, 1 Jun 2021 16:39:43 +0100 Subject: [PATCH 06/12] github issues contact link for discussions (#4164) --- .github/ISSUE_TEMPLATE/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 6d8befbe3c..500a2183d2 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,2 +1,6 @@ # reference: https://docs.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser blank_issues_enabled: false +contact_links: + - name: 💬 Iris GitHub Discussions + url: https://github.com/SciTools/iris/discussions + about: Engage with the Iris community to discuss your issue From 64c88c88ae650e1df0d019b5cc0c870cde0a1e48 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Wed, 2 Jun 2021 08:55:37 +0100 Subject: [PATCH 07/12] drop py36 support (#4163) * drop py36 support * add a whatsnew entry * review actions * warn assert oddness on ci * update pyproject.toml * remove py36-linux-64.lock file --- .cirrus.yml | 4 - .github/workflows/refresh-lockfiles.yml | 2 +- docs/src/conf.py | 37 ++- docs/src/installing.rst | 3 +- docs/src/whatsnew/latest.rst | 14 +- lib/iris/tests/integration/test_pp.py | 2 +- noxfile.py | 2 +- pyproject.toml | 2 +- requirements/ci/nox.lock/py36-linux-64.lock | 241 -------------------- requirements/ci/py36.yml | 52 ----- setup.py | 1 + 11 files changed, 48 insertions(+), 312 deletions(-) delete mode 100644 requirements/ci/nox.lock/py36-linux-64.lock delete mode 100644 requirements/ci/py36.yml diff --git a/.cirrus.yml b/.cirrus.yml index 7470bc6a9e..777b568095 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -137,8 +137,6 @@ test_minimal_task: only_if: ${SKIP_TEST_MINIMAL_TASK} == "" && ${SKIP_ALL_TEST_TASKS} == "" << : *CREDITS_TEMPLATE matrix: - env: - PY_VER: 3.6 env: PY_VER: 3.7 env: @@ -159,8 +157,6 @@ test_full_task: only_if: ${SKIP_TEST_FULL_TASK} == "" && ${SKIP_ALL_TEST_TASKS} == "" << : *CREDITS_TEMPLATE matrix: - env: - PY_VER: 3.6 env: PY_VER: 3.7 env: diff --git a/.github/workflows/refresh-lockfiles.yml b/.github/workflows/refresh-lockfiles.yml index e565e95c75..93c0408b5a 100755 --- a/.github/workflows/refresh-lockfiles.yml +++ b/.github/workflows/refresh-lockfiles.yml @@ -69,7 +69,7 @@ jobs: strategy: matrix: - python: ['36', '37', '38'] + python: ['37', '38'] steps: - uses: actions/checkout@v2 diff --git a/docs/src/conf.py b/docs/src/conf.py index ab05312fca..e4f174f891 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -19,9 +19,15 @@ # ---------------------------------------------------------------------------- +import datetime import ntpath import os +from pathlib import Path +import re import sys +import warnings + +import iris # function to write useful output to stdout, prefixing the source. @@ -53,9 +59,6 @@ def autolog(message): # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -import datetime -import warnings - # custom sphinx extensions sys.path.append(os.path.abspath("sphinxext")) @@ -80,8 +83,6 @@ def autolog(message): # |version| and |release|, also used in various other places throughout the # built documents. -import iris - # The short X.Y version. if iris.__version__ == "dev": version = "dev" @@ -101,9 +102,35 @@ def autolog(message): build_python_version = ".".join([str(i) for i in sys.version_info[:3]]) + +def _dotv(version): + result = version + match = re.match(r"^py(\d+)$", version) + if match: + digits = match.group(1) + if len(digits) > 1: + result = f"{digits[0]}.{digits[1:]}" + return result + + +# Automate the discovery of the python versions tested with CI. +python_support = sorted( + [fname.stem for fname in Path(".").glob("../../requirements/ci/py*.yml")] +) + +if not python_support: + python_support = "unknown Python versions" +elif len(python_support) == 1: + python_support = f"Python {_dotv(python_support[0])}" +else: + rest = ", ".join([_dotv(v) for v in python_support[:-1]]) + last = _dotv(python_support[-1]) + python_support = f"Python {rest} and {last}" + rst_epilog = f""" .. |copyright_years| replace:: {copyright_years} .. |python_version| replace:: {build_python_version} +.. |python_support| replace:: {python_support} .. |iris_version| replace:: v{version} .. |build_date| replace:: ({datetime.datetime.now().strftime('%d %b %Y')}) """ diff --git a/docs/src/installing.rst b/docs/src/installing.rst index 8deb7043c5..8e55593fc6 100644 --- a/docs/src/installing.rst +++ b/docs/src/installing.rst @@ -16,8 +16,7 @@ any WSL_ distributions. .. _WSL: https://docs.microsoft.com/en-us/windows/wsl/install-win10 -.. note:: Iris is currently supported and tested against Python ``3.6``, - ``3.7``, and ``3.8``. +.. note:: Iris is currently supported and tested against |python_support|. .. note:: This documentation was built using Python |python_version|. diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst index 538b6b1142..7633bff9c2 100644 --- a/docs/src/whatsnew/latest.rst +++ b/docs/src/whatsnew/latest.rst @@ -12,10 +12,11 @@ This document explains the changes made to Iris for this release :title: text-primary text-center font-weight-bold :body: bg-light :animate: fade-in + :open: - The highlights for this major/minor release of Iris include: + The highlights for this minor release of Iris include: - * N/A + * We've dropped support for `Python 3.6`_ And finally, get in touch with us on `GitHub`_ if you have any issues or feature requests for improving Iris. Enjoy! @@ -27,8 +28,8 @@ This document explains the changes made to Iris for this release #. Congratulations to `@jamesp`_ who recently became an Iris core developer after joining the Iris development team at the `Met Office`_. 🎉 -#. A special thanks goes to `@akuhnregnier`_, `@gcaria`_, `@jamesp`_ and - `@MHBalsmeier`_ all of whom made their first contributions to Iris, which +#. A special thanks goes to `@akuhnregnier`_, `@gcaria`_, `@jamesp`_, `@MHBalsmeier`_ + and `@Badboy-16`_ all of whom made their first contributions to Iris, which were gratefully received and included in this release. Keep up the awesome work! 🍻 @@ -168,6 +169,10 @@ This document explains the changes made to Iris for this release templates to remove an external URL reference that caused un-posted user issue content to be lost in the browser when followed. (:pull:`4147`) +#. `@bjlittle`_ dropped `Python 3.6`_ support, and automated the discovery of + supported Python versions tested by `cirrus-ci`_ for documentation. + (:pull:`4163`) + .. comment Whatsnew author names (@github name) in alphabetical order. Note that, core dev names are automatically included by the common_links.inc: @@ -191,6 +196,7 @@ This document explains the changes made to Iris for this release .. |PyPI| image:: https://img.shields.io/pypi/v/scitools-iris?color=orange&label=pypi%7Cscitools-iris .. _PyPI: https://pypi.org/project/scitools-iris/ .. _Python 3.8: https://www.python.org/downloads/release/python-380/ +.. _Python 3.6: https://www.python.org/downloads/release/python-360/ .. _README.md: https://github.com/SciTools/iris#----- .. _xxhash: http://cyan4973.github.io/xxHash/ .. _conda-lock: https://github.com/conda-incubator/conda-lock diff --git a/lib/iris/tests/integration/test_pp.py b/lib/iris/tests/integration/test_pp.py index b9b096d782..1706670e9d 100644 --- a/lib/iris/tests/integration/test_pp.py +++ b/lib/iris/tests/integration/test_pp.py @@ -414,7 +414,7 @@ def test_hybrid_height_round_trip_no_reference(self): "Unable to create instance of HybridHeightFactory. " "The source data contains no field(s) for 'orography'." ) - warn.assert_called_once_with(msg) + warn.assert_called_with(msg) # Check the data cube is set up to use hybrid height. self._test_coord( diff --git a/noxfile.py b/noxfile.py index 3e598a99da..1373d8ab24 100755 --- a/noxfile.py +++ b/noxfile.py @@ -20,7 +20,7 @@ PACKAGE = str("lib" / Path("iris")) #: Cirrus-CI environment variable hook. -PY_VER = os.environ.get("PY_VER", ["3.6", "3.7", "3.8"]) +PY_VER = os.environ.get("PY_VER", ["3.7", "3.8"]) #: Default cartopy cache directory. CARTOPY_CACHE_DIR = os.environ.get("HOME") / Path(".local/share/cartopy") diff --git a/pyproject.toml b/pyproject.toml index 31bc0bca0e..a88734d701 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.black] line-length = 79 -target-version = ['py36', 'py37', 'py38'] +target-version = ['py37', 'py38'] include = '\.pyi?$' exclude = ''' diff --git a/requirements/ci/nox.lock/py36-linux-64.lock b/requirements/ci/nox.lock/py36-linux-64.lock deleted file mode 100644 index d1ce4e825a..0000000000 --- a/requirements/ci/nox.lock/py36-linux-64.lock +++ /dev/null @@ -1,241 +0,0 @@ -# platform: linux-64 -# env_hash: 1a0a1f86b81c9babc7172b8741f714137a8e45bd758c8bd5a328f2051fbc4b62 -@EXPLICIT -https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81 -https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2020.12.5-ha878542_0.tar.bz2#7eb5d4ffeee663caa1635cd67071bc1b -https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45 -https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-2.001-hab24e00_0.tar.bz2#1fcc67d5eed875734d8b3eec00b29ce4 -https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.030-hab24e00_0.tar.bz2#dfc1ee25079fd9314698d73ef38b557f -https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5 -https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.35.1-hea4e1c9_2.tar.bz2#83610dba766a186bdc7a116053b782a4 -https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-9.3.0-hff62375_19.tar.bz2#c2d8da3cb171e4aa642d20c6e4e42a04 -https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-9.3.0-h6de172a_19.tar.bz2#cd9a24a8dde03ec0cf0e603b0bea85a1 -https://conda.anaconda.org/conda-forge/linux-64/mpi-1.0-mpich.tar.bz2#c1fcff3417b5a22bbc4cf6e8c23648cf -https://conda.anaconda.org/conda-forge/linux-64/mysql-common-8.0.23-ha770c72_2.tar.bz2#ce876d0c998e1e2eb1dc67b01937737f -https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29 -https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-9.3.0-hff62375_19.tar.bz2#aea379bd68fdcdf9499fa1453f852ac1 -https://conda.anaconda.org/conda-forge/linux-64/libgomp-9.3.0-h2828fa1_19.tar.bz2#ab0a307912033126da02507b59e79ec9 -https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-1_gnu.tar.bz2#561e277319a41d4f24f5c05a9ef63c04 -https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab -https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-9.3.0-h2828fa1_19.tar.bz2#9d5cdfc51476ee4dcdd96ed2dca3f943 -https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.3-h516909a_0.tar.bz2#1378b88874f42ac31b2f8e4f6975cb7b -https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54 -https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.17.1-h7f98852_1.tar.bz2#ed1dc233ed5e3eaa9bfbaac64d130c5e -https://conda.anaconda.org/conda-forge/linux-64/expat-2.3.0-h9c3ff4c_0.tar.bz2#1fb8f0254eb78a2a0c120155e1b1a207 -https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h36c2ea0_0.tar.bz2#ac7bc6a654f8f41b352b38f4051135f8 -https://conda.anaconda.org/conda-forge/linux-64/geos-3.9.1-h9c3ff4c_2.tar.bz2#b9a6d9422aed3ad84ec6ccee9bfcaa0f -https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h36c2ea0_2.tar.bz2#626e68ae9cc5912d6adb79d318cf962d -https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-h58526e2_1001.tar.bz2#8c54672728e8ec6aa6db90cf2806d220 -https://conda.anaconda.org/conda-forge/linux-64/icu-68.1-h58526e2_0.tar.bz2#fc7a4271dc2a7f4fd78cd63695baf7c3 -https://conda.anaconda.org/conda-forge/linux-64/jpeg-9d-h36c2ea0_0.tar.bz2#ea02ce6037dbe81803ae6123e5ba1568 -https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2#6f8720dff19e17ce5d48cfe7f3d2f0a3 -https://conda.anaconda.org/conda-forge/linux-64/libffi-3.3-h58526e2_2.tar.bz2#665369991d8dd290ac5ee92fce3e6bf5 -https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.16-h516909a_0.tar.bz2#5c0f338a513a2943c659ae619fca9211 -https://conda.anaconda.org/conda-forge/linux-64/libmo_unpack-3.1.2-hf484d3e_1001.tar.bz2#95f32a6a5a666d33886ca5627239f03d -https://conda.anaconda.org/conda-forge/linux-64/libogg-1.3.4-h7f98852_1.tar.bz2#6e8cc2173440d77708196c5b93771680 -https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.15-pthreads_h8fe5266_0.tar.bz2#b4bdbbff92cacdd7b28b1b0a0366b24b -https://conda.anaconda.org/conda-forge/linux-64/libopus-1.3.1-h7f98852_1.tar.bz2#15345e56d527b330e1cacbdf58676e8f -https://conda.anaconda.org/conda-forge/linux-64/libtool-2.4.6-h58526e2_1007.tar.bz2#7f6569a0c2f27acb8fc90600b382e544 -https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.32.1-h7f98852_1000.tar.bz2#772d69f030955d9646d3d0eaf21d859d -https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.2.0-h7f98852_2.tar.bz2#fb63a035a3b552c88a30d84b89ebf4c4 -https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.3-h9c3ff4c_0.tar.bz2#4eb64ee0d5cd43096ffcf843c76b05d4 -https://conda.anaconda.org/conda-forge/linux-64/mpich-3.4.1-h846660c_104.tar.bz2#94f01e56905a7af1479c9f72b00e9864 -https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.2-h58526e2_4.tar.bz2#509f2a21c4a09214cd737a480dfd80c9 -https://conda.anaconda.org/conda-forge/linux-64/nspr-4.30-h9c3ff4c_0.tar.bz2#e6dc1f8f6e0bcebe8e3d8a5bca258dbe -https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1k-h7f98852_0.tar.bz2#07fae2cb088379c8441e0f3ffa1f4025 -https://conda.anaconda.org/conda-forge/linux-64/pcre-8.44-he1b5a44_0.tar.bz2#e647d89cd5cdf62760cf283a001841ff -https://conda.anaconda.org/conda-forge/linux-64/pixman-0.40.0-h36c2ea0_0.tar.bz2#660e72c82f2e75a6b3fe6a6e75c79f19 -https://conda.anaconda.org/conda-forge/linux-64/pthread-stubs-0.4-h36c2ea0_1001.tar.bz2#22dad4df6e8630e8dff2428f6f6a7036 -https://conda.anaconda.org/conda-forge/linux-64/xorg-kbproto-1.0.7-h7f98852_1002.tar.bz2#4b230e8381279d76131116660f5a241a -https://conda.anaconda.org/conda-forge/linux-64/xorg-libice-1.0.10-h7f98852_0.tar.bz2#d6b0b50b49eccfe0be0373be628be0f3 -https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.9-h7f98852_0.tar.bz2#bf6f803a544f26ebbdc3bfff272eb179 -https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.3-h7f98852_0.tar.bz2#be93aabceefa2fac576e971aef407908 -https://conda.anaconda.org/conda-forge/linux-64/xorg-renderproto-0.11.1-h7f98852_1002.tar.bz2#06feff3d2634e3097ce2fe681474b534 -https://conda.anaconda.org/conda-forge/linux-64/xorg-xextproto-7.3.0-h7f98852_1002.tar.bz2#1e15f6ad85a7d743a2ac68dae6c82b98 -https://conda.anaconda.org/conda-forge/linux-64/xorg-xproto-7.0.31-h7f98852_1007.tar.bz2#b4a4381d54784606820704f7b5f05a15 -https://conda.anaconda.org/conda-forge/linux-64/xxhash-0.8.0-h7f98852_3.tar.bz2#52402c791f35e414e704b7a113f99605 -https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.5-h516909a_1.tar.bz2#33f601066901f3e1a85af3522a8113f9 -https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h516909a_0.tar.bz2#03a530e925414902547cf48da7756db8 -https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.11-h516909a_1010.tar.bz2#339cc5584e6d26bc73a875ba900028c3 -https://conda.anaconda.org/conda-forge/linux-64/gettext-0.19.8.1-h0b5b191_1005.tar.bz2#ff6f69b593a9e74c0e6b61908ac513fa -https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.13-h10796ff_1005.tar.bz2#941d62d7d94ab46cf824512a57cac991 -https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-9_openblas.tar.bz2#5f08755e98b2a43ca68124e629a5a0cb -https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1 -https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-hcdb4288_3.tar.bz2#d8f51405997093ff1799ded7650439c4 -https://conda.anaconda.org/conda-forge/linux-64/libllvm11-11.1.0-hf817b99_2.tar.bz2#646fa2f7c60b69ee8f918668e9c2fd31 -https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.43.0-h812cca2_0.tar.bz2#1867d1e9658596b3fac8847a7702eef4 -https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.37-h21135ba_2.tar.bz2#b6acf807307d033d4b7e758b4f44b036 -https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.9.0-ha56f1ee_6.tar.bz2#f0dfb86444df325e599dbc3f4c0a3f5b -https://conda.anaconda.org/conda-forge/linux-64/libvorbis-1.3.7-h9c3ff4c_0.tar.bz2#309dec04b70a3cc0f1e84a4013683bc0 -https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1003.tar.bz2#a9371e9e40aded194dcba1447606c9a1 -https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.10-h72842e0_4.tar.bz2#48577b6e1605c935d7178f6694506ee9 -https://conda.anaconda.org/conda-forge/linux-64/libzip-1.7.3-h4de3113_0.tar.bz2#2568763f88009f95e9262cba837dbb82 -https://conda.anaconda.org/conda-forge/linux-64/readline-8.1-h46c0cb4_0.tar.bz2#5788de3c8d7a7d64ac56c784c4ef48e6 -https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.10-h21135ba_1.tar.bz2#c647f70aa7e3d4cc4e029cc1c9a99953 -https://conda.anaconda.org/conda-forge/linux-64/udunits2-2.2.27.27-h975c496_1.tar.bz2#e663bd5dbc8cc4c1647d9f51cf25872c -https://conda.anaconda.org/conda-forge/linux-64/xorg-libsm-1.2.3-hd9c2040_1000.tar.bz2#9e856f78d5c80d5a78f61e72d1d473a3 -https://conda.anaconda.org/conda-forge/linux-64/zstd-1.4.9-ha95c52a_0.tar.bz2#b481dc9fda3af2a681d08a4d5cd1ea0b -https://conda.anaconda.org/conda-forge/linux-64/freetype-2.10.4-h0708190_1.tar.bz2#4a06f2ac2e5bfae7b6b245171c3f07aa -https://conda.anaconda.org/conda-forge/linux-64/krb5-1.17.2-h926e7f8_0.tar.bz2#926325c11478d6e781e76072c117763b -https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-9_openblas.tar.bz2#edee85b4f83376ceae81e0975b8bffa2 -https://conda.anaconda.org/conda-forge/linux-64/libclang-11.1.0-default_ha53f305_0.tar.bz2#b7bc364d3ecf51443d48e14f87d784de -https://conda.anaconda.org/conda-forge/linux-64/libglib-2.68.1-h3e27bee_0.tar.bz2#486fecf2277a154e5f73f62328764310 -https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-9_openblas.tar.bz2#572d84ab07962986f6dd8e4637a475ca -https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.2.0-hdc55705_1.tar.bz2#59b84553b303e0f4923289dd204dcd6b -https://conda.anaconda.org/conda-forge/linux-64/libxkbcommon-1.0.3-he3ba5ed_0.tar.bz2#f9dbabc7e01c459ed7a1d1d64b206e9b -https://conda.anaconda.org/conda-forge/linux-64/mysql-libs-8.0.23-h935591d_2.tar.bz2#b36368d163fca85e110529ddc4c67985 -https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.35.5-h74cdb3f_0.tar.bz2#e876c82c21e7074d299e13762d02466c -https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.0-h7f98852_0.tar.bz2#0cd07abd75b2fad023161c657524ddbd -https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.36.0-h3371d22_4.tar.bz2#661e1ed5d92552785d9f8c781ce68685 -https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.13.1-hba837de_1005.tar.bz2#fd3611672eb91bc9d24fd6fb970037eb -https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.6-h04a7f16_0.tar.bz2#b24a1e18325a6e8f8b6b4a2ec5860ce2 -https://conda.anaconda.org/conda-forge/linux-64/glib-tools-2.68.1-h9c3ff4c_0.tar.bz2#b1ecd0fa079de56a1ba8d03063ee39bb -https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.18.4-h76c114f_2.tar.bz2#5db765d4974fa89f64c1544eb2a552cb -https://conda.anaconda.org/conda-forge/linux-64/gts-0.7.6-h64030ff_2.tar.bz2#112eb9b5b93f0c02e59aea4fd1967363 -https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.12-hddcbb42_0.tar.bz2#797117394a4aa588de6d741b06fad80f -https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.76.1-hc4aaa36_1.tar.bz2#349a288d04af695b639e5f947df3c2d0 -https://conda.anaconda.org/conda-forge/linux-64/libpq-13.2-hfd2b0eb_2.tar.bz2#66cc9cbd324d484c01ea08d98761aeb1 -https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.0-h3452ae3_0.tar.bz2#8f4e19a8988c38feec7db41bcd0bf0d0 -https://conda.anaconda.org/conda-forge/linux-64/nss-3.64-hb5efdd6_0.tar.bz2#cb598141b73b9f7ebbffbd41220dcb9a -https://conda.anaconda.org/conda-forge/linux-64/python-3.6.13-hffdb5ce_0_cpython.tar.bz2#575e65ac9386755d3b9fd70f20dc1e37 -https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h7f98852_1.tar.bz2#536cc5db4d0a3ba0630541aec064b5e4 -https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h7f98852_1003.tar.bz2#f59c1242cc1dd93e72c2ee2b360979eb -https://conda.anaconda.org/conda-forge/noarch/alabaster-0.7.12-py_0.tar.bz2#2489a97287f90176ecdc3ca982b4b0a0 -https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b -https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-h6cf1ce9_1008.tar.bz2#a43fb47d15e116f8be4be7e6b17ab59f -https://conda.anaconda.org/conda-forge/noarch/click-7.1.2-pyh9f0ad1d_0.tar.bz2#bd50a970ce07e660c319fdc4d730d3f1 -https://conda.anaconda.org/conda-forge/noarch/cloudpickle-1.6.0-py_0.tar.bz2#76d764d8881719e305f6fa368dc2b65e -https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.4-pyh9f0ad1d_0.tar.bz2#c08b4c1326b880ed44f3ffb04803332f -https://conda.anaconda.org/conda-forge/linux-64/curl-7.76.1-h979ede3_1.tar.bz2#28e9133d2ad9ba3081e52548ea20c870 -https://conda.anaconda.org/conda-forge/noarch/dataclasses-0.8-pyh787bdff_0.tar.bz2#99ccd57a7c9761e97e17777f0cde21eb -https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.1-pyh9f0ad1d_0.tar.bz2#db990401a267e2b15854af5f3f84f763 -https://conda.anaconda.org/conda-forge/noarch/filelock-3.0.12-pyh9f0ad1d_0.tar.bz2#7544ed05bbbe9bb687bc9bcbe4d6cb46 -https://conda.anaconda.org/conda-forge/noarch/fsspec-2021.4.0-pyhd8ed1ab_0.tar.bz2#7019316dafd6ef2e0a2fc178486993cd -https://conda.anaconda.org/conda-forge/linux-64/glib-2.68.1-h9c3ff4c_0.tar.bz2#9fb05e9b0df734f92df7810c7c8975e3 -https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.18.4-hf529b03_2.tar.bz2#526fadaa13ec264cb919436953bc2766 -https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.10.6-mpi_mpich_h996c276_1014.tar.bz2#6af2e2e4dfb0ef36c35042cd69a1599d -https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95 -https://conda.anaconda.org/conda-forge/noarch/idna-2.10-pyh9f0ad1d_0.tar.bz2#f95a12b4f435aae6680fe55ae2eb1b06 -https://conda.anaconda.org/conda-forge/noarch/imagesize-1.2.0-py_0.tar.bz2#5879bd2c4b399a5072468e5fe587bf1b -https://conda.anaconda.org/conda-forge/noarch/iris-sample-data-2.3.0-pyh9f0ad1d_0.tar.bz2#e4a33192da1a6dc4967ba18c6c765945 -https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.2-h78a0170_0.tar.bz2#ac0c23e6f3bbb61569781f00b5666f97 -https://conda.anaconda.org/conda-forge/noarch/locket-0.2.0-py_2.tar.bz2#709e8671651c7ec3d1ad07800339ff1d -https://conda.anaconda.org/conda-forge/noarch/mccabe-0.6.1-py_1.tar.bz2#a326cb400c1ccd91789f3e7d02124d61 -https://conda.anaconda.org/conda-forge/noarch/nose-1.3.7-py_1006.tar.bz2#382019d5f8e9362ef6f60a8d4e7bce8f -https://conda.anaconda.org/conda-forge/noarch/olefile-0.46-pyh9f0ad1d_1.tar.bz2#0b2e68acc8c78c8cc392b90983481f58 -https://conda.anaconda.org/conda-forge/noarch/pathspec-0.8.1-pyhd3deb0d_0.tar.bz2#fcd2fbb062b55d14a77e664c89ee17a6 -https://conda.anaconda.org/conda-forge/linux-64/proj-7.2.0-h277dcde_2.tar.bz2#db654ee11298d3463bad67445707654c -https://conda.anaconda.org/conda-forge/noarch/pycodestyle-2.7.0-pyhd8ed1ab_0.tar.bz2#0234673eb2ecfbdf4e54574ab4d95f81 -https://conda.anaconda.org/conda-forge/noarch/pycparser-2.20-pyh9f0ad1d_2.tar.bz2#aa798d50ffd182a0f6f31478c7f434f6 -https://conda.anaconda.org/conda-forge/noarch/pyflakes-2.3.1-pyhd8ed1ab_0.tar.bz2#01e9ada82bd261ee2b6366aa832018cc -https://conda.anaconda.org/conda-forge/noarch/pyke-1.1.1-pyhd8ed1ab_1004.tar.bz2#5f0236abfbb6d53826d1afed1e64f82e -https://conda.anaconda.org/conda-forge/noarch/pyparsing-2.4.7-pyh9f0ad1d_0.tar.bz2#626c4f20d5bf06dcec9cf2eaa31725c7 -https://conda.anaconda.org/conda-forge/noarch/pyshp-2.1.3-pyh44b312d_0.tar.bz2#2d1867b980785eb44b8122184d8b42a6 -https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.6-1_cp36m.tar.bz2#7f3681b01bd688b48bfbdae483b2918f -https://conda.anaconda.org/conda-forge/noarch/pytz-2021.1-pyhd8ed1ab_0.tar.bz2#3af2e9424d5eb0063824a3f9b850d411 -https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2 -https://conda.anaconda.org/conda-forge/noarch/snowballstemmer-2.1.0-pyhd8ed1ab_0.tar.bz2#f1d64c0cf0eedf655a96ccdc1573c05a -https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.3.0-pyhd8ed1ab_0.tar.bz2#2f5b87cd0bdf1822b62e40909f471db4 -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-applehelp-1.0.2-py_0.tar.bz2#20b2eaeaeea4ef9a9a0d99770620fd09 -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-devhelp-1.0.2-py_0.tar.bz2#68e01cac9d38d0e717cd5c87bc3d2cc9 -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-htmlhelp-1.0.3-py_0.tar.bz2#4508a40465ebf0105e52f7194f299411 -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-jsmath-1.0.1-py_0.tar.bz2#67cd9d9c0382d37479b4d306c369a2d4 -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-qthelp-1.0.3-py_0.tar.bz2#d01180388e6d1838c3e1ad029590aa7a -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.4-py_0.tar.bz2#8ea6a8036e28dba8827d35c764709358 -https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76 -https://conda.anaconda.org/conda-forge/noarch/toml-0.10.2-pyhd8ed1ab_0.tar.bz2#f832c45a477c78bebd107098db465095 -https://conda.anaconda.org/conda-forge/noarch/toolz-0.11.1-py_0.tar.bz2#d1e66b58cb00b3817ad9f05eec098c00 -https://conda.anaconda.org/conda-forge/noarch/typing_extensions-3.7.4.3-py_0.tar.bz2#12b96e382730541a4b332420227055ae -https://conda.anaconda.org/conda-forge/noarch/wheel-0.36.2-pyhd3deb0d_0.tar.bz2#768bfbe026426d0e76b377997d1f2b98 -https://conda.anaconda.org/conda-forge/noarch/zipp-3.4.1-pyhd8ed1ab_0.tar.bz2#a4fa30eb74a326092b3d8078b1f1aae1 -https://conda.anaconda.org/conda-forge/linux-64/antlr-python-runtime-4.7.2-py36h5fab9bb_1002.tar.bz2#37df435690656fc56f8b031cd759ef77 -https://conda.anaconda.org/conda-forge/noarch/babel-2.9.1-pyh44b312d_0.tar.bz2#74136ed39bfea0832d338df1e58d013e -https://conda.anaconda.org/conda-forge/linux-64/certifi-2020.12.5-py36h5fab9bb_1.tar.bz2#da529031bd8882eff7d72484661c1b83 -https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.5-py36hc120d54_0.tar.bz2#f49c72aeb497efcd918217d142ddfc9c -https://conda.anaconda.org/conda-forge/noarch/cfgv-3.2.0-py_0.tar.bz2#4972efcb3e2cbd3954b24a17266be25c -https://conda.anaconda.org/conda-forge/linux-64/chardet-4.0.0-py36h5fab9bb_1.tar.bz2#b63c63a44b8d37acaff014df8a512d92 -https://conda.anaconda.org/conda-forge/noarch/cycler-0.10.0-py_2.tar.bz2#f6d7c7e6d8f42cbbec7e07a8d879f91c -https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.11.0-py36h8f6f2f9_3.tar.bz2#cfdf59a409935a32e9f51b37d25b66f7 -https://conda.anaconda.org/conda-forge/linux-64/dbus-1.13.6-h48d8840_2.tar.bz2#eba672c69baf366fdedd1c6f702dbb81 -https://conda.anaconda.org/conda-forge/linux-64/docutils-0.16-py36h5fab9bb_3.tar.bz2#5d0a90c22c5c8a1f573df6b6f2afc5ee -https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-2.8.1-h83ec7ef_0.tar.bz2#654935b08e8bd4a8cbf6a4253e290c04 -https://conda.anaconda.org/conda-forge/linux-64/immutables-0.15-py36h8f6f2f9_0.tar.bz2#9f5767abe2f02d4bf73a7896a8f26790 -https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-4.0.1-py36h5fab9bb_0.tar.bz2#3c9bfd1ccfdf3002b174e4e1e7385341 -https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.3.1-py36h605e78d_1.tar.bz2#a92afbf92c5416585457e5de5c3d98c7 -https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.8.0-mpi_mpich_hf07302c_1.tar.bz2#2df6da2c9d66945c9399ce6e94d1748e -https://conda.anaconda.org/conda-forge/linux-64/markupsafe-1.1.1-py36h8f6f2f9_3.tar.bz2#4471d6eaa07fcc4dd1f2e0e6cc8e54bf -https://conda.anaconda.org/conda-forge/linux-64/mpi4py-3.0.3-py36h7b8b12a_7.tar.bz2#a85a032afabc323a400d618c448e278a -https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.2-py36h605e78d_1.tar.bz2#9460d0c8c77d3d5c410eb6743a48eca8 -https://conda.anaconda.org/conda-forge/linux-64/mypy_extensions-0.4.3-py36h5fab9bb_3.tar.bz2#abc16a8fe5dc31bde74702e28ed59164 -https://conda.anaconda.org/conda-forge/linux-64/numpy-1.19.5-py36h2aa4a07_1.tar.bz2#825e240765327dcdb8b0add973714e9e -https://conda.anaconda.org/conda-forge/noarch/packaging-20.9-pyh44b312d_0.tar.bz2#be69a38e912054a62dc82cc3c7711a64 -https://conda.anaconda.org/conda-forge/noarch/partd-1.2.0-pyhd8ed1ab_0.tar.bz2#0c32f563d7f22e3a34c95cad8cc95651 -https://conda.anaconda.org/conda-forge/linux-64/pillow-6.2.2-py36h8328e55_0.tar.bz2#71ce4115a7035932d0abdaec69e1d432 -https://conda.anaconda.org/conda-forge/noarch/pockets-0.9.1-py_0.tar.bz2#1b52f0c42e8077e5a33e00fe72269364 -https://conda.anaconda.org/conda-forge/linux-64/psutil-5.8.0-py36h8f6f2f9_1.tar.bz2#ccecd9206d61f029549a81a980174ed8 -https://conda.anaconda.org/conda-forge/linux-64/pyqt5-sip-4.19.18-py36hc4f0c31_7.tar.bz2#6bb1cad16acc8b2ac34fb4a75ef8cc09 -https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py36h5fab9bb_3.tar.bz2#4dfb9be0b2975bc7933f32c6db7af205 -https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.1-py_0.tar.bz2#0d0150ed9c2d25817f5324108d3f7571 -https://conda.anaconda.org/conda-forge/linux-64/python-xxhash-2.0.2-py36h8f6f2f9_0.tar.bz2#7fd3e41e00f0ebcac23b775ad5a8ca90 -https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.4.1-py36h8f6f2f9_0.tar.bz2#c4be96c884afed3ce48ab143570a439f -https://conda.anaconda.org/conda-forge/linux-64/regex-2021.4.4-py36h8f6f2f9_0.tar.bz2#df048f01fdcae6f0f75a05a4160b69d6 -https://conda.anaconda.org/conda-forge/linux-64/tornado-6.1-py36h8f6f2f9_1.tar.bz2#3d19680e14cb7cf6f383ba1fd3a72f2c -https://conda.anaconda.org/conda-forge/linux-64/typed-ast-1.4.3-py36h8f6f2f9_0.tar.bz2#738cc2808eaff7e220a6f46bbddd4e5a -https://conda.anaconda.org/conda-forge/noarch/zict-2.0.0-py_0.tar.bz2#4750152be22f24d695b3004c5e1712d3 -https://conda.anaconda.org/conda-forge/noarch/black-20.8b1-py_1.tar.bz2#e555d6b71ec916c3dc4e6e3793cc9796 -https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py36h8f6f2f9_1001.tar.bz2#0f244e9624403e17430e9d959530b01c -https://conda.anaconda.org/conda-forge/linux-64/cftime-1.2.1-py36h68bb277_1.tar.bz2#86ea5650a50b9d59336edb2ec57959de -https://conda.anaconda.org/conda-forge/noarch/contextvars-2.4-py_0.tar.bz2#295fe9300971a6bd1dc4b18ad6509be2 -https://conda.anaconda.org/conda-forge/linux-64/cryptography-3.4.7-py36hb60f036_0.tar.bz2#e3f8fbf0f4037279847c8ab1551fe6f8 -https://conda.anaconda.org/conda-forge/noarch/dask-core-2021.3.0-pyhd8ed1ab_0.tar.bz2#e7a647c6320649dd7c80a1938f1a211c -https://conda.anaconda.org/conda-forge/linux-64/editdistance-s-1.0.0-py36h605e78d_1.tar.bz2#89c5489b410421aabe2888e73154b9d3 -https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-4.0.1-hd8ed1ab_0.tar.bz2#50c48f1394fba9705a76163409924628 -https://conda.anaconda.org/conda-forge/linux-64/mo_pack-0.2.0-py36h92226af_1005.tar.bz2#b67300a68479aae643fa443c8073ad22 -https://conda.anaconda.org/conda-forge/linux-64/netcdf-fortran-4.5.3-mpi_mpich_h196b126_4.tar.bz2#e058f42a78ea8c965cf7335e28143c59 -https://conda.anaconda.org/conda-forge/linux-64/pandas-1.1.5-py36h284efc9_0.tar.bz2#e5e3d1a5401c1c932ada9d4f0b6c8448 -https://conda.anaconda.org/conda-forge/linux-64/pango-1.42.4-h69149e4_5.tar.bz2#9e325ab71e743c57955e73172d1db615 -https://conda.anaconda.org/conda-forge/linux-64/python-stratify-0.1.1-py36h92226af_1003.tar.bz2#6898a2bff137799b902891edd448d183 -https://conda.anaconda.org/conda-forge/linux-64/pywavelets-1.1.1-py36h92226af_3.tar.bz2#ea7f1093a7ac3c449d7ea8984e6fd873 -https://conda.anaconda.org/conda-forge/linux-64/qt-5.12.9-hda022c4_4.tar.bz2#afebab1f5049d66baaaec67d9ce893f0 -https://conda.anaconda.org/conda-forge/linux-64/scipy-1.5.3-py36h9e8f40b_0.tar.bz2#39502ad94bcb186c0cf4eb7532316d6a -https://conda.anaconda.org/conda-forge/linux-64/setuptools-49.6.0-py36h5fab9bb_3.tar.bz2#0e5930ee136de4ecef3640f50b3037a2 -https://conda.anaconda.org/conda-forge/linux-64/shapely-1.7.1-py36h93b233e_4.tar.bz2#bf7457dee29298d9f958382cc2409489 -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-napoleon-0.7-py_0.tar.bz2#0bc25ff6f2e34af63ded59692df5f749 -https://conda.anaconda.org/conda-forge/linux-64/asv-0.4.2-py36hc4f0c31_2.tar.bz2#aba2d553655f81aa4ec683f0039104e1 -https://conda.anaconda.org/conda-forge/linux-64/cf-units-2.1.4-py36h68bb277_2.tar.bz2#54d5db1b6b6b6acded8d5634fb2d220e -https://conda.anaconda.org/conda-forge/linux-64/distributed-2021.3.0-py36h5fab9bb_0.tar.bz2#d484e4c9daade19800341eedff55f1d2 -https://conda.anaconda.org/conda-forge/linux-64/esmf-8.1.1-mpi_mpich_h3dcaa78_100.tar.bz2#5b4bab1017226f2c03ba0fe02b783316 -https://conda.anaconda.org/conda-forge/noarch/flake8-3.9.1-pyhd8ed1ab_0.tar.bz2#9ce1de40e3510b60d15d512251a3d3f7 -https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-hab0c2f8_0.tar.bz2#8acbef87761a4b90f090168737822611 -https://conda.anaconda.org/conda-forge/noarch/identify-2.2.4-pyhd8ed1ab_0.tar.bz2#86a6446475a53451a71e1515150cb532 -https://conda.anaconda.org/conda-forge/noarch/imagehash-4.2.0-pyhd8ed1ab_0.tar.bz2#e5a77472ae964f2835fce16355bbfe64 -https://conda.anaconda.org/conda-forge/linux-64/importlib_resources-5.1.2-py36h5fab9bb_0.tar.bz2#5c6d0535d991e38151de2ecbb0fa1662 -https://conda.anaconda.org/conda-forge/noarch/jinja2-2.11.3-pyh44b312d_0.tar.bz2#1d4c3605d85a3655b1595e0694138eb6 -https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.50.3-hfa39831_1.tar.bz2#7578526979e852a1f8650080214c6cd6 -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.3.4-py36hd391965_0.tar.bz2#ed3c55ad68aa87ba9c2b2d5f6ede7f14 -https://conda.anaconda.org/conda-forge/linux-64/netcdf4-1.5.6-nompi_py36h3d597d4_103.tar.bz2#0d09a7bdf15e8efc761d54e0060ee189 -https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.6.0-pyhd8ed1ab_0.tar.bz2#0941325bf48969e2b3b19d0951740950 -https://conda.anaconda.org/conda-forge/noarch/pip-21.1.1-pyhd8ed1ab_0.tar.bz2#e0bad1330c3575222d221e7679a36a0a -https://conda.anaconda.org/conda-forge/noarch/pygments-2.9.0-pyhd8ed1ab_0.tar.bz2#a2d9bba43c9b80a42b0ccb9afd7223c2 -https://conda.anaconda.org/conda-forge/noarch/pyopenssl-20.0.1-pyhd8ed1ab_0.tar.bz2#92371c25994d0f5d28a01c1fb75ebf86 -https://conda.anaconda.org/conda-forge/linux-64/pyqt-impl-5.12.3-py36h7ec31b9_7.tar.bz2#379005311c6e733b228723e67fc52fb2 -https://conda.anaconda.org/conda-forge/linux-64/bokeh-2.1.1-py36h9f0ad1d_0.tar.bz2#f2b02dad779533dc04af6698949f02d3 -https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.19.0.post1-py36hbcbf2fa_0.tar.bz2#a880959967e1929884337b6b1be5dd78 -https://conda.anaconda.org/conda-forge/linux-64/esmpy-8.1.1-mpi_mpich_py36hcd78dbd_100.tar.bz2#cce5b688501b00de155299a82365852c -https://conda.anaconda.org/conda-forge/linux-64/graphviz-2.47.1-hebd9034_0.tar.bz2#9840ac6c4756d7f4b6035a62aae4d6fb -https://conda.anaconda.org/conda-forge/noarch/nc-time-axis-1.2.0-py_1.tar.bz2#f3158a5d335f0f44f09cf05d3fb4107e -https://conda.anaconda.org/conda-forge/linux-64/pyqtchart-5.12-py36h7ec31b9_7.tar.bz2#69735aad86e57eb4de60cf7f208b8604 -https://conda.anaconda.org/conda-forge/linux-64/pyqtwebengine-5.12.1-py36h7ec31b9_7.tar.bz2#4d15c862d7989dcc1fa4f321d27a2d66 -https://conda.anaconda.org/conda-forge/noarch/pyugrid-0.3.1-py_2.tar.bz2#7d7361886fbcf2be663fd185bf6d244d -https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.4-pyhd8ed1ab_0.tar.bz2#d7b20b328e23d993994ea02077c009c0 -https://conda.anaconda.org/conda-forge/linux-64/virtualenv-20.4.6-py36h5fab9bb_0.tar.bz2#29e771278bffe7b3f119992635c5fc0d -https://conda.anaconda.org/conda-forge/noarch/dask-2021.3.0-pyhd8ed1ab_0.tar.bz2#ad8913a398eedda25f6243d02c973f28 -https://conda.anaconda.org/conda-forge/linux-64/pre-commit-2.12.1-py36h5fab9bb_0.tar.bz2#27613fa5d0a4871f4317f2b6e9786104 -https://conda.anaconda.org/conda-forge/linux-64/pyqt-5.12.3-py36h5fab9bb_7.tar.bz2#02315b51b199ef6700a53debf1bada5b -https://conda.anaconda.org/conda-forge/noarch/requests-2.25.1-pyhd3deb0d_0.tar.bz2#ae687aba31a1c400192a86a2e993ffdc -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.3.4-py36h5fab9bb_0.tar.bz2#a3731e3e7e412e7b2f88593f92b74864 -https://conda.anaconda.org/conda-forge/noarch/sphinx-3.5.4-pyh44b312d_0.tar.bz2#0ebc444f001f73c4f6de01057b0be392 -https://conda.anaconda.org/conda-forge/noarch/sphinx-copybutton-0.3.1-pyhd8ed1ab_0.tar.bz2#decad13214a2a545944560eccf4a9815 -https://conda.anaconda.org/conda-forge/noarch/sphinx-gallery-0.9.0-pyhd8ed1ab_0.tar.bz2#5ef222a3e1b5904742e376e05046692b -https://conda.anaconda.org/conda-forge/noarch/sphinx-panels-0.5.2-pyhd3deb0d_0.tar.bz2#1a871a63c4be1bd47a7aa48b7417a426 -https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-0.5.2-pyhd8ed1ab_1.tar.bz2#7434e891fc767cb0d39d90751720c8ec diff --git a/requirements/ci/py36.yml b/requirements/ci/py36.yml deleted file mode 100644 index f5a2e0a765..0000000000 --- a/requirements/ci/py36.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: iris-dev - -channels: - - conda-forge - -dependencies: - - python=3.6 - -# Setup dependencies. - - setuptools>=40.8.0 - - pyke - -# Core dependencies. - - cartopy>=0.18 - - cf-units>=2 - - cftime<1.3.0 - - dask>=2 - - matplotlib - - netcdf4 - - numpy>=1.14 - - python-xxhash - - scipy - -# Optional dependencies. - - esmpy>=7.0 - - graphviz - - iris-sample-data - - mo_pack - - nc-time-axis - - pandas - - pip - - python-stratify - - pyugrid - -# Test dependencies. - - asv - - black=21.5b2 - - filelock - - flake8 - - imagehash>=4.0 - - nose - - pillow<7 - - pre-commit - - requests - -# Documentation dependencies. - - sphinx - - sphinxcontrib-napoleon - - sphinx-copybutton - - sphinx-gallery - - sphinx-panels - - sphinx_rtd_theme diff --git a/setup.py b/setup.py index f4bfe4cf08..d6391e07a6 100644 --- a/setup.py +++ b/setup.py @@ -279,4 +279,5 @@ def long_description(): "docs": pip_requirements("docs"), "test": pip_requirements("test"), }, + python_requires=">=3.7", ) From 7f734a86a5ccfa7eec355f16916ac75a4f642698 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Wed, 2 Jun 2021 11:05:40 +0100 Subject: [PATCH 08/12] RTD support link update (#4166) * RTD support link update * review actions --- docs/src/common_links.inc | 2 +- docs/src/conf.py | 8 ++------ .../src/developers_guide/gitwash/development_workflow.rst | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/src/common_links.inc b/docs/src/common_links.inc index 7209d85c09..32227bd69b 100644 --- a/docs/src/common_links.inc +++ b/docs/src/common_links.inc @@ -11,9 +11,9 @@ .. _core developers: https://github.com/SciTools/scitools.org.uk/blob/master/contributors.json .. _generating sss keys for GitHub: https://docs.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account .. _GitHub Help Documentation: https://docs.github.com/en/github +.. _Iris GitHub Discussions: https://github.com/SciTools/iris/discussions .. _Iris: https://github.com/SciTools/iris .. _Iris GitHub: https://github.com/SciTools/iris -.. _iris mailing list: https://groups.google.com/forum/#!forum/scitools-iris .. _iris-sample-data: https://github.com/SciTools/iris-sample-data .. _iris-test-data: https://github.com/SciTools/iris-test-data .. _issue: https://github.com/SciTools/iris/issues diff --git a/docs/src/conf.py b/docs/src/conf.py index e4f174f891..3f36124b46 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -271,12 +271,8 @@ def _dotv(version): "https://github.com/SciTools/iris", ), ( - ' Users Google Group', - "https://groups.google.com/forum/#!forum/scitools-iris", - ), - ( - ' Developers Google Group', - "https://groups.google.com/forum/#!forum/scitools-iris-dev", + ' GitHub Discussions', + "https://github.com/SciTools/iris/discussions", ), ( ' StackOverflow for "How Do I?"', diff --git a/docs/src/developers_guide/gitwash/development_workflow.rst b/docs/src/developers_guide/gitwash/development_workflow.rst index f6144a05e9..4fe0abb202 100644 --- a/docs/src/developers_guide/gitwash/development_workflow.rst +++ b/docs/src/developers_guide/gitwash/development_workflow.rst @@ -25,7 +25,7 @@ In what follows we'll refer to the upstream iris ``master`` branch, as * If you can possibly avoid it, avoid merging trunk or any other branches into your feature branch while you are working. * If you do find yourself merging from trunk, consider :ref:`rebase-on-trunk` -* Ask on the `iris mailing list`_ if you get stuck. +* Ask on the `Iris GitHub Discussions`_ if you get stuck. * Ask for code review! This way of working helps to keep work well organized, with readable history. From ca4c0d9b9f72e0a808fdca49eab5d788711a727c Mon Sep 17 00:00:00 2001 From: Bill Little Date: Wed, 2 Jun 2021 12:09:30 +0100 Subject: [PATCH 09/12] update CONTRIBUTING.md (#4165) * update CONTRIBUTING.md * review actions --- .github/CONTRIBUTING.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index efaddc7a24..594c45a1ee 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1 +1,13 @@ -See the [Developers Guide](https://scitools-iris.readthedocs.io/en/latest/index.html#development-index) \ No newline at end of file +# Contributing to Iris + +Want to contribute to Iris? But don't know where to start 🤔 + +We recommend that you first checkout our advice to [First Time Contributors](https://github.com/SciTools/iris/issues/4133), +which has some solid suggestions on where to begin. + +Otherwise, head over to our [Developers Guide on Getting Involved](https://scitools-iris.readthedocs.io/en/stable/developers_guide/contributing_getting_involved.html) +for all the information you need to start on your Iris development journey. + +Still need help or advice? + +Then join us over on our [Iris GitHub Discussions](https://github.com/SciTools/iris/discussions). We'd love to hear from you! \ No newline at end of file From 83cc5804f1fd74910a95536dae7dd6f488ca2407 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Jun 2021 17:22:44 +0100 Subject: [PATCH 10/12] Update CI environment lockfiles (#4137) * Updated environment lockfiles * Fix add_weekday. (#4169) Co-authored-by: Lockfile bot Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com> --- lib/iris/coord_categorisation.py | 10 +- requirements/ci/nox.lock/py37-linux-64.lock | 109 ++++++++++---------- requirements/ci/nox.lock/py38-linux-64.lock | 108 +++++++++---------- 3 files changed, 113 insertions(+), 114 deletions(-) diff --git a/lib/iris/coord_categorisation.py b/lib/iris/coord_categorisation.py index d299cbeaa4..72019b4b87 100644 --- a/lib/iris/coord_categorisation.py +++ b/lib/iris/coord_categorisation.py @@ -93,7 +93,7 @@ def vectorised_fn(*args): # Private "helper" function def _pt_date(coord, time): """ - Return the date of a time-coordinate point. + Return the datetime of a time-coordinate point. Args: @@ -103,14 +103,12 @@ def _pt_date(coord, time): value of a coordinate point Returns: - datetime.date + cftime.datetime + """ # NOTE: All of the currently defined categorisation functions are # calendar operations on Time coordinates. - # - All these currently depend on Unit::num2date, which is deprecated (!!) - # - We will want to do better, when we sort out our own Calendars. - # - For now, just make sure these all call through this one function. - return coord.units.num2date(time) + return coord.units.num2date(time, only_use_cftime_datetimes=True) # -------------------------------------------- diff --git a/requirements/ci/nox.lock/py37-linux-64.lock b/requirements/ci/nox.lock/py37-linux-64.lock index 937bb7a4a9..44d7ac115a 100644 --- a/requirements/ci/nox.lock/py37-linux-64.lock +++ b/requirements/ci/nox.lock/py37-linux-64.lock @@ -1,11 +1,11 @@ # platform: linux-64 -# env_hash: 9f683f7bd19228d6857db32d4372da95f0a29742d9ca4fa18f342162bbd8a667 +# env_hash: 36ee7ff93516ce69f384be9525d2aaa0c53322e2deadb0753085af1699d5a4f1 @EXPLICIT https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81 -https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2020.12.5-ha878542_0.tar.bz2#7eb5d4ffeee663caa1635cd67071bc1b +https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2021.5.30-ha878542_0.tar.bz2#6a777890e94194dc94a29a76d2a7e721 https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45 -https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-2.001-hab24e00_0.tar.bz2#1fcc67d5eed875734d8b3eec00b29ce4 -https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.030-hab24e00_0.tar.bz2#dfc1ee25079fd9314698d73ef38b557f +https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed37_0.tar.bz2#34893075a5c9e55cdafac56607368fc6 +https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77eed37_0.tar.bz2#4d59c254e01d9cde7957100457e2d5fb https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5 https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.35.1-hea4e1c9_2.tar.bz2#83610dba766a186bdc7a116053b782a4 https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-9.3.0-hff62375_19.tar.bz2#c2d8da3cb171e4aa642d20c6e4e42a04 @@ -21,7 +21,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-9.3.0-h2828fa1_19.tar. https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.3-h516909a_0.tar.bz2#1378b88874f42ac31b2f8e4f6975cb7b https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54 https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.17.1-h7f98852_1.tar.bz2#ed1dc233ed5e3eaa9bfbaac64d130c5e -https://conda.anaconda.org/conda-forge/linux-64/expat-2.3.0-h9c3ff4c_0.tar.bz2#1fb8f0254eb78a2a0c120155e1b1a207 +https://conda.anaconda.org/conda-forge/linux-64/expat-2.4.1-h9c3ff4c_0.tar.bz2#16054ef3cb3ec5d8d29d08772662f65d https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h36c2ea0_0.tar.bz2#ac7bc6a654f8f41b352b38f4051135f8 https://conda.anaconda.org/conda-forge/linux-64/geos-3.9.1-h9c3ff4c_2.tar.bz2#b9a6d9422aed3ad84ec6ccee9bfcaa0f https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h36c2ea0_2.tar.bz2#626e68ae9cc5912d6adb79d318cf962d @@ -33,13 +33,13 @@ https://conda.anaconda.org/conda-forge/linux-64/libffi-3.3-h58526e2_2.tar.bz2#66 https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.16-h516909a_0.tar.bz2#5c0f338a513a2943c659ae619fca9211 https://conda.anaconda.org/conda-forge/linux-64/libmo_unpack-3.1.2-hf484d3e_1001.tar.bz2#95f32a6a5a666d33886ca5627239f03d https://conda.anaconda.org/conda-forge/linux-64/libogg-1.3.4-h7f98852_1.tar.bz2#6e8cc2173440d77708196c5b93771680 -https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.15-pthreads_h8fe5266_0.tar.bz2#b4bdbbff92cacdd7b28b1b0a0366b24b +https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.15-pthreads_h8fe5266_1.tar.bz2#bb5527a16584426a897f22643d9a36a6 https://conda.anaconda.org/conda-forge/linux-64/libopus-1.3.1-h7f98852_1.tar.bz2#15345e56d527b330e1cacbdf58676e8f https://conda.anaconda.org/conda-forge/linux-64/libtool-2.4.6-h58526e2_1007.tar.bz2#7f6569a0c2f27acb8fc90600b382e544 https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.32.1-h7f98852_1000.tar.bz2#772d69f030955d9646d3d0eaf21d859d https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.2.0-h7f98852_2.tar.bz2#fb63a035a3b552c88a30d84b89ebf4c4 https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.3-h9c3ff4c_0.tar.bz2#4eb64ee0d5cd43096ffcf843c76b05d4 -https://conda.anaconda.org/conda-forge/linux-64/mpich-3.4.1-h846660c_104.tar.bz2#94f01e56905a7af1479c9f72b00e9864 +https://conda.anaconda.org/conda-forge/linux-64/mpich-3.4.2-h846660c_100.tar.bz2#0868d02349fc7e128d4bdc515b58dd7e https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.2-h58526e2_4.tar.bz2#509f2a21c4a09214cd737a480dfd80c9 https://conda.anaconda.org/conda-forge/linux-64/nspr-4.30-h9c3ff4c_0.tar.bz2#e6dc1f8f6e0bcebe8e3d8a5bca258dbe https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1k-h7f98852_0.tar.bz2#07fae2cb088379c8441e0f3ffa1f4025 @@ -58,7 +58,7 @@ https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.5-h516909a_1.tar.bz2#33f6 https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h516909a_0.tar.bz2#03a530e925414902547cf48da7756db8 https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.11-h516909a_1010.tar.bz2#339cc5584e6d26bc73a875ba900028c3 https://conda.anaconda.org/conda-forge/linux-64/gettext-0.19.8.1-h0b5b191_1005.tar.bz2#ff6f69b593a9e74c0e6b61908ac513fa -https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.13-h10796ff_1005.tar.bz2#941d62d7d94ab46cf824512a57cac991 +https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.15-h10796ff_3.tar.bz2#21a8d66dc17f065023b33145c42652fe https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-9_openblas.tar.bz2#5f08755e98b2a43ca68124e629a5a0cb https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1 https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-hcdb4288_3.tar.bz2#d8f51405997093ff1799ded7650439c4 @@ -68,7 +68,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.37-h21135ba_2.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.9.0-ha56f1ee_6.tar.bz2#f0dfb86444df325e599dbc3f4c0a3f5b https://conda.anaconda.org/conda-forge/linux-64/libvorbis-1.3.7-h9c3ff4c_0.tar.bz2#309dec04b70a3cc0f1e84a4013683bc0 https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1003.tar.bz2#a9371e9e40aded194dcba1447606c9a1 -https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.10-h72842e0_4.tar.bz2#48577b6e1605c935d7178f6694506ee9 +https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.12-h72842e0_0.tar.bz2#bd14fdf5b9ee5568056a40a6a2f41866 https://conda.anaconda.org/conda-forge/linux-64/libzip-1.7.3-h4de3113_0.tar.bz2#2568763f88009f95e9262cba837dbb82 https://conda.anaconda.org/conda-forge/linux-64/readline-8.1-h46c0cb4_0.tar.bz2#5788de3c8d7a7d64ac56c784c4ef48e6 https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.10-h21135ba_1.tar.bz2#c647f70aa7e3d4cc4e029cc1c9a99953 @@ -76,42 +76,41 @@ https://conda.anaconda.org/conda-forge/linux-64/udunits2-2.2.27.27-h975c496_1.ta https://conda.anaconda.org/conda-forge/linux-64/xorg-libsm-1.2.3-hd9c2040_1000.tar.bz2#9e856f78d5c80d5a78f61e72d1d473a3 https://conda.anaconda.org/conda-forge/linux-64/zstd-1.4.9-ha95c52a_0.tar.bz2#b481dc9fda3af2a681d08a4d5cd1ea0b https://conda.anaconda.org/conda-forge/linux-64/freetype-2.10.4-h0708190_1.tar.bz2#4a06f2ac2e5bfae7b6b245171c3f07aa -https://conda.anaconda.org/conda-forge/linux-64/krb5-1.17.2-h926e7f8_0.tar.bz2#926325c11478d6e781e76072c117763b +https://conda.anaconda.org/conda-forge/linux-64/krb5-1.19.1-hcc1bbae_0.tar.bz2#59b0695a515a6c54d45463dbf208ae38 https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-9_openblas.tar.bz2#edee85b4f83376ceae81e0975b8bffa2 -https://conda.anaconda.org/conda-forge/linux-64/libclang-11.1.0-default_ha53f305_0.tar.bz2#b7bc364d3ecf51443d48e14f87d784de -https://conda.anaconda.org/conda-forge/linux-64/libglib-2.68.1-h3e27bee_0.tar.bz2#486fecf2277a154e5f73f62328764310 +https://conda.anaconda.org/conda-forge/linux-64/libclang-11.1.0-default_ha53f305_1.tar.bz2#b9b71585ca4fcb5d442c5a9df5dd7e98 +https://conda.anaconda.org/conda-forge/linux-64/libglib-2.68.2-h3e27bee_2.tar.bz2#861d835c26ee65ae335e6b7e09073ddc https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-9_openblas.tar.bz2#572d84ab07962986f6dd8e4637a475ca -https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.2.0-hdc55705_1.tar.bz2#59b84553b303e0f4923289dd204dcd6b +https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.2.0-hbd63e13_2.tar.bz2#e3f034b29a122699b06da40c155f1a70 https://conda.anaconda.org/conda-forge/linux-64/libxkbcommon-1.0.3-he3ba5ed_0.tar.bz2#f9dbabc7e01c459ed7a1d1d64b206e9b https://conda.anaconda.org/conda-forge/linux-64/mysql-libs-8.0.23-h935591d_2.tar.bz2#b36368d163fca85e110529ddc4c67985 https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.35.5-h74cdb3f_0.tar.bz2#e876c82c21e7074d299e13762d02466c -https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.0-h7f98852_0.tar.bz2#0cd07abd75b2fad023161c657524ddbd +https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.1-h7f98852_0.tar.bz2#1759774cc5f1e965178c9cbab0b29a13 https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.36.0-h3371d22_4.tar.bz2#661e1ed5d92552785d9f8c781ce68685 https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.13.1-hba837de_1005.tar.bz2#fd3611672eb91bc9d24fd6fb970037eb https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.6-h04a7f16_0.tar.bz2#b24a1e18325a6e8f8b6b4a2ec5860ce2 -https://conda.anaconda.org/conda-forge/linux-64/glib-tools-2.68.1-h9c3ff4c_0.tar.bz2#b1ecd0fa079de56a1ba8d03063ee39bb +https://conda.anaconda.org/conda-forge/linux-64/glib-tools-2.68.2-h9c3ff4c_2.tar.bz2#0b1064ae2c9c448e19cdfc8561eda849 https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.18.4-h76c114f_2.tar.bz2#5db765d4974fa89f64c1544eb2a552cb https://conda.anaconda.org/conda-forge/linux-64/gts-0.7.6-h64030ff_2.tar.bz2#112eb9b5b93f0c02e59aea4fd1967363 https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.12-hddcbb42_0.tar.bz2#797117394a4aa588de6d741b06fad80f -https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.76.1-hc4aaa36_1.tar.bz2#349a288d04af695b639e5f947df3c2d0 -https://conda.anaconda.org/conda-forge/linux-64/libpq-13.2-hfd2b0eb_2.tar.bz2#66cc9cbd324d484c01ea08d98761aeb1 +https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.77.0-h2574ce0_0.tar.bz2#05cf8dca8408b5f1ffcc5e2d5a7c5da2 +https://conda.anaconda.org/conda-forge/linux-64/libpq-13.3-hd57d9b9_0.tar.bz2#66ef2cacc483205b7d303f7b02601c3b https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.0-h3452ae3_0.tar.bz2#8f4e19a8988c38feec7db41bcd0bf0d0 -https://conda.anaconda.org/conda-forge/linux-64/nss-3.64-hb5efdd6_0.tar.bz2#cb598141b73b9f7ebbffbd41220dcb9a +https://conda.anaconda.org/conda-forge/linux-64/nss-3.65-hb5efdd6_0.tar.bz2#645afd59bb8a540be3545850f586e028 https://conda.anaconda.org/conda-forge/linux-64/python-3.7.10-hffdb5ce_100_cpython.tar.bz2#7425fffa658971915f595e9110163c3c https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h7f98852_1.tar.bz2#536cc5db4d0a3ba0630541aec064b5e4 https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h7f98852_1003.tar.bz2#f59c1242cc1dd93e72c2ee2b360979eb https://conda.anaconda.org/conda-forge/noarch/alabaster-0.7.12-py_0.tar.bz2#2489a97287f90176ecdc3ca982b4b0a0 https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-h6cf1ce9_1008.tar.bz2#a43fb47d15e116f8be4be7e6b17ab59f -https://conda.anaconda.org/conda-forge/noarch/click-7.1.2-pyh9f0ad1d_0.tar.bz2#bd50a970ce07e660c319fdc4d730d3f1 https://conda.anaconda.org/conda-forge/noarch/cloudpickle-1.6.0-py_0.tar.bz2#76d764d8881719e305f6fa368dc2b65e https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.4-pyh9f0ad1d_0.tar.bz2#c08b4c1326b880ed44f3ffb04803332f -https://conda.anaconda.org/conda-forge/linux-64/curl-7.76.1-h979ede3_1.tar.bz2#28e9133d2ad9ba3081e52548ea20c870 +https://conda.anaconda.org/conda-forge/linux-64/curl-7.77.0-hea6ffbf_0.tar.bz2#7d1168349d6fba67ae1fdf61970b83e1 https://conda.anaconda.org/conda-forge/noarch/dataclasses-0.8-pyhc8e2a94_1.tar.bz2#28e0de0ecba81334619a777fdc00febc -https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.1-pyh9f0ad1d_0.tar.bz2#db990401a267e2b15854af5f3f84f763 +https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.2-pyhd8ed1ab_0.tar.bz2#ae8b866c376568b0342ae2c9b68f1e65 https://conda.anaconda.org/conda-forge/noarch/filelock-3.0.12-pyh9f0ad1d_0.tar.bz2#7544ed05bbbe9bb687bc9bcbe4d6cb46 -https://conda.anaconda.org/conda-forge/noarch/fsspec-2021.4.0-pyhd8ed1ab_0.tar.bz2#7019316dafd6ef2e0a2fc178486993cd -https://conda.anaconda.org/conda-forge/linux-64/glib-2.68.1-h9c3ff4c_0.tar.bz2#9fb05e9b0df734f92df7810c7c8975e3 +https://conda.anaconda.org/conda-forge/noarch/fsspec-2021.5.0-pyhd8ed1ab_0.tar.bz2#da823f51ebb876dafbed1c892fd80956 +https://conda.anaconda.org/conda-forge/linux-64/glib-2.68.2-h9c3ff4c_2.tar.bz2#0d68bad18ff4ce5231a7e535d3731277 https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.18.4-hf529b03_2.tar.bz2#526fadaa13ec264cb919436953bc2766 https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.10.6-mpi_mpich_h996c276_1014.tar.bz2#6af2e2e4dfb0ef36c35042cd69a1599d https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95 @@ -135,13 +134,13 @@ https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.7-1_cp37m.tar.bz2#6 https://conda.anaconda.org/conda-forge/noarch/pytz-2021.1-pyhd8ed1ab_0.tar.bz2#3af2e9424d5eb0063824a3f9b850d411 https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2 https://conda.anaconda.org/conda-forge/noarch/snowballstemmer-2.1.0-pyhd8ed1ab_0.tar.bz2#f1d64c0cf0eedf655a96ccdc1573c05a -https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.3.0-pyhd8ed1ab_0.tar.bz2#2f5b87cd0bdf1822b62e40909f471db4 +https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-applehelp-1.0.2-py_0.tar.bz2#20b2eaeaeea4ef9a9a0d99770620fd09 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-devhelp-1.0.2-py_0.tar.bz2#68e01cac9d38d0e717cd5c87bc3d2cc9 -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-htmlhelp-1.0.3-py_0.tar.bz2#4508a40465ebf0105e52f7194f299411 +https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-htmlhelp-2.0.0-pyhd8ed1ab_0.tar.bz2#77dad82eb9c8c1525ff7953e0756d708 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-jsmath-1.0.1-py_0.tar.bz2#67cd9d9c0382d37479b4d306c369a2d4 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-qthelp-1.0.3-py_0.tar.bz2#d01180388e6d1838c3e1ad029590aa7a -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.4-py_0.tar.bz2#8ea6a8036e28dba8827d35c764709358 +https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.5-pyhd8ed1ab_0.tar.bz2#60e630285f44af05767dcb7f473ee03f https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76 https://conda.anaconda.org/conda-forge/noarch/toml-0.10.2-pyhd8ed1ab_0.tar.bz2#f832c45a477c78bebd107098db465095 https://conda.anaconda.org/conda-forge/noarch/toolz-0.11.1-py_0.tar.bz2#d1e66b58cb00b3817ad9f05eec098c00 @@ -150,23 +149,24 @@ https://conda.anaconda.org/conda-forge/noarch/wheel-0.36.2-pyhd3deb0d_0.tar.bz2# https://conda.anaconda.org/conda-forge/noarch/zipp-3.4.1-pyhd8ed1ab_0.tar.bz2#a4fa30eb74a326092b3d8078b1f1aae1 https://conda.anaconda.org/conda-forge/linux-64/antlr-python-runtime-4.7.2-py37h89c1867_1002.tar.bz2#cf3aeeb80dbd517761019a8edcd5b108 https://conda.anaconda.org/conda-forge/noarch/babel-2.9.1-pyh44b312d_0.tar.bz2#74136ed39bfea0832d338df1e58d013e -https://conda.anaconda.org/conda-forge/linux-64/certifi-2020.12.5-py37h89c1867_1.tar.bz2#fb121f213009359498ada17a9e6d775f +https://conda.anaconda.org/conda-forge/linux-64/certifi-2021.5.30-py37h89c1867_0.tar.bz2#105f18ae8597a5f4d4e3188bcb06c796 https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.5-py37hc58025e_0.tar.bz2#e05f1fad0c52c21b6b92778d31f89cd0 -https://conda.anaconda.org/conda-forge/noarch/cfgv-3.2.0-py_0.tar.bz2#4972efcb3e2cbd3954b24a17266be25c +https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.0-pyhd8ed1ab_0.tar.bz2#a739adbf102868f675bf70601e0af7ea https://conda.anaconda.org/conda-forge/linux-64/chardet-4.0.0-py37h89c1867_1.tar.bz2#f4fbd4721b80f0d6b53b3a3374914068 https://conda.anaconda.org/conda-forge/noarch/cycler-0.10.0-py_2.tar.bz2#f6d7c7e6d8f42cbbec7e07a8d879f91c +https://conda.anaconda.org/conda-forge/linux-64/cython-0.29.23-py37hcd2ae1e_0.tar.bz2#1298b2e01d979e35e1e7a2840cf819e5 https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.11.0-py37h5e8e339_3.tar.bz2#2e89a6f3baf5eeb13763f61ea3d0601f https://conda.anaconda.org/conda-forge/linux-64/dbus-1.13.6-h48d8840_2.tar.bz2#eba672c69baf366fdedd1c6f702dbb81 https://conda.anaconda.org/conda-forge/linux-64/docutils-0.16-py37h89c1867_3.tar.bz2#3da23bcf1d502670cec18fd3a04f409b https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-2.8.1-h83ec7ef_0.tar.bz2#654935b08e8bd4a8cbf6a4253e290c04 -https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-4.0.1-py37h89c1867_0.tar.bz2#fdb45d5b60c896c95d25213e9e257d09 +https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-4.4.0-py37h89c1867_0.tar.bz2#f4c1cdfa39566fbe5ee58c831107d8da https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.3.1-py37h2527ec5_1.tar.bz2#61149814e0ea71cb5b44881c65d25f7b -https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.8.0-mpi_mpich_hf07302c_1.tar.bz2#2df6da2c9d66945c9399ce6e94d1748e -https://conda.anaconda.org/conda-forge/linux-64/markupsafe-1.1.1-py37h5e8e339_3.tar.bz2#b874d44750373553008083116442c972 +https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.8.0-mpi_mpich_hf07302c_2.tar.bz2#d76a3f327eb8e26b5ce6b042ac1abeb3 +https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.0.1-py37h5e8e339_0.tar.bz2#90ad307f6997784664de956e09ec689e https://conda.anaconda.org/conda-forge/linux-64/mpi4py-3.0.3-py37h1e5cb63_7.tar.bz2#1c0450be22dc0fbffaabab1f415705d5 https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.2-py37h2527ec5_1.tar.bz2#07952b04eee02d873daa311a35b27454 https://conda.anaconda.org/conda-forge/linux-64/mypy_extensions-0.4.3-py37h89c1867_3.tar.bz2#b604f0897a7a207bddd7d05bf3284752 -https://conda.anaconda.org/conda-forge/linux-64/numpy-1.20.2-py37h038b26d_0.tar.bz2#795bd784e989b08ceb1ce8be539dc0b2 +https://conda.anaconda.org/conda-forge/linux-64/numpy-1.20.3-py37h038b26d_1.tar.bz2#4644df846d272b6316503418db23b5dd https://conda.anaconda.org/conda-forge/noarch/packaging-20.9-pyh44b312d_0.tar.bz2#be69a38e912054a62dc82cc3c7711a64 https://conda.anaconda.org/conda-forge/noarch/partd-1.2.0-pyhd8ed1ab_0.tar.bz2#0c32f563d7f22e3a34c95cad8cc95651 https://conda.anaconda.org/conda-forge/linux-64/pillow-6.2.2-py37h718be6c_0.tar.bz2#ecac4e308b87ff93d44ea5e56ab39084 @@ -181,56 +181,57 @@ https://conda.anaconda.org/conda-forge/linux-64/regex-2021.4.4-py37h5e8e339_0.ta https://conda.anaconda.org/conda-forge/linux-64/tornado-6.1-py37h5e8e339_1.tar.bz2#92449128c4639feae48d731ef2186099 https://conda.anaconda.org/conda-forge/linux-64/typed-ast-1.4.3-py37h5e8e339_0.tar.bz2#0e8dc105f8cf0a2a6456f7a18f34a712 https://conda.anaconda.org/conda-forge/noarch/zict-2.0.0-py_0.tar.bz2#4750152be22f24d695b3004c5e1712d3 -https://conda.anaconda.org/conda-forge/noarch/black-20.8b1-py_1.tar.bz2#e555d6b71ec916c3dc4e6e3793cc9796 https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py37h5e8e339_1001.tar.bz2#871eed4ba322e7b3f200956a096b34e7 https://conda.anaconda.org/conda-forge/linux-64/cftime-1.2.1-py37h161383b_1.tar.bz2#314ca8b00ed742f8c46a6cc68d84d90f +https://conda.anaconda.org/conda-forge/linux-64/click-8.0.1-py37h89c1867_0.tar.bz2#bb1ad97b5d8626f662b753f620c3c913 https://conda.anaconda.org/conda-forge/linux-64/cryptography-3.4.7-py37h5d9358c_0.tar.bz2#d811fb6a96ae0cf8c0a17457a8e67ff4 -https://conda.anaconda.org/conda-forge/noarch/dask-core-2021.4.1-pyhd8ed1ab_0.tar.bz2#7b4563cc5528acd2a1b2675a2b69dd19 +https://conda.anaconda.org/conda-forge/noarch/dask-core-2021.5.1-pyhd8ed1ab_0.tar.bz2#bf8923574861d55110396b169f4978f7 https://conda.anaconda.org/conda-forge/linux-64/editdistance-s-1.0.0-py37h2527ec5_1.tar.bz2#100918f43247cedad74f2cf8dcbda5bc -https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-4.0.1-hd8ed1ab_0.tar.bz2#50c48f1394fba9705a76163409924628 +https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-4.4.0-hd8ed1ab_0.tar.bz2#cc623f404f4ea1e031890cca57e8f83c +https://conda.anaconda.org/conda-forge/noarch/jinja2-3.0.1-pyhd8ed1ab_0.tar.bz2#c647e77921fd3e245cdcc5b2d451a0f8 https://conda.anaconda.org/conda-forge/linux-64/mo_pack-0.2.0-py37h902c9e0_1005.tar.bz2#40db532422636dd1e980154114486a00 https://conda.anaconda.org/conda-forge/linux-64/netcdf-fortran-4.5.3-mpi_mpich_h196b126_4.tar.bz2#e058f42a78ea8c965cf7335e28143c59 https://conda.anaconda.org/conda-forge/linux-64/pandas-1.2.4-py37h219a48f_0.tar.bz2#fb33763b90acf1a4a7cffb7ab994a3cd -https://conda.anaconda.org/conda-forge/linux-64/pango-1.42.4-h69149e4_5.tar.bz2#9e325ab71e743c57955e73172d1db615 -https://conda.anaconda.org/conda-forge/linux-64/python-stratify-0.1.1-py37h902c9e0_1003.tar.bz2#2bf38b6c7984839b174273cadbf90ea6 +https://conda.anaconda.org/conda-forge/linux-64/pango-1.48.5-hb8ff022_0.tar.bz2#f4e263c4dfa15b6a97349782793d1ee7 +https://conda.anaconda.org/conda-forge/linux-64/python-stratify-0.1.1-py37h6f94858_1004.tar.bz2#42b37830a63405589fef3d13db505e7d https://conda.anaconda.org/conda-forge/linux-64/pywavelets-1.1.1-py37h902c9e0_3.tar.bz2#104648a5a091a493046a62704eef5c49 https://conda.anaconda.org/conda-forge/linux-64/qt-5.12.9-hda022c4_4.tar.bz2#afebab1f5049d66baaaec67d9ce893f0 https://conda.anaconda.org/conda-forge/linux-64/scipy-1.6.3-py37h29e03ee_0.tar.bz2#a469d02f72b9cef07f4408d419b17dcc https://conda.anaconda.org/conda-forge/linux-64/setuptools-49.6.0-py37h89c1867_3.tar.bz2#928c178bf6805b8ab71fabaa620e0234 -https://conda.anaconda.org/conda-forge/linux-64/shapely-1.7.1-py37hf7ed6d2_4.tar.bz2#0209359199915534c567ffc7fafdb6c4 +https://conda.anaconda.org/conda-forge/linux-64/shapely-1.7.1-py37h2d1e849_4.tar.bz2#98c91519669fac0bd793b0aea90468ba https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-napoleon-0.7-py_0.tar.bz2#0bc25ff6f2e34af63ded59692df5f749 -https://conda.anaconda.org/conda-forge/linux-64/virtualenv-20.4.6-py37h89c1867_0.tar.bz2#e66974ad67ebbb86a5fcbb9551641be1 +https://conda.anaconda.org/conda-forge/linux-64/virtualenv-20.4.7-py37h89c1867_0.tar.bz2#50087f16f1a71581a0327956c80debc2 https://conda.anaconda.org/conda-forge/linux-64/asv-0.4.2-py37hcd2ae1e_2.tar.bz2#a539a23d322e3976dda4af86e59b31ce -https://conda.anaconda.org/conda-forge/linux-64/cf-units-2.1.4-py37h161383b_2.tar.bz2#82111543d88ad46dcc3a6d52758c86d0 -https://conda.anaconda.org/conda-forge/linux-64/distributed-2021.4.1-py37h89c1867_0.tar.bz2#f3b6914e75ebce0346e80e6e6d8cd32e +https://conda.anaconda.org/conda-forge/noarch/black-21.5b2-pyhd8ed1ab_0.tar.bz2#919be0b3435cbe8e803c6bd738231f69 +https://conda.anaconda.org/conda-forge/linux-64/bokeh-2.1.1-py37hc8dfbb8_0.tar.bz2#0927f1a093279ba797f014c5e484a58f +https://conda.anaconda.org/conda-forge/linux-64/cf-units-2.1.5-py37h6f94858_0.tar.bz2#5ad0ed053fc1c3bf156cf181cdded003 +https://conda.anaconda.org/conda-forge/linux-64/distributed-2021.5.1-py37h89c1867_0.tar.bz2#73b9cbad0494883ae5bedbf88f479aad https://conda.anaconda.org/conda-forge/linux-64/esmf-8.1.1-mpi_mpich_h3dcaa78_100.tar.bz2#5b4bab1017226f2c03ba0fe02b783316 -https://conda.anaconda.org/conda-forge/noarch/flake8-3.9.1-pyhd8ed1ab_0.tar.bz2#9ce1de40e3510b60d15d512251a3d3f7 -https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-hab0c2f8_0.tar.bz2#8acbef87761a4b90f090168737822611 -https://conda.anaconda.org/conda-forge/noarch/identify-2.2.4-pyhd8ed1ab_0.tar.bz2#86a6446475a53451a71e1515150cb532 +https://conda.anaconda.org/conda-forge/noarch/flake8-3.9.2-pyhd8ed1ab_0.tar.bz2#37d685abea0a25c921431edda02ad143 +https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-h539f30e_1.tar.bz2#606777b4da3664d5c9415f5f165349fd +https://conda.anaconda.org/conda-forge/noarch/identify-2.2.7-pyhd8ed1ab_0.tar.bz2#fc74063be2bef2c21f70edd41620af83 https://conda.anaconda.org/conda-forge/noarch/imagehash-4.2.0-pyhd8ed1ab_0.tar.bz2#e5a77472ae964f2835fce16355bbfe64 -https://conda.anaconda.org/conda-forge/noarch/jinja2-2.11.3-pyh44b312d_0.tar.bz2#1d4c3605d85a3655b1595e0694138eb6 -https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.50.3-hfa39831_1.tar.bz2#7578526979e852a1f8650080214c6cd6 -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.4.1-py37hdd32ed1_0.tar.bz2#be3d06cde526691de555ad6b37e2799c +https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.50.5-hc3c00ef_0.tar.bz2#1362366116e80bcfbe9c7cd99766ea40 +https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.4.2-py37hdd32ed1_0.tar.bz2#ee755b80aae171058a46c5d7badd08ff https://conda.anaconda.org/conda-forge/linux-64/netcdf4-1.5.6-nompi_py37h946d57d_103.tar.bz2#600a3ba1f0b13ca31d4f593f1fa490b4 https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.6.0-pyhd8ed1ab_0.tar.bz2#0941325bf48969e2b3b19d0951740950 -https://conda.anaconda.org/conda-forge/noarch/pip-21.1.1-pyhd8ed1ab_0.tar.bz2#e0bad1330c3575222d221e7679a36a0a +https://conda.anaconda.org/conda-forge/noarch/pip-21.1.2-pyhd8ed1ab_0.tar.bz2#dbd830edaffe5fc9ae6c1d425db2b5f2 https://conda.anaconda.org/conda-forge/noarch/pygments-2.9.0-pyhd8ed1ab_0.tar.bz2#a2d9bba43c9b80a42b0ccb9afd7223c2 https://conda.anaconda.org/conda-forge/noarch/pyopenssl-20.0.1-pyhd8ed1ab_0.tar.bz2#92371c25994d0f5d28a01c1fb75ebf86 https://conda.anaconda.org/conda-forge/linux-64/pyqt-impl-5.12.3-py37he336c9b_7.tar.bz2#303251d6f2b9e60a0cd79480cf8507d2 -https://conda.anaconda.org/conda-forge/linux-64/bokeh-2.1.1-py37hc8dfbb8_0.tar.bz2#0927f1a093279ba797f014c5e484a58f https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.19.0.post1-py37h0c48da3_0.tar.bz2#44add1e9550c8caf69ce64561ce73035 +https://conda.anaconda.org/conda-forge/noarch/dask-2021.5.1-pyhd8ed1ab_0.tar.bz2#6d88d5c849ba285e856125d6e4b79b6d https://conda.anaconda.org/conda-forge/linux-64/esmpy-8.1.1-mpi_mpich_py37hf719a8e_100.tar.bz2#d608536dd44b60da923950c60619583d -https://conda.anaconda.org/conda-forge/linux-64/graphviz-2.47.1-hebd9034_0.tar.bz2#9840ac6c4756d7f4b6035a62aae4d6fb +https://conda.anaconda.org/conda-forge/linux-64/graphviz-2.47.2-h85b4f2f_0.tar.bz2#d68568216287315890c4623397cf8633 https://conda.anaconda.org/conda-forge/noarch/nc-time-axis-1.2.0-py_1.tar.bz2#f3158a5d335f0f44f09cf05d3fb4107e -https://conda.anaconda.org/conda-forge/linux-64/pre-commit-2.12.1-py37h89c1867_0.tar.bz2#6655c6fc0713a2ec76aa925a8aaf1549 +https://conda.anaconda.org/conda-forge/linux-64/pre-commit-2.13.0-py37h89c1867_0.tar.bz2#a2ddf76626c4e7481f106fa08d5d77c5 https://conda.anaconda.org/conda-forge/linux-64/pyqtchart-5.12-py37he336c9b_7.tar.bz2#2b1959f3a87b5ad66690340ef921323c https://conda.anaconda.org/conda-forge/linux-64/pyqtwebengine-5.12.1-py37he336c9b_7.tar.bz2#15f5cbcafb4889bb41da2a0a0e338f2a https://conda.anaconda.org/conda-forge/noarch/pyugrid-0.3.1-py_2.tar.bz2#7d7361886fbcf2be663fd185bf6d244d -https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.4-pyhd8ed1ab_0.tar.bz2#d7b20b328e23d993994ea02077c009c0 -https://conda.anaconda.org/conda-forge/noarch/dask-2021.4.1-pyhd8ed1ab_0.tar.bz2#d954ba6326e7f5279444ea0f1c3dfd46 +https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.5-pyhd8ed1ab_0.tar.bz2#36f0ca66d6dd09423e5c2551148d45cd https://conda.anaconda.org/conda-forge/linux-64/pyqt-5.12.3-py37h89c1867_7.tar.bz2#1754ec587a9ac26e9507fea7eb6bebc2 https://conda.anaconda.org/conda-forge/noarch/requests-2.25.1-pyhd3deb0d_0.tar.bz2#ae687aba31a1c400192a86a2e993ffdc -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.4.1-py37h89c1867_0.tar.bz2#8e9cd6c7c6bc1f490c72a5064e010f10 +https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.4.2-py37h89c1867_0.tar.bz2#581de64cb6a7577b162e329efbcf1e4c https://conda.anaconda.org/conda-forge/noarch/sphinx-3.5.4-pyh44b312d_0.tar.bz2#0ebc444f001f73c4f6de01057b0be392 https://conda.anaconda.org/conda-forge/noarch/sphinx-copybutton-0.3.1-pyhd8ed1ab_0.tar.bz2#decad13214a2a545944560eccf4a9815 https://conda.anaconda.org/conda-forge/noarch/sphinx-gallery-0.9.0-pyhd8ed1ab_0.tar.bz2#5ef222a3e1b5904742e376e05046692b diff --git a/requirements/ci/nox.lock/py38-linux-64.lock b/requirements/ci/nox.lock/py38-linux-64.lock index 3aa337778f..91cf351497 100644 --- a/requirements/ci/nox.lock/py38-linux-64.lock +++ b/requirements/ci/nox.lock/py38-linux-64.lock @@ -1,11 +1,11 @@ # platform: linux-64 -# env_hash: 25d37d9c9841bf7d79d238578d4063a437222f0b5c8e90ee78623b3e38cf0b0b +# env_hash: 2785ad92fa19c56df4d0b4315d6fea121ca9b6092185d5ea016d9571ef85efca @EXPLICIT https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81 -https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2020.12.5-ha878542_0.tar.bz2#7eb5d4ffeee663caa1635cd67071bc1b +https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2021.5.30-ha878542_0.tar.bz2#6a777890e94194dc94a29a76d2a7e721 https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45 -https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-2.001-hab24e00_0.tar.bz2#1fcc67d5eed875734d8b3eec00b29ce4 -https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.030-hab24e00_0.tar.bz2#dfc1ee25079fd9314698d73ef38b557f +https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed37_0.tar.bz2#34893075a5c9e55cdafac56607368fc6 +https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77eed37_0.tar.bz2#4d59c254e01d9cde7957100457e2d5fb https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5 https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.35.1-hea4e1c9_2.tar.bz2#83610dba766a186bdc7a116053b782a4 https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-9.3.0-hff62375_19.tar.bz2#c2d8da3cb171e4aa642d20c6e4e42a04 @@ -21,7 +21,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-9.3.0-h2828fa1_19.tar. https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.3-h516909a_0.tar.bz2#1378b88874f42ac31b2f8e4f6975cb7b https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54 https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.17.1-h7f98852_1.tar.bz2#ed1dc233ed5e3eaa9bfbaac64d130c5e -https://conda.anaconda.org/conda-forge/linux-64/expat-2.3.0-h9c3ff4c_0.tar.bz2#1fb8f0254eb78a2a0c120155e1b1a207 +https://conda.anaconda.org/conda-forge/linux-64/expat-2.4.1-h9c3ff4c_0.tar.bz2#16054ef3cb3ec5d8d29d08772662f65d https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h36c2ea0_0.tar.bz2#ac7bc6a654f8f41b352b38f4051135f8 https://conda.anaconda.org/conda-forge/linux-64/geos-3.9.1-h9c3ff4c_2.tar.bz2#b9a6d9422aed3ad84ec6ccee9bfcaa0f https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h36c2ea0_2.tar.bz2#626e68ae9cc5912d6adb79d318cf962d @@ -33,13 +33,13 @@ https://conda.anaconda.org/conda-forge/linux-64/libffi-3.3-h58526e2_2.tar.bz2#66 https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.16-h516909a_0.tar.bz2#5c0f338a513a2943c659ae619fca9211 https://conda.anaconda.org/conda-forge/linux-64/libmo_unpack-3.1.2-hf484d3e_1001.tar.bz2#95f32a6a5a666d33886ca5627239f03d https://conda.anaconda.org/conda-forge/linux-64/libogg-1.3.4-h7f98852_1.tar.bz2#6e8cc2173440d77708196c5b93771680 -https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.15-pthreads_h8fe5266_0.tar.bz2#b4bdbbff92cacdd7b28b1b0a0366b24b +https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.15-pthreads_h8fe5266_1.tar.bz2#bb5527a16584426a897f22643d9a36a6 https://conda.anaconda.org/conda-forge/linux-64/libopus-1.3.1-h7f98852_1.tar.bz2#15345e56d527b330e1cacbdf58676e8f https://conda.anaconda.org/conda-forge/linux-64/libtool-2.4.6-h58526e2_1007.tar.bz2#7f6569a0c2f27acb8fc90600b382e544 https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.32.1-h7f98852_1000.tar.bz2#772d69f030955d9646d3d0eaf21d859d https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.2.0-h7f98852_2.tar.bz2#fb63a035a3b552c88a30d84b89ebf4c4 https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.3-h9c3ff4c_0.tar.bz2#4eb64ee0d5cd43096ffcf843c76b05d4 -https://conda.anaconda.org/conda-forge/linux-64/mpich-3.4.1-h846660c_104.tar.bz2#94f01e56905a7af1479c9f72b00e9864 +https://conda.anaconda.org/conda-forge/linux-64/mpich-3.4.2-h846660c_100.tar.bz2#0868d02349fc7e128d4bdc515b58dd7e https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.2-h58526e2_4.tar.bz2#509f2a21c4a09214cd737a480dfd80c9 https://conda.anaconda.org/conda-forge/linux-64/nspr-4.30-h9c3ff4c_0.tar.bz2#e6dc1f8f6e0bcebe8e3d8a5bca258dbe https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1k-h7f98852_0.tar.bz2#07fae2cb088379c8441e0f3ffa1f4025 @@ -58,7 +58,7 @@ https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.5-h516909a_1.tar.bz2#33f6 https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h516909a_0.tar.bz2#03a530e925414902547cf48da7756db8 https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.11-h516909a_1010.tar.bz2#339cc5584e6d26bc73a875ba900028c3 https://conda.anaconda.org/conda-forge/linux-64/gettext-0.19.8.1-h0b5b191_1005.tar.bz2#ff6f69b593a9e74c0e6b61908ac513fa -https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.13-h10796ff_1005.tar.bz2#941d62d7d94ab46cf824512a57cac991 +https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.15-h10796ff_3.tar.bz2#21a8d66dc17f065023b33145c42652fe https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-9_openblas.tar.bz2#5f08755e98b2a43ca68124e629a5a0cb https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1 https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-hcdb4288_3.tar.bz2#d8f51405997093ff1799ded7650439c4 @@ -68,7 +68,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.37-h21135ba_2.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.9.0-ha56f1ee_6.tar.bz2#f0dfb86444df325e599dbc3f4c0a3f5b https://conda.anaconda.org/conda-forge/linux-64/libvorbis-1.3.7-h9c3ff4c_0.tar.bz2#309dec04b70a3cc0f1e84a4013683bc0 https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1003.tar.bz2#a9371e9e40aded194dcba1447606c9a1 -https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.10-h72842e0_4.tar.bz2#48577b6e1605c935d7178f6694506ee9 +https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.12-h72842e0_0.tar.bz2#bd14fdf5b9ee5568056a40a6a2f41866 https://conda.anaconda.org/conda-forge/linux-64/libzip-1.7.3-h4de3113_0.tar.bz2#2568763f88009f95e9262cba837dbb82 https://conda.anaconda.org/conda-forge/linux-64/readline-8.1-h46c0cb4_0.tar.bz2#5788de3c8d7a7d64ac56c784c4ef48e6 https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.10-h21135ba_1.tar.bz2#c647f70aa7e3d4cc4e029cc1c9a99953 @@ -76,42 +76,41 @@ https://conda.anaconda.org/conda-forge/linux-64/udunits2-2.2.27.27-h975c496_1.ta https://conda.anaconda.org/conda-forge/linux-64/xorg-libsm-1.2.3-hd9c2040_1000.tar.bz2#9e856f78d5c80d5a78f61e72d1d473a3 https://conda.anaconda.org/conda-forge/linux-64/zstd-1.4.9-ha95c52a_0.tar.bz2#b481dc9fda3af2a681d08a4d5cd1ea0b https://conda.anaconda.org/conda-forge/linux-64/freetype-2.10.4-h0708190_1.tar.bz2#4a06f2ac2e5bfae7b6b245171c3f07aa -https://conda.anaconda.org/conda-forge/linux-64/krb5-1.17.2-h926e7f8_0.tar.bz2#926325c11478d6e781e76072c117763b +https://conda.anaconda.org/conda-forge/linux-64/krb5-1.19.1-hcc1bbae_0.tar.bz2#59b0695a515a6c54d45463dbf208ae38 https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-9_openblas.tar.bz2#edee85b4f83376ceae81e0975b8bffa2 -https://conda.anaconda.org/conda-forge/linux-64/libclang-11.1.0-default_ha53f305_0.tar.bz2#b7bc364d3ecf51443d48e14f87d784de -https://conda.anaconda.org/conda-forge/linux-64/libglib-2.68.1-h3e27bee_0.tar.bz2#486fecf2277a154e5f73f62328764310 +https://conda.anaconda.org/conda-forge/linux-64/libclang-11.1.0-default_ha53f305_1.tar.bz2#b9b71585ca4fcb5d442c5a9df5dd7e98 +https://conda.anaconda.org/conda-forge/linux-64/libglib-2.68.2-h3e27bee_2.tar.bz2#861d835c26ee65ae335e6b7e09073ddc https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-9_openblas.tar.bz2#572d84ab07962986f6dd8e4637a475ca -https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.2.0-hdc55705_1.tar.bz2#59b84553b303e0f4923289dd204dcd6b +https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.2.0-hbd63e13_2.tar.bz2#e3f034b29a122699b06da40c155f1a70 https://conda.anaconda.org/conda-forge/linux-64/libxkbcommon-1.0.3-he3ba5ed_0.tar.bz2#f9dbabc7e01c459ed7a1d1d64b206e9b https://conda.anaconda.org/conda-forge/linux-64/mysql-libs-8.0.23-h935591d_2.tar.bz2#b36368d163fca85e110529ddc4c67985 https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.35.5-h74cdb3f_0.tar.bz2#e876c82c21e7074d299e13762d02466c -https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.0-h7f98852_0.tar.bz2#0cd07abd75b2fad023161c657524ddbd +https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.1-h7f98852_0.tar.bz2#1759774cc5f1e965178c9cbab0b29a13 https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.36.0-h3371d22_4.tar.bz2#661e1ed5d92552785d9f8c781ce68685 https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.13.1-hba837de_1005.tar.bz2#fd3611672eb91bc9d24fd6fb970037eb https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.6-h04a7f16_0.tar.bz2#b24a1e18325a6e8f8b6b4a2ec5860ce2 -https://conda.anaconda.org/conda-forge/linux-64/glib-tools-2.68.1-h9c3ff4c_0.tar.bz2#b1ecd0fa079de56a1ba8d03063ee39bb +https://conda.anaconda.org/conda-forge/linux-64/glib-tools-2.68.2-h9c3ff4c_2.tar.bz2#0b1064ae2c9c448e19cdfc8561eda849 https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.18.4-h76c114f_2.tar.bz2#5db765d4974fa89f64c1544eb2a552cb https://conda.anaconda.org/conda-forge/linux-64/gts-0.7.6-h64030ff_2.tar.bz2#112eb9b5b93f0c02e59aea4fd1967363 https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.12-hddcbb42_0.tar.bz2#797117394a4aa588de6d741b06fad80f -https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.76.1-hc4aaa36_1.tar.bz2#349a288d04af695b639e5f947df3c2d0 -https://conda.anaconda.org/conda-forge/linux-64/libpq-13.2-hfd2b0eb_2.tar.bz2#66cc9cbd324d484c01ea08d98761aeb1 +https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.77.0-h2574ce0_0.tar.bz2#05cf8dca8408b5f1ffcc5e2d5a7c5da2 +https://conda.anaconda.org/conda-forge/linux-64/libpq-13.3-hd57d9b9_0.tar.bz2#66ef2cacc483205b7d303f7b02601c3b https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.0-h3452ae3_0.tar.bz2#8f4e19a8988c38feec7db41bcd0bf0d0 -https://conda.anaconda.org/conda-forge/linux-64/nss-3.64-hb5efdd6_0.tar.bz2#cb598141b73b9f7ebbffbd41220dcb9a -https://conda.anaconda.org/conda-forge/linux-64/python-3.8.8-hffdb5ce_0_cpython.tar.bz2#da5f00968a732f5da324fff565909a05 +https://conda.anaconda.org/conda-forge/linux-64/nss-3.65-hb5efdd6_0.tar.bz2#645afd59bb8a540be3545850f586e028 +https://conda.anaconda.org/conda-forge/linux-64/python-3.8.10-h49503c6_1_cpython.tar.bz2#69f7d6ef1f00c3a109b1b06279e6d6a9 https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h7f98852_1.tar.bz2#536cc5db4d0a3ba0630541aec064b5e4 https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h7f98852_1003.tar.bz2#f59c1242cc1dd93e72c2ee2b360979eb https://conda.anaconda.org/conda-forge/noarch/alabaster-0.7.12-py_0.tar.bz2#2489a97287f90176ecdc3ca982b4b0a0 https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-h6cf1ce9_1008.tar.bz2#a43fb47d15e116f8be4be7e6b17ab59f -https://conda.anaconda.org/conda-forge/noarch/click-7.1.2-pyh9f0ad1d_0.tar.bz2#bd50a970ce07e660c319fdc4d730d3f1 https://conda.anaconda.org/conda-forge/noarch/cloudpickle-1.6.0-py_0.tar.bz2#76d764d8881719e305f6fa368dc2b65e https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.4-pyh9f0ad1d_0.tar.bz2#c08b4c1326b880ed44f3ffb04803332f -https://conda.anaconda.org/conda-forge/linux-64/curl-7.76.1-h979ede3_1.tar.bz2#28e9133d2ad9ba3081e52548ea20c870 +https://conda.anaconda.org/conda-forge/linux-64/curl-7.77.0-hea6ffbf_0.tar.bz2#7d1168349d6fba67ae1fdf61970b83e1 https://conda.anaconda.org/conda-forge/noarch/dataclasses-0.8-pyhc8e2a94_1.tar.bz2#28e0de0ecba81334619a777fdc00febc -https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.1-pyh9f0ad1d_0.tar.bz2#db990401a267e2b15854af5f3f84f763 +https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.2-pyhd8ed1ab_0.tar.bz2#ae8b866c376568b0342ae2c9b68f1e65 https://conda.anaconda.org/conda-forge/noarch/filelock-3.0.12-pyh9f0ad1d_0.tar.bz2#7544ed05bbbe9bb687bc9bcbe4d6cb46 -https://conda.anaconda.org/conda-forge/noarch/fsspec-2021.4.0-pyhd8ed1ab_0.tar.bz2#7019316dafd6ef2e0a2fc178486993cd -https://conda.anaconda.org/conda-forge/linux-64/glib-2.68.1-h9c3ff4c_0.tar.bz2#9fb05e9b0df734f92df7810c7c8975e3 +https://conda.anaconda.org/conda-forge/noarch/fsspec-2021.5.0-pyhd8ed1ab_0.tar.bz2#da823f51ebb876dafbed1c892fd80956 +https://conda.anaconda.org/conda-forge/linux-64/glib-2.68.2-h9c3ff4c_2.tar.bz2#0d68bad18ff4ce5231a7e535d3731277 https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.18.4-hf529b03_2.tar.bz2#526fadaa13ec264cb919436953bc2766 https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.10.6-mpi_mpich_h996c276_1014.tar.bz2#6af2e2e4dfb0ef36c35042cd69a1599d https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95 @@ -135,13 +134,13 @@ https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.8-1_cp38.tar.bz2#8d https://conda.anaconda.org/conda-forge/noarch/pytz-2021.1-pyhd8ed1ab_0.tar.bz2#3af2e9424d5eb0063824a3f9b850d411 https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2 https://conda.anaconda.org/conda-forge/noarch/snowballstemmer-2.1.0-pyhd8ed1ab_0.tar.bz2#f1d64c0cf0eedf655a96ccdc1573c05a -https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.3.0-pyhd8ed1ab_0.tar.bz2#2f5b87cd0bdf1822b62e40909f471db4 +https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-applehelp-1.0.2-py_0.tar.bz2#20b2eaeaeea4ef9a9a0d99770620fd09 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-devhelp-1.0.2-py_0.tar.bz2#68e01cac9d38d0e717cd5c87bc3d2cc9 -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-htmlhelp-1.0.3-py_0.tar.bz2#4508a40465ebf0105e52f7194f299411 +https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-htmlhelp-2.0.0-pyhd8ed1ab_0.tar.bz2#77dad82eb9c8c1525ff7953e0756d708 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-jsmath-1.0.1-py_0.tar.bz2#67cd9d9c0382d37479b4d306c369a2d4 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-qthelp-1.0.3-py_0.tar.bz2#d01180388e6d1838c3e1ad029590aa7a -https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.4-py_0.tar.bz2#8ea6a8036e28dba8827d35c764709358 +https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.5-pyhd8ed1ab_0.tar.bz2#60e630285f44af05767dcb7f473ee03f https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76 https://conda.anaconda.org/conda-forge/noarch/toml-0.10.2-pyhd8ed1ab_0.tar.bz2#f832c45a477c78bebd107098db465095 https://conda.anaconda.org/conda-forge/noarch/toolz-0.11.1-py_0.tar.bz2#d1e66b58cb00b3817ad9f05eec098c00 @@ -150,23 +149,24 @@ https://conda.anaconda.org/conda-forge/noarch/wheel-0.36.2-pyhd3deb0d_0.tar.bz2# https://conda.anaconda.org/conda-forge/noarch/zipp-3.4.1-pyhd8ed1ab_0.tar.bz2#a4fa30eb74a326092b3d8078b1f1aae1 https://conda.anaconda.org/conda-forge/linux-64/antlr-python-runtime-4.7.2-py38h578d9bd_1002.tar.bz2#2b2207e2c8a05fc0bc5b62fc32c355e6 https://conda.anaconda.org/conda-forge/noarch/babel-2.9.1-pyh44b312d_0.tar.bz2#74136ed39bfea0832d338df1e58d013e -https://conda.anaconda.org/conda-forge/linux-64/certifi-2020.12.5-py38h578d9bd_1.tar.bz2#be470d89b0678991fd4ba67d4a35bc80 +https://conda.anaconda.org/conda-forge/linux-64/certifi-2021.5.30-py38h578d9bd_0.tar.bz2#a2e14464711f8e76010cd7e0c49bc4ae https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.5-py38ha65f79e_0.tar.bz2#386057f231a571b75bfa7307c9acd5f6 -https://conda.anaconda.org/conda-forge/noarch/cfgv-3.2.0-py_0.tar.bz2#4972efcb3e2cbd3954b24a17266be25c +https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.0-pyhd8ed1ab_0.tar.bz2#a739adbf102868f675bf70601e0af7ea https://conda.anaconda.org/conda-forge/linux-64/chardet-4.0.0-py38h578d9bd_1.tar.bz2#9294a5e2c7545a2f67ac348aadd53344 +https://conda.anaconda.org/conda-forge/linux-64/click-8.0.1-py38h578d9bd_0.tar.bz2#45426acde32f0ddd94dcee3478fd13e3 https://conda.anaconda.org/conda-forge/noarch/cycler-0.10.0-py_2.tar.bz2#f6d7c7e6d8f42cbbec7e07a8d879f91c https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.11.0-py38h497a2fe_3.tar.bz2#45568bae22c3825f22b631101ecbad35 https://conda.anaconda.org/conda-forge/linux-64/dbus-1.13.6-h48d8840_2.tar.bz2#eba672c69baf366fdedd1c6f702dbb81 https://conda.anaconda.org/conda-forge/linux-64/docutils-0.16-py38h578d9bd_3.tar.bz2#a7866449fb9e5e4008a02df276549d34 https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-2.8.1-h83ec7ef_0.tar.bz2#654935b08e8bd4a8cbf6a4253e290c04 -https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-4.0.1-py38h578d9bd_0.tar.bz2#df6fae32b464e9fb5010c4784ce2efb0 +https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-4.4.0-py38h578d9bd_0.tar.bz2#b128309b33413a9cb589fb77457a86dc https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.3.1-py38h1fd1430_1.tar.bz2#01488c80daae318ed5c17e7bb12af64e -https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.8.0-mpi_mpich_hf07302c_1.tar.bz2#2df6da2c9d66945c9399ce6e94d1748e -https://conda.anaconda.org/conda-forge/linux-64/markupsafe-1.1.1-py38h497a2fe_3.tar.bz2#d51cdb48d2792a63174c0ee66a602e7e +https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.8.0-mpi_mpich_hf07302c_2.tar.bz2#d76a3f327eb8e26b5ce6b042ac1abeb3 +https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.0.1-py38h497a2fe_0.tar.bz2#d075babffd68330d81b0488a45435698 https://conda.anaconda.org/conda-forge/linux-64/mpi4py-3.0.3-py38he865349_7.tar.bz2#afbbb1e0ce578e537b2ec82563988417 https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.2-py38h1fd1430_1.tar.bz2#5854c568e0d341313fb0a6487f1c687e https://conda.anaconda.org/conda-forge/linux-64/mypy_extensions-0.4.3-py38h578d9bd_3.tar.bz2#2821575c3884edf40e02cf1966e1c504 -https://conda.anaconda.org/conda-forge/linux-64/numpy-1.20.2-py38h9894fe3_0.tar.bz2#d159afa37685037c73461e8f2fa22e50 +https://conda.anaconda.org/conda-forge/linux-64/numpy-1.20.3-py38h9894fe3_1.tar.bz2#a65d77d36ddfd5c58cdda67ba2ca06c3 https://conda.anaconda.org/conda-forge/noarch/packaging-20.9-pyh44b312d_0.tar.bz2#be69a38e912054a62dc82cc3c7711a64 https://conda.anaconda.org/conda-forge/noarch/partd-1.2.0-pyhd8ed1ab_0.tar.bz2#0c32f563d7f22e3a34c95cad8cc95651 https://conda.anaconda.org/conda-forge/linux-64/pillow-6.2.2-py38h9776b28_0.tar.bz2#bd527d652ba06fb2aae61640bcf7c435 @@ -180,56 +180,56 @@ https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.4.1-py38h497a2fe_0.tar. https://conda.anaconda.org/conda-forge/linux-64/regex-2021.4.4-py38h497a2fe_0.tar.bz2#fd8c69b8da2edc1dbdf6ff619257ee00 https://conda.anaconda.org/conda-forge/linux-64/tornado-6.1-py38h497a2fe_1.tar.bz2#e772c8383768280af283e814e2126663 https://conda.anaconda.org/conda-forge/linux-64/typed-ast-1.4.3-py38h497a2fe_0.tar.bz2#f4a5eeaccf5c5bab10491071ea2e32b1 -https://conda.anaconda.org/conda-forge/linux-64/virtualenv-20.4.6-py38h578d9bd_0.tar.bz2#021bbd21b02800d2ff9c7a05b3e77631 +https://conda.anaconda.org/conda-forge/linux-64/virtualenv-20.4.7-py38h578d9bd_0.tar.bz2#24b5e0295c43de15a51afb00f93a41de https://conda.anaconda.org/conda-forge/noarch/zict-2.0.0-py_0.tar.bz2#4750152be22f24d695b3004c5e1712d3 -https://conda.anaconda.org/conda-forge/noarch/black-20.8b1-py_1.tar.bz2#e555d6b71ec916c3dc4e6e3793cc9796 +https://conda.anaconda.org/conda-forge/noarch/black-21.5b2-pyhd8ed1ab_0.tar.bz2#919be0b3435cbe8e803c6bd738231f69 https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py38h497a2fe_1001.tar.bz2#56753dd777a6517b34966ddcb39af734 https://conda.anaconda.org/conda-forge/linux-64/cftime-1.2.1-py38hab2c0dc_1.tar.bz2#777186ded2d850f3eab4ce7131c6c17c https://conda.anaconda.org/conda-forge/linux-64/cryptography-3.4.7-py38ha5dfef3_0.tar.bz2#a8b014aba670157256dabdc885f71af4 -https://conda.anaconda.org/conda-forge/noarch/dask-core-2021.4.1-pyhd8ed1ab_0.tar.bz2#7b4563cc5528acd2a1b2675a2b69dd19 +https://conda.anaconda.org/conda-forge/noarch/dask-core-2021.5.1-pyhd8ed1ab_0.tar.bz2#bf8923574861d55110396b169f4978f7 https://conda.anaconda.org/conda-forge/linux-64/editdistance-s-1.0.0-py38h1fd1430_1.tar.bz2#03bbd69539712a691b0a43bd4a49976e +https://conda.anaconda.org/conda-forge/noarch/jinja2-3.0.1-pyhd8ed1ab_0.tar.bz2#c647e77921fd3e245cdcc5b2d451a0f8 https://conda.anaconda.org/conda-forge/linux-64/mo_pack-0.2.0-py38h5c078b8_1005.tar.bz2#d318a411c4cb595d5adb60ec7b4a46f0 https://conda.anaconda.org/conda-forge/linux-64/netcdf-fortran-4.5.3-mpi_mpich_h196b126_4.tar.bz2#e058f42a78ea8c965cf7335e28143c59 https://conda.anaconda.org/conda-forge/linux-64/pandas-1.2.4-py38h1abd341_0.tar.bz2#91150ede50b13d34a03e9ef51b7b379f -https://conda.anaconda.org/conda-forge/linux-64/pango-1.42.4-h69149e4_5.tar.bz2#9e325ab71e743c57955e73172d1db615 -https://conda.anaconda.org/conda-forge/linux-64/python-stratify-0.1.1-py38h5c078b8_1003.tar.bz2#a15164882b8bb63442970d99d8a94324 +https://conda.anaconda.org/conda-forge/linux-64/pango-1.48.5-hb8ff022_0.tar.bz2#f4e263c4dfa15b6a97349782793d1ee7 +https://conda.anaconda.org/conda-forge/linux-64/python-stratify-0.2.post0-py38hb5d20a5_0.tar.bz2#cc6852249c01884469560082943b689f https://conda.anaconda.org/conda-forge/linux-64/pywavelets-1.1.1-py38h5c078b8_3.tar.bz2#dafeef887e68bd18ec84681747ca0fd5 https://conda.anaconda.org/conda-forge/linux-64/qt-5.12.9-hda022c4_4.tar.bz2#afebab1f5049d66baaaec67d9ce893f0 https://conda.anaconda.org/conda-forge/linux-64/scipy-1.6.3-py38h7b17777_0.tar.bz2#8055079ed82e1ada1cc4714c26d04802 https://conda.anaconda.org/conda-forge/linux-64/setuptools-49.6.0-py38h578d9bd_3.tar.bz2#59c561cd1be0db9cf1c83f7d7cc74f4d -https://conda.anaconda.org/conda-forge/linux-64/shapely-1.7.1-py38h4fc1155_4.tar.bz2#4f81f5126a2ff5bff8ee84574d82ecac +https://conda.anaconda.org/conda-forge/linux-64/shapely-1.7.1-py38haeee4fe_4.tar.bz2#b94adbb3ce5a62a6894d7757005e6ad8 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-napoleon-0.7-py_0.tar.bz2#0bc25ff6f2e34af63ded59692df5f749 https://conda.anaconda.org/conda-forge/linux-64/asv-0.4.2-py38h709712a_2.tar.bz2#4659f315fc42e671606fbcd1b9234f75 -https://conda.anaconda.org/conda-forge/linux-64/cf-units-2.1.4-py38hab2c0dc_2.tar.bz2#416d0f09951c5faf71d5de180b1d8903 -https://conda.anaconda.org/conda-forge/linux-64/distributed-2021.4.1-py38h578d9bd_0.tar.bz2#8aa81a9e95fbd6adf9b0054e7d1acbce +https://conda.anaconda.org/conda-forge/linux-64/bokeh-2.1.1-py38h32f6830_0.tar.bz2#896f192315a5a04c878febacd67e64cd +https://conda.anaconda.org/conda-forge/linux-64/cf-units-2.1.5-py38hb5d20a5_0.tar.bz2#b45764dbfe02c18f80458bb241e37955 +https://conda.anaconda.org/conda-forge/linux-64/distributed-2021.5.1-py38h578d9bd_0.tar.bz2#822f10583f21bfeda518a674e822e142 https://conda.anaconda.org/conda-forge/linux-64/esmf-8.1.1-mpi_mpich_h3dcaa78_100.tar.bz2#5b4bab1017226f2c03ba0fe02b783316 -https://conda.anaconda.org/conda-forge/noarch/flake8-3.9.1-pyhd8ed1ab_0.tar.bz2#9ce1de40e3510b60d15d512251a3d3f7 -https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-hab0c2f8_0.tar.bz2#8acbef87761a4b90f090168737822611 -https://conda.anaconda.org/conda-forge/noarch/identify-2.2.4-pyhd8ed1ab_0.tar.bz2#86a6446475a53451a71e1515150cb532 +https://conda.anaconda.org/conda-forge/noarch/flake8-3.9.2-pyhd8ed1ab_0.tar.bz2#37d685abea0a25c921431edda02ad143 +https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-h539f30e_1.tar.bz2#606777b4da3664d5c9415f5f165349fd +https://conda.anaconda.org/conda-forge/noarch/identify-2.2.7-pyhd8ed1ab_0.tar.bz2#fc74063be2bef2c21f70edd41620af83 https://conda.anaconda.org/conda-forge/noarch/imagehash-4.2.0-pyhd8ed1ab_0.tar.bz2#e5a77472ae964f2835fce16355bbfe64 -https://conda.anaconda.org/conda-forge/noarch/jinja2-2.11.3-pyh44b312d_0.tar.bz2#1d4c3605d85a3655b1595e0694138eb6 -https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.50.3-hfa39831_1.tar.bz2#7578526979e852a1f8650080214c6cd6 -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.4.1-py38hcc49a3a_0.tar.bz2#a39ef001290edc846f61d184ea734767 +https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.50.5-hc3c00ef_0.tar.bz2#1362366116e80bcfbe9c7cd99766ea40 +https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.4.2-py38hcc49a3a_0.tar.bz2#4bfb6818a1fce6d4129fdf121f788505 https://conda.anaconda.org/conda-forge/linux-64/netcdf4-1.5.6-nompi_py38h5e9db54_103.tar.bz2#72a5656daeee23c80e22b936bef0ceb3 https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.6.0-pyhd8ed1ab_0.tar.bz2#0941325bf48969e2b3b19d0951740950 -https://conda.anaconda.org/conda-forge/noarch/pip-21.1.1-pyhd8ed1ab_0.tar.bz2#e0bad1330c3575222d221e7679a36a0a +https://conda.anaconda.org/conda-forge/noarch/pip-21.1.2-pyhd8ed1ab_0.tar.bz2#dbd830edaffe5fc9ae6c1d425db2b5f2 https://conda.anaconda.org/conda-forge/noarch/pygments-2.9.0-pyhd8ed1ab_0.tar.bz2#a2d9bba43c9b80a42b0ccb9afd7223c2 https://conda.anaconda.org/conda-forge/noarch/pyopenssl-20.0.1-pyhd8ed1ab_0.tar.bz2#92371c25994d0f5d28a01c1fb75ebf86 https://conda.anaconda.org/conda-forge/linux-64/pyqt-impl-5.12.3-py38h7400c14_7.tar.bz2#8fe28c949b01e3d69c2b357b5abf3916 -https://conda.anaconda.org/conda-forge/linux-64/bokeh-2.1.1-py38h32f6830_0.tar.bz2#896f192315a5a04c878febacd67e64cd https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.19.0.post1-py38hc9c980b_0.tar.bz2#65e97172e139d3465895eb07a1fd52f2 +https://conda.anaconda.org/conda-forge/noarch/dask-2021.5.1-pyhd8ed1ab_0.tar.bz2#6d88d5c849ba285e856125d6e4b79b6d https://conda.anaconda.org/conda-forge/linux-64/esmpy-8.1.1-mpi_mpich_py38h7f78e9f_100.tar.bz2#ce0ac0d6f5e6c5e7e0c613b08b3a0960 -https://conda.anaconda.org/conda-forge/linux-64/graphviz-2.47.1-hebd9034_0.tar.bz2#9840ac6c4756d7f4b6035a62aae4d6fb +https://conda.anaconda.org/conda-forge/linux-64/graphviz-2.47.2-h85b4f2f_0.tar.bz2#d68568216287315890c4623397cf8633 https://conda.anaconda.org/conda-forge/noarch/nc-time-axis-1.2.0-py_1.tar.bz2#f3158a5d335f0f44f09cf05d3fb4107e -https://conda.anaconda.org/conda-forge/linux-64/pre-commit-2.12.1-py38h578d9bd_0.tar.bz2#c26dbf85b3b8699f6a551e1f63bf9580 +https://conda.anaconda.org/conda-forge/linux-64/pre-commit-2.13.0-py38h578d9bd_0.tar.bz2#1013dff06f574377c64f11efa7e2c016 https://conda.anaconda.org/conda-forge/linux-64/pyqtchart-5.12-py38h7400c14_7.tar.bz2#3003444b4f41742a33b7afdeb3260cbc https://conda.anaconda.org/conda-forge/linux-64/pyqtwebengine-5.12.1-py38h7400c14_7.tar.bz2#1c17944e118b314ff4d0bfc05f03a5e1 https://conda.anaconda.org/conda-forge/noarch/pyugrid-0.3.1-py_2.tar.bz2#7d7361886fbcf2be663fd185bf6d244d -https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.4-pyhd8ed1ab_0.tar.bz2#d7b20b328e23d993994ea02077c009c0 -https://conda.anaconda.org/conda-forge/noarch/dask-2021.4.1-pyhd8ed1ab_0.tar.bz2#d954ba6326e7f5279444ea0f1c3dfd46 +https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.5-pyhd8ed1ab_0.tar.bz2#36f0ca66d6dd09423e5c2551148d45cd https://conda.anaconda.org/conda-forge/linux-64/pyqt-5.12.3-py38h578d9bd_7.tar.bz2#7166890c160d0441f59973a40b74f6e5 https://conda.anaconda.org/conda-forge/noarch/requests-2.25.1-pyhd3deb0d_0.tar.bz2#ae687aba31a1c400192a86a2e993ffdc -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.4.1-py38h578d9bd_0.tar.bz2#850026fe180249b53fd3df025ea434f6 +https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.4.2-py38h578d9bd_0.tar.bz2#82aa0479b2189ab97f9e70b90d7ec866 https://conda.anaconda.org/conda-forge/noarch/sphinx-3.5.4-pyh44b312d_0.tar.bz2#0ebc444f001f73c4f6de01057b0be392 https://conda.anaconda.org/conda-forge/noarch/sphinx-copybutton-0.3.1-pyhd8ed1ab_0.tar.bz2#decad13214a2a545944560eccf4a9815 https://conda.anaconda.org/conda-forge/noarch/sphinx-gallery-0.9.0-pyhd8ed1ab_0.tar.bz2#5ef222a3e1b5904742e376e05046692b From 7628709a8a285d8025c82fe19107dc1f5d96e79a Mon Sep 17 00:00:00 2001 From: Bill Little Date: Thu, 3 Jun 2021 15:11:27 +0100 Subject: [PATCH 11/12] update docs pypi release (#4173) --- docs/src/developers_guide/release.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/src/developers_guide/release.rst b/docs/src/developers_guide/release.rst index 9e7c74a6ae..b7e35fe072 100644 --- a/docs/src/developers_guide/release.rst +++ b/docs/src/developers_guide/release.rst @@ -107,10 +107,11 @@ source distribution (``sdist``) and pure Python wheel (``bdist_wheel``):: > conda create -n iris-pypi -c conda-forge --yes pip pyke python setuptools twine wheel > . activate iris-pypi -Checkout the lastest Iris ```` tag:: +Checkout the appropriate Iris ```` tag from the appropriate ````. +For example, to checkout tag ``v1.0`` from ``upstream``:: - > git fetch --tags - > git checkout + > git fetch upstream --tags + > git checkout v1.0 Build the source distribution and wheel from the Iris root directory:: @@ -131,7 +132,7 @@ To list and check the contents of the binary wheel:: If all seems well, sufficient maintainer privileges will be required to upload these artifacts to `scitools-iris`_ on PyPI:: - > python -m twine upload --repository-url https://upload.pypi.org/legecy/ dist/* + > python -m twine upload --repository-url https://upload.pypi.org/legacy/ dist/* Ensure that the artifacts are successfully uploaded and available on `scitools-iris`_ before creating a conda test environment to install Iris From d0eab4f0c2e212ccee8b42f830dd6991629dbae2 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Fri, 4 Jun 2021 11:30:07 +0100 Subject: [PATCH 12/12] refactor setup.py to setup.cfg (#4168) * refactor setup.py to setup.cfg * add keywords * added a whatsnew entry * review actions * review actions * rebase with review actions * review actions --- MANIFEST.in | 11 ++-- docs/src/whatsnew/latest.rst | 2 + requirements/all.txt | 7 --- requirements/core.txt | 11 ---- requirements/docs.txt | 8 --- requirements/setup.txt | 4 -- requirements/test.txt | 10 ---- setup.cfg | 95 +++++++++++++++++++++++++++++++ setup.py | 106 ----------------------------------- 9 files changed, 104 insertions(+), 150 deletions(-) delete mode 100644 requirements/all.txt delete mode 100644 requirements/core.txt delete mode 100644 requirements/docs.txt delete mode 100644 requirements/setup.txt delete mode 100644 requirements/test.txt create mode 100644 setup.cfg diff --git a/MANIFEST.in b/MANIFEST.in index 99b801e827..1902f6a74f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,15 +3,17 @@ include CHANGES COPYING COPYING.LESSER # Files from setup.py package_data that are not automatically added to source distributions recursive-include lib/iris/tests/results *.cml *.cdl *.txt *.xml *.json +recursive-exclude lib/iris/fileformats/_pyke_rules/compiled_krb * recursive-include lib/iris/etc * -include lib/iris/fileformats/_pyke_rules/*.k?b -include lib/iris/tests/stock*.npz +include lib/iris/fileformats/_pyke_rules/*.krb -include requirements/*.txt +recursive-include requirements * # File required to build docs recursive-include docs Makefile *.js *.png *.py *.rst -prune docs/build +prune docs/src/_build +prune docs/src/generated +prune docs/gallery_tests # Files required to build std_names module include tools/generate_std_names.py @@ -19,3 +21,4 @@ include etc/cf-standard-name-table.xml global-exclude *.pyc global-exclude __pycache__ +global-exclude iris_image_test_output diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst index 7633bff9c2..1018e5b19a 100644 --- a/docs/src/whatsnew/latest.rst +++ b/docs/src/whatsnew/latest.rst @@ -173,6 +173,8 @@ This document explains the changes made to Iris for this release supported Python versions tested by `cirrus-ci`_ for documentation. (:pull:`4163`) +#. `@bjlittle`_ refactored ``setup.py`` into ``setup.cfg``. (:pull:`4168`) + .. comment Whatsnew author names (@github name) in alphabetical order. Note that, core dev names are automatically included by the common_links.inc: diff --git a/requirements/all.txt b/requirements/all.txt deleted file mode 100644 index 6d7bb942cf..0000000000 --- a/requirements/all.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Optional dependencies. - -mo_pack -nc-time-axis -pandas -pyugrid -stratify diff --git a/requirements/core.txt b/requirements/core.txt deleted file mode 100644 index 9e0c4fb1bb..0000000000 --- a/requirements/core.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Core dependencies. - -cartopy>=0.18 -cf-units>=2 -cftime<1.3.0 -dask[array]>=2 -matplotlib -netcdf4 -numpy>=1.14 -scipy -xxhash diff --git a/requirements/docs.txt b/requirements/docs.txt deleted file mode 100644 index f9de791213..0000000000 --- a/requirements/docs.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Documentation dependencies. - -sphinx -sphinx-copybutton -sphinx-gallery -sphinx_rtd_theme -sphinxcontrib-napoleon -sphinx-panels diff --git a/requirements/setup.txt b/requirements/setup.txt deleted file mode 100644 index 9232946a6a..0000000000 --- a/requirements/setup.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies necessary to run setup.py of iris -# ---------------------------------------------- - -setuptools>=40.8.0 diff --git a/requirements/test.txt b/requirements/test.txt deleted file mode 100644 index 8a720c3e78..0000000000 --- a/requirements/test.txt +++ /dev/null @@ -1,10 +0,0 @@ -# Test dependencies. - -asv -black==21.5b2 -filelock -imagehash>=4.0 -nose -pillow<7 -pre-commit -requests diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000000..b27e0c53d8 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,95 @@ +[metadata] +author = SciTools Developers +author_email = scitools-iris-dev@googlegroups.com +classifiers = + Development Status :: 5 Production/Stable + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) + Operating System :: MacOS + Operating System :: POSIX + Operating System :: POSIX :: Linux + Operating System :: Unix + Programming Language :: Python + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering + Topic :: Scientific/Engineering :: Atmospheric Science + Topic :: Scientific/Engineering :: Visualization +description = + A powerful, format-agnostic, community-driven Python package for analysing and visualising Earth science data +download_url = https://github.com/SciTools/iris +keywords = + cf-metadata + data-analysis + earth-science + grib + netcdf + meteorology + oceanography + space-weather + ugrid + visualisation +license = LGPL-3.0-or-later +license_file = COPYING.LESSER +long_description = file: README.md +long_description_content_type = text/markdown +name = scitools-iris +project_urls = + Code = https://github.com/SciTools/iris + Discussions = https://github.com/SciTools/iris/discussions + Documentation = https://scitools-iris.readthedocs.io/en/stable/ + Issues = https://github.com/SciTools/iris/issues +url = https://github.com/SciTools/iris +version = attr: iris.__version__ + +[options] +include_package_data = True +install_requires = + cartopy>=0.18 + cf-units>=2 + cftime<1.3.0 + dask[array]>=2 + matplotlib + netcdf4 + numpy>=1.14 + scipy + scitools-pyke + xxhash +packages = find: +package_dir = + =lib +python_requires = + >=3.7 +zip_safe = False + +[options.packages.find] +where = lib + +[options.extras_require] +docs = + sphinx + sphinx-copybutton + sphinx-gallery + sphinx_rtd_theme + sphinxcontrib-napoleon + sphinx-panels +test = + asv + black==21.5b2 + filelock + flake8 + imagehash>=4.0 + nose + pillow<7 + pre-commit + requests +all = + mo_pack + nc-time-axis + pandas + pyugrid + stratify + %(docs)s + %(test)s \ No newline at end of file diff --git a/setup.py b/setup.py index d6391e07a6..a767243df9 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ from contextlib import contextmanager -from distutils.util import convert_path import os from shutil import copyfile import sys @@ -10,50 +9,6 @@ from setuptools.command.build_py import build_py -PACKAGE_DIR = os.path.abspath(os.path.dirname(__file__)) -PYPI_NAME = "scitools-iris" - - -# Returns the package and all its sub-packages -def find_package_tree(root_path, root_package): - root_path = root_path.replace("/", os.path.sep) - packages = [root_package] - root_count = len(root_path.split(os.path.sep)) - for (dir_path, dir_names, file_names) in os.walk(convert_path(root_path)): - # Prune dir_names *in-place* to prevent unwanted directory recursion - for dir_name in list(dir_names): - contains_init_file = os.path.isfile( - os.path.join(dir_path, dir_name, "__init__.py") - ) - if not contains_init_file: - dir_names.remove(dir_name) - # Exclude compiled PyKE rules, but keep associated unit tests. - if dir_name == "compiled_krb" and "tests" not in dir_path: - dir_names.remove(dir_name) - if dir_names: - prefix = dir_path.split(os.path.sep)[root_count:] - packages.extend( - [ - ".".join([root_package] + prefix + [dir_name]) - for dir_name in dir_names - ] - ) - return packages - - -def file_walk_relative(top, remove=""): - """ - Returns a generator of files from the top of the tree, removing - the given prefix from the root/file result. - - """ - top = top.replace("/", os.path.sep) - remove = remove.replace("/", os.path.sep) - for root, dirs, files in os.walk(top): - for file in files: - yield os.path.join(root, file).replace(remove, "") - - @contextmanager def temporary_path(directory): """ @@ -74,26 +29,6 @@ def temporary_path(directory): from _runner import TestRunner # noqa: -def pip_requirements(*args): - requirements = [] - for name in args: - fname = os.path.join( - PACKAGE_DIR, "requirements", "{}.txt".format(name) - ) - if not os.path.exists(fname): - emsg = ( - f"Unable to find the {name!r} requirements file at {fname!r}." - ) - raise RuntimeError(emsg) - with open(fname, "r") as fh: - for line in fh: - line = line.strip() - if not line or line.startswith("#"): - continue - requirements.append(line) - return requirements - - class SetupTestRunner(TestRunner, Command): pass @@ -217,25 +152,6 @@ def run(self): return ExtendedCommand -def extract_version(): - version = None - fname = os.path.join(PACKAGE_DIR, "lib", "iris", "__init__.py") - with open(fname) as fi: - for line in fi: - if line.startswith("__version__"): - _, version = line.split("=") - version = version.strip()[1:-1] # Remove quotations - break - return version - - -def long_description(): - fname = os.path.join(PACKAGE_DIR, "README.md") - with open(fname, "rb") as fi: - result = fi.read().decode("utf-8") - return result - - custom_commands = { "test": SetupTestRunner, "develop": custom_cmd(develop_cmd, [build_std_names, compile_pyke_rules]), @@ -257,27 +173,5 @@ def long_description(): setup( - name=PYPI_NAME, - version=extract_version(), - url="http://scitools.org.uk/iris/", - author="UK Met Office", - author_email="scitools-iris-dev@googlegroups.com", - description="A powerful, format-agnostic, community-driven Python " - "package for analysing and visualising Earth science data", - long_description=long_description(), - long_description_content_type="text/markdown", - packages=find_package_tree("lib/iris", "iris"), - package_dir={"": "lib"}, - include_package_data=True, cmdclass=custom_commands, - zip_safe=False, - setup_requires=pip_requirements("setup"), - install_requires=pip_requirements("setup", "core"), - tests_require=[f"{PYPI_NAME}[test]"], - extras_require={ - "all": pip_requirements("all"), - "docs": pip_requirements("docs"), - "test": pip_requirements("test"), - }, - python_requires=">=3.7", )