From de38d1c86b61aa9d6375b910613981ac193ed83f Mon Sep 17 00:00:00 2001 From: Lockfile bot Date: Sat, 25 Sep 2021 00:55:34 +0000 Subject: [PATCH 1/2] Updated environment lockfiles --- requirements/ci/nox.lock/py37-linux-64.lock | 78 ++++++++++----------- requirements/ci/nox.lock/py38-linux-64.lock | 76 ++++++++++---------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/requirements/ci/nox.lock/py37-linux-64.lock b/requirements/ci/nox.lock/py37-linux-64.lock index 7eb23a9ed9..7170ea77aa 100644 --- a/requirements/ci/nox.lock/py37-linux-64.lock +++ b/requirements/ci/nox.lock/py37-linux-64.lock @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 6dc0000cc1dab34473c629d4c739a5828bcc51d769c258d205d0bbe3817e25ae +# input_hash: 1984641fa445d61b084bb71648b01b32c2709a1807689360923f1b71f9724328 @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-2021.5.30-ha878542_0.tar.bz2#6a777890e94194dc94a29a76d2a7e721 @@ -9,16 +9,16 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed3 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.36.1-hea4e1c9_2.tar.bz2#bd4f2e711b39af170e7ff15163fe87ee -https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-11.1.0-h6c583b3_8.tar.bz2#478b6358c5d08b7e133a5da71c5c81bd -https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-11.1.0-h56837e0_8.tar.bz2#930957b6bff66cfd539ada080c5ca3e8 +https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-11.2.0-h5c6108e_8.tar.bz2#1672a7e59c23aac19cb01260e873a4b0 +https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-11.2.0-he4da1e4_8.tar.bz2#cee237cb6cd08c65c2f74ada9524b768 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.25-ha770c72_2.tar.bz2#b1ba065c6d2b9468035472a9d63e5b08 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-11.1.0-h69a702a_8.tar.bz2#7bacab270c077a054525e8afe29feaa9 -https://conda.anaconda.org/conda-forge/linux-64/libgomp-11.1.0-hc902ee8_8.tar.bz2#f2dd961d1ae80d9d81b3d5068807f11b +https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-11.2.0-h69a702a_8.tar.bz2#d246e04ac94318cfe8ad8879a41e908e +https://conda.anaconda.org/conda-forge/linux-64/libgomp-11.2.0-h1d223b6_8.tar.bz2#9c5ec5d954d2009c6b267ed25346ef87 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-11.1.0-hc902ee8_8.tar.bz2#da6221956ce8582d8e71acc16dfe4c3e +https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-11.2.0-h1d223b6_8.tar.bz2#2de68a054a079032d30dcd54ebf2ecb9 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.2-h7f98852_0.tar.bz2#a25871010e5104556045aa01850fbddf @@ -33,7 +33,7 @@ https://conda.anaconda.org/conda-forge/linux-64/jpeg-9d-h36c2ea0_0.tar.bz2#ea02c https://conda.anaconda.org/conda-forge/linux-64/lerc-2.2.1-h9c3ff4c_0.tar.bz2#ea833dcaeb9e7ac4fac521f1a7abec82 https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.7-h7f98852_5.tar.bz2#10e242842cd30c59c12d79371dc0f583 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/libffi-3.4.2-h9c3ff4c_4.tar.bz2#dea515312db9d4788e52c2edfc657635 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 @@ -61,7 +61,7 @@ https://conda.anaconda.org/conda-forge/linux-64/xxhash-0.8.0-h7f98852_3.tar.bz2# 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/gettext-0.19.8.1-h73d1719_1008.tar.bz2#af49250eca8e139378f8ff0ae9e57251 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-11_linux64_openblas.tar.bz2#b8a498e2cac5746b808d5961cb584a13 https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1 @@ -69,7 +69,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-hcdb4288_3.tar.b 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.10.0-ha56f1ee_0.tar.bz2#999b754fbf81618f1edadfb1204983a4 +https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-ha56f1ee_1.tar.bz2#5fb7740952532a2a2c201ff2c3319af8 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.12-h72842e0_0.tar.bz2#bd14fdf5b9ee5568056a40a6a2f41866 @@ -83,7 +83,7 @@ https://conda.anaconda.org/conda-forge/linux-64/freetype-2.10.4-h0708190_1.tar.b https://conda.anaconda.org/conda-forge/linux-64/krb5-1.19.2-hcc1bbae_0.tar.bz2#81256fa86f9b65cf8ca726eeb3a7f283 https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-11_linux64_openblas.tar.bz2#59bf439337c9ec59297f701e4ee97e09 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.4-h3e27bee_0.tar.bz2#23767bef4fd0fb2bda64405df72c9454 +https://conda.anaconda.org/conda-forge/linux-64/libglib-2.68.4-h174f98d_1.tar.bz2#bbdd1d97559e052c98edd08a408218b4 https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-11_linux64_openblas.tar.bz2#00d3680586af1f0689398b080e273cbb https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.3.0-hf544144_1.tar.bz2#a65a4158716bd7d95bfa69bcfd83081c https://conda.anaconda.org/conda-forge/linux-64/libxkbcommon-1.0.3-he3ba5ed_0.tar.bz2#f9dbabc7e01c459ed7a1d1d64b206e9b @@ -93,15 +93,15 @@ https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.2-h7f98852_0.tar 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.4-h9c3ff4c_0.tar.bz2#1e3e305bf1db79b99c3255b557751519 +https://conda.anaconda.org/conda-forge/linux-64/glib-tools-2.68.4-h9c3ff4c_1.tar.bz2#023f5d95c2ab4dd78ff5fb62fa421266 https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.18.5-h76c114f_0.tar.bz2#2372f6206f9861a1af8e3b086a053b2b 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.78.0-h2574ce0_0.tar.bz2#9c06cc5692dcd0b91699413fcc18405b +https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.79.1-h2574ce0_0.tar.bz2#e4b272c35373b45442d91ff8ad0deb10 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.1-h3452ae3_0.tar.bz2#6d4bf6265d998b6c975c26a6a24062a2 https://conda.anaconda.org/conda-forge/linux-64/nss-3.69-hb5efdd6_0.tar.bz2#da3ad4247c36e2248cfc2aadb1e423b0 -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/python-3.7.10-hb7a2778_101_cpython.tar.bz2#f5b99583f45e5ab8bcc5ccdd1202f905 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 @@ -111,23 +111,23 @@ https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#eb https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.0.0-pyhd8ed1ab_0.tar.bz2#4a57e24d5b759893615c05926b7b5fb9 https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.0.0-pyhd8ed1ab_0.tar.bz2#3a8fc8b627d5fb6af827e126a10a86c6 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.78.0-hea6ffbf_0.tar.bz2#89c45ff3044b2ddcd7689972e675c189 -https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.2-pyhd8ed1ab_0.tar.bz2#ae8b866c376568b0342ae2c9b68f1e65 +https://conda.anaconda.org/conda-forge/linux-64/curl-7.79.1-hea6ffbf_0.tar.bz2#427c2c80ab8f4d17c2db0e61f1accb22 +https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.3-pyhd8ed1ab_0.tar.bz2#cc7dae067bb31c1598e23e151dfca986 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.8.1-pyhd8ed1ab_0.tar.bz2#c91815f86a9c2ed7525e9dc78fb189e4 -https://conda.anaconda.org/conda-forge/linux-64/glib-2.68.4-h9c3ff4c_0.tar.bz2#8b8a2eca3496b279cd4f45888490437f +https://conda.anaconda.org/conda-forge/noarch/fsspec-2021.9.0-pyhd8ed1ab_0.tar.bz2#46cf1fba8caddd0ab7b5869d8a010d29 +https://conda.anaconda.org/conda-forge/linux-64/glib-2.68.4-h9c3ff4c_1.tar.bz2#32b3393dcde206d3e448c004af06a93b https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.18.5-hf529b03_0.tar.bz2#b1f3d74a3b66432adddfc118ff02238a https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.12.1-mpi_mpich_h9c45103_0.tar.bz2#9a62ae44bbd9d891824816c452491f49 https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95 https://conda.anaconda.org/conda-forge/noarch/idna-3.1-pyhd3deb0d_0.tar.bz2#9c9aea4b8391264477df484f798562d0 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/iris-sample-data-2.4.0-pyhd8ed1ab_0.tar.bz2#18ee9c07cf945a33f92caf1ee3d23ad9 +https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h6ad9fb6_0.tar.bz2#45142dc44fcd04934f9ad68ce205e54d 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/linux-64/proj-7.2.0-h277dcde_2.tar.bz2#db654ee11298d3463bad67445707654c +https://conda.anaconda.org/conda-forge/linux-64/proj-8.1.0-h277dcde_1.tar.bz2#483341b1410492b33b60c2925cfefaa1 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 @@ -147,19 +147,19 @@ https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1. 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.10.0.0-pyha770c72_0.tar.bz2#67c0cba6533b641f28946d7c16f361c8 +https://conda.anaconda.org/conda-forge/noarch/typing_extensions-3.10.0.2-pyha770c72_0.tar.bz2#85dfd487a244bbe2cf7019ce8a39b5bc https://conda.anaconda.org/conda-forge/noarch/wheel-0.37.0-pyhd8ed1ab_1.tar.bz2#3aa2c3e25dd361b453d010388b9cdff1 https://conda.anaconda.org/conda-forge/noarch/zipp-3.5.0-pyhd8ed1ab_0.tar.bz2#f9dd05a5ed6b81c91f097e3739107a74 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-2021.5.30-py37h89c1867_0.tar.bz2#105f18ae8597a5f4d4e3188bcb06c796 -https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.6-py37hc58025e_0.tar.bz2#22353c1d4290972e3ed35e50af0b9c70 +https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.6-py37h036bc23_1.tar.bz2#43cbbebef925c942310d814502323c63 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.24-py37hcd2ae1e_0.tar.bz2#254a23562f74201cd69ff2df5368c960 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/docutils-0.17.1-py37h89c1867_0.tar.bz2#3bc9bd36604f0a20407529816e64ae70 https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-2.9.1-h83ec7ef_0.tar.bz2#03de381fe72fa78dede4f9bb53d00752 https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-4.8.1-py37h89c1867_0.tar.bz2#6c71b2b82c7e5908e1077b932632b6cf https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.3.2-py37h2527ec5_0.tar.bz2#48edccac5dc91a809dc6f8fd20623738 @@ -178,7 +178,7 @@ https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py37h89c1867_3.tar https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 https://conda.anaconda.org/conda-forge/linux-64/python-xxhash-2.0.2-py37h5e8e339_0.tar.bz2#3f1e633378cd3c8b1ce13b3f2f5eadd7 https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.4.1-py37h5e8e339_1.tar.bz2#16757160a88eedbed94774e41189a729 -https://conda.anaconda.org/conda-forge/linux-64/setuptools-58.0.4-py37h89c1867_0.tar.bz2#cb198c0ec395b1b30ae3a045d62a1799 +https://conda.anaconda.org/conda-forge/linux-64/setuptools-58.0.4-py37h89c1867_1.tar.bz2#72b6136f590e535729a2268855636858 https://conda.anaconda.org/conda-forge/linux-64/tornado-6.1-py37h5e8e339_1.tar.bz2#92449128c4639feae48d731ef2186099 https://conda.anaconda.org/conda-forge/noarch/zict-2.0.0-py_0.tar.bz2#4750152be22f24d695b3004c5e1712d3 https://conda.anaconda.org/conda-forge/linux-64/asv-0.4.2-py37hcd2ae1e_2.tar.bz2#a539a23d322e3976dda4af86e59b31ce @@ -186,19 +186,20 @@ https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py37h5e8e339_1001 https://conda.anaconda.org/conda-forge/linux-64/cftime-1.5.0-py37h6f94858_0.tar.bz2#e252867ed3798d946b16576a575ccaa6 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.9.0-pyhd8ed1ab_0.tar.bz2#19ebaae81d3c3767653f3634fb77ec57 +https://conda.anaconda.org/conda-forge/noarch/dask-core-2021.9.1-pyhd8ed1ab_0.tar.bz2#d38922a4d6c96adef5ea38aad3965855 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/flake8-3.9.2-pyhd8ed1ab_0.tar.bz2#37d685abea0a25c921431edda02ad143 https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-4.8.1-hd8ed1ab_0.tar.bz2#ce811c521c3a02d7c8ace1cfbd2a0bcd https://conda.anaconda.org/conda-forge/noarch/jinja2-3.0.1-pyhd8ed1ab_0.tar.bz2#c647e77921fd3e245cdcc5b2d451a0f8 -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.4.3-py37h1058ff1_0.tar.bz2#195872ca8597bfc155364851072344c4 +https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.4.3-py37h1058ff1_1.tar.bz2#a67dbcb27809c5bc08dd72a257cfde46 https://conda.anaconda.org/conda-forge/linux-64/mo_pack-0.2.0-py37h6f94858_1005.tar.bz2#6b203f153bcc537f836ac50c4d9a2e16 https://conda.anaconda.org/conda-forge/linux-64/netcdf-fortran-4.5.3-mpi_mpich_h1364a43_6.tar.bz2#9caa0cf923af3d037897c6d7f8ea57c0 https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.6.0-pyhd8ed1ab_0.tar.bz2#0941325bf48969e2b3b19d0951740950 -https://conda.anaconda.org/conda-forge/linux-64/pandas-1.3.2-py37he8f5f7f_0.tar.bz2#481a4474af8c235b7ad2cd03aa09b2a1 -https://conda.anaconda.org/conda-forge/linux-64/pango-1.48.9-hb8ff022_0.tar.bz2#d76e859d2f213a006191b3c0e9682aa1 +https://conda.anaconda.org/conda-forge/linux-64/pandas-1.3.3-py37he8f5f7f_0.tar.bz2#cc77ff6e46e50194896e8efc65aff01a +https://conda.anaconda.org/conda-forge/linux-64/pango-1.48.10-hb8ff022_1.tar.bz2#f67c24bfd760cd50c285556ee7507853 https://conda.anaconda.org/conda-forge/noarch/pip-21.2.4-pyhd8ed1ab_0.tar.bz2#4104ada314dd5639ea36cc12bce0a2cd https://conda.anaconda.org/conda-forge/noarch/pygments-2.10.0-pyhd8ed1ab_0.tar.bz2#32bcce837f1316f1c3208118b6c5e5fc +https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.2.1-py37hdf91f24_1.tar.bz2#9053d24bffd39a22a07c3b88b51b522f 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-py37hb1e94ed_3.tar.bz2#0e855d0b0c5f483cc2362979ed163579 https://conda.anaconda.org/conda-forge/linux-64/qt-5.12.9-hda022c4_4.tar.bz2#afebab1f5049d66baaaec67d9ce893f0 @@ -207,31 +208,30 @@ https://conda.anaconda.org/conda-forge/linux-64/shapely-1.7.1-py37h48c49eb_5.tar 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.7-py37h89c1867_0.tar.bz2#50087f16f1a71581a0327956c80debc2 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_1.tar.bz2#6bd2119c011c0cf2d187e9cb30c0bfb3 +https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.20.0-py37h8c872fa_1.tar.bz2#2658c36f0dff71b4fb9e37e7c09ef16e https://conda.anaconda.org/conda-forge/linux-64/cf-units-3.0.1.post0-py37hb1e94ed_0.tar.bz2#3e2728b1107710a5897324afd82bc78a -https://conda.anaconda.org/conda-forge/linux-64/distributed-2021.9.0-py37h89c1867_0.tar.bz2#cda5cd2fe6191b05c9117256948acc71 +https://conda.anaconda.org/conda-forge/linux-64/distributed-2021.9.1-py37h89c1867_0.tar.bz2#95488aeb1861ac46b22d998078702d5b https://conda.anaconda.org/conda-forge/linux-64/esmf-8.1.1-mpi_mpich_h4975321_102.tar.bz2#1ee3e15fc9f1b452207d260c2be568ec 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.14-pyhd8ed1ab_0.tar.bz2#e477e8c921c2958f3d3188c5001e6244 +https://conda.anaconda.org/conda-forge/noarch/identify-2.2.15-pyhd8ed1ab_0.tar.bz2#402809b0b32ac684383051fd4ba608cd https://conda.anaconda.org/conda-forge/noarch/imagehash-4.2.1-pyhd8ed1ab_0.tar.bz2#01cc8698b6e1a124dc4f585516c27643 -https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.50.7-hc3c00ef_0.tar.bz2#63fb96444e336b3d937921223dd9a481 +https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.52.0-hc3c00ef_0.tar.bz2#146c1ede13b83b9768a3d2c04320673e https://conda.anaconda.org/conda-forge/noarch/nc-time-axis-1.3.1-pyhd8ed1ab_2.tar.bz2#d37916d7bf9519a3e3abb902a4c06b69 https://conda.anaconda.org/conda-forge/linux-64/netcdf4-1.5.7-nompi_py37hf784469_102.tar.bz2#c31d008f35f0cc82645b83c21e24ca76 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/noarch/dask-2021.9.0-pyhd8ed1ab_0.tar.bz2#40259585e9c679ac8e40b2a2fefda1b1 -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/noarch/dask-2021.9.1-pyhd8ed1ab_0.tar.bz2#91d9ea7399ae9d47d774eca36be5e51f +https://conda.anaconda.org/conda-forge/linux-64/esmpy-8.1.1-mpi_mpich_py37h7352969_101.tar.bz2#2b8fa09ac3a44e311997ea2b35d369c0 https://conda.anaconda.org/conda-forge/linux-64/graphviz-2.49.0-h85b4f2f_0.tar.bz2#4a8e2fb5e3ae22825a720aaf9dcf1b5e https://conda.anaconda.org/conda-forge/linux-64/pre-commit-2.15.0-py37h89c1867_0.tar.bz2#0ce932f881d9de271f5c962f38840f2f 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.6-pyhd8ed1ab_0.tar.bz2#dea5b6d93cfbfbc2a253168ad05b3f89 +https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.7-pyhd8ed1ab_0.tar.bz2#be75bab4820a56f77ba1a3fc9139c36a 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.26.0-pyhd8ed1ab_0.tar.bz2#0ed2ccbde6db9dd5789068eb7194463f -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.4.3-py37h89c1867_0.tar.bz2#c187b5e294bc645d400637518a7aa3ff -https://conda.anaconda.org/conda-forge/noarch/sphinx-4.1.2-pyh6c4a22f_1.tar.bz2#b80d092c478bfc93589f9e338e78b8d2 +https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.4.3-py37h89c1867_1.tar.bz2#0f4b55d86f989450108f272290bf11ff +https://conda.anaconda.org/conda-forge/noarch/sphinx-4.2.0-pyh6c4a22f_0.tar.bz2#ea5c6881a11a0d9c4d04f1ebae87bb34 https://conda.anaconda.org/conda-forge/noarch/sphinx-copybutton-0.4.0-pyhd8ed1ab_0.tar.bz2#80fd2cc25ad45911b4e42d5b91593e2f 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.6.0-pyhd8ed1ab_0.tar.bz2#6eec6480601f5d15babf9c3b3987f34a -https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-0.5.2-pyhd8ed1ab_1.tar.bz2#7434e891fc767cb0d39d90751720c8ec +https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-1.0.0-pyhd8ed1ab_0.tar.bz2#9f633f2f2869184e31acfeae95b24345 diff --git a/requirements/ci/nox.lock/py38-linux-64.lock b/requirements/ci/nox.lock/py38-linux-64.lock index eda0a6f52f..22d15d9e76 100644 --- a/requirements/ci/nox.lock/py38-linux-64.lock +++ b/requirements/ci/nox.lock/py38-linux-64.lock @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: b18cda575ddf26d4adbc2e8fa98625982e3a50c991b0082207b9a5bd493af9b1 +# input_hash: 27d0190648a30af19dc196b4f68747f2565c7ba0c8ae5da75814ce68f045cde2 @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-2021.5.30-ha878542_0.tar.bz2#6a777890e94194dc94a29a76d2a7e721 @@ -9,16 +9,16 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed3 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.36.1-hea4e1c9_2.tar.bz2#bd4f2e711b39af170e7ff15163fe87ee -https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-11.1.0-h6c583b3_8.tar.bz2#478b6358c5d08b7e133a5da71c5c81bd -https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-11.1.0-h56837e0_8.tar.bz2#930957b6bff66cfd539ada080c5ca3e8 +https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-11.2.0-h5c6108e_8.tar.bz2#1672a7e59c23aac19cb01260e873a4b0 +https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-11.2.0-he4da1e4_8.tar.bz2#cee237cb6cd08c65c2f74ada9524b768 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.25-ha770c72_2.tar.bz2#b1ba065c6d2b9468035472a9d63e5b08 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-11.1.0-h69a702a_8.tar.bz2#7bacab270c077a054525e8afe29feaa9 -https://conda.anaconda.org/conda-forge/linux-64/libgomp-11.1.0-hc902ee8_8.tar.bz2#f2dd961d1ae80d9d81b3d5068807f11b +https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-11.2.0-h69a702a_8.tar.bz2#d246e04ac94318cfe8ad8879a41e908e +https://conda.anaconda.org/conda-forge/linux-64/libgomp-11.2.0-h1d223b6_8.tar.bz2#9c5ec5d954d2009c6b267ed25346ef87 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-11.1.0-hc902ee8_8.tar.bz2#da6221956ce8582d8e71acc16dfe4c3e +https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-11.2.0-h1d223b6_8.tar.bz2#2de68a054a079032d30dcd54ebf2ecb9 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.2-h7f98852_0.tar.bz2#a25871010e5104556045aa01850fbddf @@ -33,7 +33,7 @@ https://conda.anaconda.org/conda-forge/linux-64/jpeg-9d-h36c2ea0_0.tar.bz2#ea02c https://conda.anaconda.org/conda-forge/linux-64/lerc-2.2.1-h9c3ff4c_0.tar.bz2#ea833dcaeb9e7ac4fac521f1a7abec82 https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.7-h7f98852_5.tar.bz2#10e242842cd30c59c12d79371dc0f583 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/libffi-3.4.2-h9c3ff4c_4.tar.bz2#dea515312db9d4788e52c2edfc657635 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 @@ -61,7 +61,7 @@ https://conda.anaconda.org/conda-forge/linux-64/xxhash-0.8.0-h7f98852_3.tar.bz2# 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/gettext-0.19.8.1-h73d1719_1008.tar.bz2#af49250eca8e139378f8ff0ae9e57251 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-11_linux64_openblas.tar.bz2#b8a498e2cac5746b808d5961cb584a13 https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1 @@ -69,7 +69,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-hcdb4288_3.tar.b 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.10.0-ha56f1ee_0.tar.bz2#999b754fbf81618f1edadfb1204983a4 +https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-ha56f1ee_1.tar.bz2#5fb7740952532a2a2c201ff2c3319af8 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.12-h72842e0_0.tar.bz2#bd14fdf5b9ee5568056a40a6a2f41866 @@ -83,7 +83,7 @@ https://conda.anaconda.org/conda-forge/linux-64/freetype-2.10.4-h0708190_1.tar.b https://conda.anaconda.org/conda-forge/linux-64/krb5-1.19.2-hcc1bbae_0.tar.bz2#81256fa86f9b65cf8ca726eeb3a7f283 https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-11_linux64_openblas.tar.bz2#59bf439337c9ec59297f701e4ee97e09 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.4-h3e27bee_0.tar.bz2#23767bef4fd0fb2bda64405df72c9454 +https://conda.anaconda.org/conda-forge/linux-64/libglib-2.68.4-h174f98d_1.tar.bz2#bbdd1d97559e052c98edd08a408218b4 https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-11_linux64_openblas.tar.bz2#00d3680586af1f0689398b080e273cbb https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.3.0-hf544144_1.tar.bz2#a65a4158716bd7d95bfa69bcfd83081c https://conda.anaconda.org/conda-forge/linux-64/libxkbcommon-1.0.3-he3ba5ed_0.tar.bz2#f9dbabc7e01c459ed7a1d1d64b206e9b @@ -93,14 +93,14 @@ https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.2-h7f98852_0.tar 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.4-h9c3ff4c_0.tar.bz2#1e3e305bf1db79b99c3255b557751519 +https://conda.anaconda.org/conda-forge/linux-64/glib-tools-2.68.4-h9c3ff4c_1.tar.bz2#023f5d95c2ab4dd78ff5fb62fa421266 https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.18.5-h76c114f_0.tar.bz2#2372f6206f9861a1af8e3b086a053b2b 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/libcurl-7.78.0-h2574ce0_0.tar.bz2#9c06cc5692dcd0b91699413fcc18405b +https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.79.1-h2574ce0_0.tar.bz2#e4b272c35373b45442d91ff8ad0deb10 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.1-h3452ae3_0.tar.bz2#6d4bf6265d998b6c975c26a6a24062a2 https://conda.anaconda.org/conda-forge/linux-64/nss-3.69-hb5efdd6_0.tar.bz2#da3ad4247c36e2248cfc2aadb1e423b0 -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/python-3.8.12-hb7a2778_0_cpython.tar.bz2#c7df0d8f4d2b4943c718c8f5e34338ba 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 @@ -110,23 +110,23 @@ https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#eb https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.0.0-pyhd8ed1ab_0.tar.bz2#4a57e24d5b759893615c05926b7b5fb9 https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.0.0-pyhd8ed1ab_0.tar.bz2#3a8fc8b627d5fb6af827e126a10a86c6 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.78.0-hea6ffbf_0.tar.bz2#89c45ff3044b2ddcd7689972e675c189 -https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.2-pyhd8ed1ab_0.tar.bz2#ae8b866c376568b0342ae2c9b68f1e65 +https://conda.anaconda.org/conda-forge/linux-64/curl-7.79.1-hea6ffbf_0.tar.bz2#427c2c80ab8f4d17c2db0e61f1accb22 +https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.3-pyhd8ed1ab_0.tar.bz2#cc7dae067bb31c1598e23e151dfca986 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.8.1-pyhd8ed1ab_0.tar.bz2#c91815f86a9c2ed7525e9dc78fb189e4 -https://conda.anaconda.org/conda-forge/linux-64/glib-2.68.4-h9c3ff4c_0.tar.bz2#8b8a2eca3496b279cd4f45888490437f +https://conda.anaconda.org/conda-forge/noarch/fsspec-2021.9.0-pyhd8ed1ab_0.tar.bz2#46cf1fba8caddd0ab7b5869d8a010d29 +https://conda.anaconda.org/conda-forge/linux-64/glib-2.68.4-h9c3ff4c_1.tar.bz2#32b3393dcde206d3e448c004af06a93b https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.18.5-hf529b03_0.tar.bz2#b1f3d74a3b66432adddfc118ff02238a https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.12.1-mpi_mpich_h9c45103_0.tar.bz2#9a62ae44bbd9d891824816c452491f49 https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95 https://conda.anaconda.org/conda-forge/noarch/idna-3.1-pyhd3deb0d_0.tar.bz2#9c9aea4b8391264477df484f798562d0 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/iris-sample-data-2.4.0-pyhd8ed1ab_0.tar.bz2#18ee9c07cf945a33f92caf1ee3d23ad9 +https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h6ad9fb6_0.tar.bz2#45142dc44fcd04934f9ad68ce205e54d 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/linux-64/proj-7.2.0-h277dcde_2.tar.bz2#db654ee11298d3463bad67445707654c +https://conda.anaconda.org/conda-forge/linux-64/proj-8.1.0-h277dcde_1.tar.bz2#483341b1410492b33b60c2925cfefaa1 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 @@ -151,13 +151,13 @@ https://conda.anaconda.org/conda-forge/noarch/zipp-3.5.0-pyhd8ed1ab_0.tar.bz2#f9 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-2021.5.30-py38h578d9bd_0.tar.bz2#a2e14464711f8e76010cd7e0c49bc4ae -https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.6-py38ha65f79e_0.tar.bz2#6b52289a4d2cfb2107fb54efd7dd1aa1 +https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.6-py38h3931269_1.tar.bz2#01a5442b5cc3c7e901823fd70fb1aeb5 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/docutils-0.17.1-py38h578d9bd_0.tar.bz2#004eaa0b626afb277ab593ca8f15adbc https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-2.9.1-h83ec7ef_0.tar.bz2#03de381fe72fa78dede4f9bb53d00752 https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-4.8.1-py38h578d9bd_0.tar.bz2#2e668abea4a726f4a19941ddb8a3a9b6 https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.3.2-py38h1fd1430_0.tar.bz2#1cf3f2fddcf688445da9cd81dc4deb0e @@ -176,7 +176,7 @@ https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py38h578d9bd_3.tar https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984 https://conda.anaconda.org/conda-forge/linux-64/python-xxhash-2.0.2-py38h497a2fe_0.tar.bz2#27b37e3f79205080b573442445ed727b https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.4.1-py38h497a2fe_1.tar.bz2#7e738dbfefe123471d1d24c005cdd168 -https://conda.anaconda.org/conda-forge/linux-64/setuptools-58.0.4-py38h578d9bd_0.tar.bz2#829bc800319df693a160c76d77a2dd3f +https://conda.anaconda.org/conda-forge/linux-64/setuptools-58.0.4-py38h578d9bd_1.tar.bz2#98e61cdf3cf50a5b643d829d600a04b9 https://conda.anaconda.org/conda-forge/linux-64/tornado-6.1-py38h497a2fe_1.tar.bz2#e772c8383768280af283e814e2126663 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 @@ -184,18 +184,19 @@ https://conda.anaconda.org/conda-forge/linux-64/asv-0.4.2-py38h709712a_2.tar.bz2 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.5.0-py38hb5d20a5_0.tar.bz2#ef7d29510b551767f7584df1ce150b53 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.9.0-pyhd8ed1ab_0.tar.bz2#19ebaae81d3c3767653f3634fb77ec57 +https://conda.anaconda.org/conda-forge/noarch/dask-core-2021.9.1-pyhd8ed1ab_0.tar.bz2#d38922a4d6c96adef5ea38aad3965855 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/flake8-3.9.2-pyhd8ed1ab_0.tar.bz2#37d685abea0a25c921431edda02ad143 https://conda.anaconda.org/conda-forge/noarch/jinja2-3.0.1-pyhd8ed1ab_0.tar.bz2#c647e77921fd3e245cdcc5b2d451a0f8 -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.4.3-py38hf4fb855_0.tar.bz2#686049af6002e5d135144290f959e378 +https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.4.3-py38hf4fb855_1.tar.bz2#b5048e730b8f0f311d2ed6fc8e7272dc https://conda.anaconda.org/conda-forge/linux-64/mo_pack-0.2.0-py38hb5d20a5_1005.tar.bz2#d51285f235753f5620474c60da0e5d68 https://conda.anaconda.org/conda-forge/linux-64/netcdf-fortran-4.5.3-mpi_mpich_h1364a43_6.tar.bz2#9caa0cf923af3d037897c6d7f8ea57c0 https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.6.0-pyhd8ed1ab_0.tar.bz2#0941325bf48969e2b3b19d0951740950 -https://conda.anaconda.org/conda-forge/linux-64/pandas-1.3.2-py38h43a58ef_0.tar.bz2#88f62890e4594df2e7da213dde8d823c -https://conda.anaconda.org/conda-forge/linux-64/pango-1.48.9-hb8ff022_0.tar.bz2#d76e859d2f213a006191b3c0e9682aa1 +https://conda.anaconda.org/conda-forge/linux-64/pandas-1.3.3-py38h43a58ef_0.tar.bz2#0b22b7a9e57e4ce2184fafce3d20a15f +https://conda.anaconda.org/conda-forge/linux-64/pango-1.48.10-hb8ff022_1.tar.bz2#f67c24bfd760cd50c285556ee7507853 https://conda.anaconda.org/conda-forge/noarch/pip-21.2.4-pyhd8ed1ab_0.tar.bz2#4104ada314dd5639ea36cc12bce0a2cd https://conda.anaconda.org/conda-forge/noarch/pygments-2.10.0-pyhd8ed1ab_0.tar.bz2#32bcce837f1316f1c3208118b6c5e5fc +https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.2.1-py38h3701b11_1.tar.bz2#cc6b9b79e5c0db338a5c425ae5d83962 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-py38h6c62de6_3.tar.bz2#a82f870af514d313ffb91ce7e4cf1b89 https://conda.anaconda.org/conda-forge/linux-64/qt-5.12.9-hda022c4_4.tar.bz2#afebab1f5049d66baaaec67d9ce893f0 @@ -203,31 +204,30 @@ https://conda.anaconda.org/conda-forge/linux-64/scipy-1.7.1-py38h56a6a73_0.tar.b https://conda.anaconda.org/conda-forge/linux-64/shapely-1.7.1-py38hb7fe4a8_5.tar.bz2#84d4f1c56cdc670e0531baea26dfd16b https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-napoleon-0.7-py_0.tar.bz2#0bc25ff6f2e34af63ded59692df5f749 https://conda.anaconda.org/conda-forge/linux-64/bokeh-1.4.0-py38h32f6830_1.tar.bz2#7074fc3ef551c1aa1e10393436de021c -https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.19.0.post1-py38hc9c980b_1.tar.bz2#777b33d2e0678182b2a5d2e32dc27248 +https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.20.0-py38hf5cf5bb_1.tar.bz2#2ca5f4e74c0768acd828b774f36db929 https://conda.anaconda.org/conda-forge/linux-64/cf-units-3.0.1.post0-py38h6c62de6_0.tar.bz2#450b1b71703889cbda24c0181a4ce89a -https://conda.anaconda.org/conda-forge/linux-64/distributed-2021.9.0-py38h578d9bd_0.tar.bz2#edd90fe7beb39b8bd0698b1665b0c573 +https://conda.anaconda.org/conda-forge/linux-64/distributed-2021.9.1-py38h578d9bd_0.tar.bz2#6f0c5b3f37887677f1a37b0d0166de0e https://conda.anaconda.org/conda-forge/linux-64/esmf-8.1.1-mpi_mpich_h4975321_102.tar.bz2#1ee3e15fc9f1b452207d260c2be568ec 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.14-pyhd8ed1ab_0.tar.bz2#e477e8c921c2958f3d3188c5001e6244 +https://conda.anaconda.org/conda-forge/noarch/identify-2.2.15-pyhd8ed1ab_0.tar.bz2#402809b0b32ac684383051fd4ba608cd https://conda.anaconda.org/conda-forge/noarch/imagehash-4.2.1-pyhd8ed1ab_0.tar.bz2#01cc8698b6e1a124dc4f585516c27643 -https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.50.7-hc3c00ef_0.tar.bz2#63fb96444e336b3d937921223dd9a481 +https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.52.0-hc3c00ef_0.tar.bz2#146c1ede13b83b9768a3d2c04320673e https://conda.anaconda.org/conda-forge/noarch/nc-time-axis-1.3.1-pyhd8ed1ab_2.tar.bz2#d37916d7bf9519a3e3abb902a4c06b69 https://conda.anaconda.org/conda-forge/linux-64/netcdf4-1.5.7-nompi_py38h2823cc8_102.tar.bz2#cf33c43dbf1c078e1aac014d3826ec7d 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/noarch/dask-2021.9.0-pyhd8ed1ab_0.tar.bz2#40259585e9c679ac8e40b2a2fefda1b1 -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/noarch/dask-2021.9.1-pyhd8ed1ab_0.tar.bz2#91d9ea7399ae9d47d774eca36be5e51f +https://conda.anaconda.org/conda-forge/linux-64/esmpy-8.1.1-mpi_mpich_py38h9147699_101.tar.bz2#e227338d7d6b159d09bbdf09ed7410b7 https://conda.anaconda.org/conda-forge/linux-64/graphviz-2.49.0-h85b4f2f_0.tar.bz2#4a8e2fb5e3ae22825a720aaf9dcf1b5e https://conda.anaconda.org/conda-forge/linux-64/pre-commit-2.15.0-py38h578d9bd_0.tar.bz2#100bf2896c8e61ce39e323ba8f6360fd 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.6-pyhd8ed1ab_0.tar.bz2#dea5b6d93cfbfbc2a253168ad05b3f89 +https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.7-pyhd8ed1ab_0.tar.bz2#be75bab4820a56f77ba1a3fc9139c36a 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.26.0-pyhd8ed1ab_0.tar.bz2#0ed2ccbde6db9dd5789068eb7194463f -https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.4.3-py38h578d9bd_0.tar.bz2#a88165a7cbabf536cddd46db3b62e38c -https://conda.anaconda.org/conda-forge/noarch/sphinx-4.1.2-pyh6c4a22f_1.tar.bz2#b80d092c478bfc93589f9e338e78b8d2 +https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.4.3-py38h578d9bd_1.tar.bz2#649ffc3ac57ec3eb7dee817edad6f869 +https://conda.anaconda.org/conda-forge/noarch/sphinx-4.2.0-pyh6c4a22f_0.tar.bz2#ea5c6881a11a0d9c4d04f1ebae87bb34 https://conda.anaconda.org/conda-forge/noarch/sphinx-copybutton-0.4.0-pyhd8ed1ab_0.tar.bz2#80fd2cc25ad45911b4e42d5b91593e2f 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.6.0-pyhd8ed1ab_0.tar.bz2#6eec6480601f5d15babf9c3b3987f34a -https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-0.5.2-pyhd8ed1ab_1.tar.bz2#7434e891fc767cb0d39d90751720c8ec +https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-1.0.0-pyhd8ed1ab_0.tar.bz2#9f633f2f2869184e31acfeae95b24345 From 8846e5dda6b0fa0892defefd6650a423a0378587 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Thu, 30 Sep 2021 14:31:57 +0100 Subject: [PATCH 2/2] Support cartopy 0.20 and proj 8.1.0 (#4331) --- benchmarks/conda_lock_plugin.py | 5 ++- .../plot_projections_and_annotations.py | 17 +++++++--- .../test_regrid_ProjectedUnstructured.py | 17 +++++++--- .../integration/plot/test_vector_plots.py | 4 +-- lib/iris/tests/results/imagerepo.json | 27 ++++++++++------ .../cartography/project/TestAll/cube.cml | 32 +++++++++---------- .../unit/analysis/cartography/test_project.py | 4 +-- requirements/ci/py37.yml | 2 +- requirements/ci/py38.yml | 2 +- setup.cfg | 2 +- 10 files changed, 69 insertions(+), 43 deletions(-) diff --git a/benchmarks/conda_lock_plugin.py b/benchmarks/conda_lock_plugin.py index 37f28c1961..766f5ab2c4 100644 --- a/benchmarks/conda_lock_plugin.py +++ b/benchmarks/conda_lock_plugin.py @@ -31,7 +31,10 @@ def __init__(self, conf, python, requirements): super().__init__(conf, python, requirements) def _uninstall_project(self): - if self._get_installed_commit_hash(): + installed_hash = self._get_installed_commit_hash() + if installed_hash: + log.info(f"Clearing conda environment for {self.name}") + self._cache._remove_cache_dir(installed_hash) # we can only run the uninstall command if an environment has already # been made before, otherwise there is no python to use to uninstall super()._uninstall_project() diff --git a/docs/gallery_code/general/plot_projections_and_annotations.py b/docs/gallery_code/general/plot_projections_and_annotations.py index 3c45076cfb..75122591b9 100644 --- a/docs/gallery_code/general/plot_projections_and_annotations.py +++ b/docs/gallery_code/general/plot_projections_and_annotations.py @@ -61,7 +61,7 @@ def make_plot(projection_name, projection_crs): overlay_data, 20, linewidths=2.0, colors="darkgreen", linestyles="-" ) - # Draw a margin line, some way in from the border of the 'main' data... + # Draw a high resolution margin line, inset from the pcolormesh border. # First calculate rectangle corners, 7% in from each corner of the data. x_coord, y_coord = main_data.coord(axis="x"), main_data.coord(axis="y") x_start, x_end = np.min(x_coord.points), np.max(x_coord.points) @@ -70,8 +70,15 @@ def make_plot(projection_name, projection_crs): margin_fractions = np.array([margin, 1.0 - margin]) x_lower, x_upper = x_start + (x_end - x_start) * margin_fractions y_lower, y_upper = y_start + (y_end - y_start) * margin_fractions - box_x_points = x_lower + (x_upper - x_lower) * np.array([0, 1, 1, 0, 0]) - box_y_points = y_lower + (y_upper - y_lower) * np.array([0, 0, 1, 1, 0]) + steps = np.linspace(0, 1) + zeros, ones = np.zeros(steps.size), np.ones(steps.size) + x_delta, y_delta = (x_upper - x_lower), (y_upper - y_lower) + x_points = x_lower + x_delta * np.concatenate( + (steps, ones, steps[::-1], zeros) + ) + y_points = y_lower + y_delta * np.concatenate( + (zeros, steps, ones, steps[::-1]) + ) # Get the Iris coordinate sytem of the X coordinate (Y should be the same). cs_data1 = x_coord.coord_system # Construct an equivalent Cartopy coordinate reference system ("crs"). @@ -80,8 +87,8 @@ def make_plot(projection_name, projection_crs): # NOTE: the 'transform' keyword specifies a non-display coordinate system # for the plot points (as used by the "iris.plot" functions). plt.plot( - box_x_points, - box_y_points, + x_points, + y_points, transform=crs_data1, linewidth=2.0, color="white", diff --git a/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py b/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py index 7453f4426d..1ace02ea8a 100644 --- a/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py +++ b/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py @@ -68,16 +68,23 @@ def test_nearest_gnomonic_uk_domain(self): res = self.src.regrid(uk_grid, ProjectedUnstructuredNearest(crs)) self.assertArrayShapeStats( - res, (1, 6, 17, 11), 315.8873266, 11.0006664668, rtol=1e-8 + res, + (1, 6, 17, 11), + 315.8854720963427, + 11.000539210625737, + rtol=1e-8, ) self.assertArrayShapeStats( - res[:, 0], (1, 17, 11), 299.99993826, 4.1356150388e-5 + res[:, 0], + (1, 17, 11), + 299.9999985207442, + 3.53574517015874e-05, ) expected_subset = np.array( [ - [318.936829, 318.936829, 318.936829], - [318.936829, 318.936829, 318.936829], - [318.935163, 318.935163, 318.935163], + [318.92881733, 318.92881733, 318.92881733], + [318.92881733, 318.92881733, 318.92881733], + [318.92881733, 318.92881733, 318.92881733], ] ) self.assertArrayAlmostEqual( diff --git a/lib/iris/tests/integration/plot/test_vector_plots.py b/lib/iris/tests/integration/plot/test_vector_plots.py index 9dad0ddd3b..37f506bd17 100644 --- a/lib/iris/tests/integration/plot/test_vector_plots.py +++ b/lib/iris/tests/integration/plot/test_vector_plots.py @@ -155,8 +155,8 @@ def test_fail_unsupported_coord_system(self): for coord in cube.coords(): coord.coord_system = patch_coord_system re_msg = ( - "Can only plot .* lat-lon projection, .* " - "This .* translates as Cartopy.*Mercator" + r"Can only plot .* lat-lon projection, .* " + r"This .* translates as Cartopy \+proj=merc .*" ) with self.assertRaisesRegex(ValueError, re_msg): self.plot( diff --git a/lib/iris/tests/results/imagerepo.json b/lib/iris/tests/results/imagerepo.json index 35ef4d00d4..5b34364e56 100644 --- a/lib/iris/tests/results/imagerepo.json +++ b/lib/iris/tests/results/imagerepo.json @@ -23,7 +23,8 @@ "gallery_tests.test_plot_anomaly_log_colouring.TestAnomalyLogColouring.test_plot_anomaly_log_colouring.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/ec4464e185a39f93931e9b1e91696d2949dde6e63e26a47a5ad391938d9a5a0c.png", "https://scitools.github.io/test-iris-imagehash/images/v4/ecc164e78e979b19b3789b0885a564a56cc2c65e3ec69469db1bdb9a853c1e24.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/ece164e68e979b19b3781b0885a564a56ccac65e3ec69469db1bdb9a853c1e24.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/ece164e68e979b19b3781b0885a564a56ccac65e3ec69469db1bdb9a853c1e24.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/ec4464e384a39b13931a9b1c85696da968d5e6e63e26847bdbd399938d3c5a4c.png" ], "gallery_tests.test_plot_atlantic_profiles.TestAtlanticProfiles.test_plot_atlantic_profiles.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/9f8260536bd28e1320739437b5f437b0a51d66f4cc5d08fcd00fdb1c93fcb21c.png", @@ -101,11 +102,13 @@ ], "gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.2": [ "https://scitools.github.io/test-iris-imagehash/images/v4/f2c464ce9e399332e1b74ce1cc79338c6586e5b33b31b37a66c9664cc06e1a64.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/a58660ce9e739b31c93d1cc9c8df33863383e33b3f11c03f2664366cc8ee3cc1.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/a58660ce9e739b31c93d1cc9c8df33863383e33b3f11c03f2664366cc8ee3cc1.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/a58660ce9e739b31c93d1c89c8df33863783e23b3f11c07f2664366cc8ee3cc1.png" ], "gallery_tests.test_plot_orca_projection.TestOrcaProjection.test_plot_orca_projection.3": [ "https://scitools.github.io/test-iris-imagehash/images/v4/fa817a83846ea46ce539c93391de32cc86cf87a33fa168721cdb3e896e374b04.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/be817a87845ea56cec79817a919e338436a5c1e73fa16c736c4a3e816a1e6b1c.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/be817a87845ea56cec79817a919e338436a5c1e73fa16c736c4a3e816a1e6b1c.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/be817a8784dea56cec79817a919e338437a5c1e73fa16c726c4a3e816a1c6b1c.png" ], "gallery_tests.test_plot_polar_stereo.TestPolarStereo.test_plot_polar_stereo.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/ba1e615ec7e097ad961f9cb190f038e091c2c1e73f07c11f6f386b3cc1793e01.png" @@ -237,18 +240,21 @@ "https://scitools.github.io/test-iris-imagehash/images/v4/bf80e2f1c17f1d0ac457c8d619a637213749699b6bb34e3666e4b04e944d9d89.png", "https://scitools.github.io/test-iris-imagehash/images/v4/ea05392995bac6d691ce3f21666569d86a96c6360ee195cb91e8ce54953b313b.png", "https://scitools.github.io/test-iris-imagehash/images/v4/ea05392995bac6d691ea3f21666569d86a97c6320ee195cb91e8ce559539391b.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/fa1585e885ea7a1785fa7a157a177a017a1585e817a885ea85e86a1785fa7a17.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/fa1585e885ea7a1785fa7a157a177a017a1585e817a885ea85e86a1785fa7a17.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/fa81857e857e7a81857e7a817a817a817a81817e7a81857e857e857e857e7a81.png" ], "iris.tests.test_mapping.TestLimitedAreaCube.test_outline.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/fa81857e857e3e80857e7a817a817a817a81817f7a81857e857e857e857e7a81.png", "https://scitools.github.io/test-iris-imagehash/images/v4/fa81857e857e7e21857e7a817a817a857a81857a7a81857a857e857a857e7a84.png", "https://scitools.github.io/test-iris-imagehash/images/v4/fa1585e885e87a1785fa7a177a177e807a1585e85fa0857a85e86817857f6a16.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/fa1585e885e86a1785fa7a177a177e807a1585e817a885ea85e86817857f7a17.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/fa1585e885e86a1785fa7a177a177e807a1585e817a885ea85e86817857f7a17.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/fa81857e857e3e81857e7a857a817e817a81857a7a81817e857e857a857e7a81.png" ], "iris.tests.test_mapping.TestLimitedAreaCube.test_pcolormesh.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/bf81e6b1c17e1d4884bfc8df39a43720374969db69b34e26c4e4b0ca904f9d89.png", "https://scitools.github.io/test-iris-imagehash/images/v4/ea57396995a8c6d691ea3f25664569d86b16c63686ed958991ea4a549531393b.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/ea57396995a8c6d691ea3e25664569d96b16c63684e9958b91ea4a559431793b.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/ea57396995a8c6d691ea3e25664569d96b16c63684e9958b91ea4a559431793b.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/ea813b49957ec4b7917e3f60266978d97a9562366e81954a914ec6cc957a0f98.png" ], "iris.tests.test_mapping.TestLimitedAreaCube.test_scatter.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/ea053d2e916ac2d9c4d894346b24f3477acf68ad39329ed8c696e136c1ab9a71.png", @@ -619,7 +625,8 @@ ], "iris.tests.test_plot.TestPcolormesh.test_yx.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/e95e696994b196b593b19a1ec3c591c5c6e596191e4e693269336c36391a6e3a.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/e9693878969696139296c38f9bcc3474692169cb6c7339393c6cc387c78796cc.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/e9693878969696139296c38f9bcc3474692169cb6c7339393c6cc387c78796cc.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/e97a387e968596319697c3c19284a62c93ad60c36933393a6c7e793a6c6b31cd.png" ], "iris.tests.test_plot.TestPcolormesh.test_zx.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/e85e87a197a1695a97a16d5a97a17d5a97a17806785a7816685a7e86685ad687.png", @@ -648,7 +655,8 @@ ], "iris.tests.test_plot.TestPcolormeshNoBounds.test_yx.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/bc7a1c32d3c366cdc785c39986cdc78ec792e7a6960d584939793c3438703873.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/e129c7169ed638ec9ed6387196c761c665396724612dcf0d693896929ed698c9.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/e129c7169ed638ec9ed6387196c761c665396724612dcf0d693896929ed698c9.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/e96ac79796953c4c9685383996c538e69692637261696b49693ac796693ac71b.png" ], "iris.tests.test_plot.TestPcolormeshNoBounds.test_zx.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/ea1f781f95e085e895e0fd4295e095ea95a085e87a153e7e95e06a1778157a17.png", @@ -843,7 +851,8 @@ "iris.tests.test_plot.TestPlotOtherCoordSystems.test_plot_tmerc.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/e63399cd99cd64b29999335965369b262649c98c9b3966c6998d3319ccd69333.png", "https://scitools.github.io/test-iris-imagehash/images/v4/e665326d999ecc9b3319b3246666cce69b496cccccc9669923193336666699a6.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/e665326d999acc9b3319b3246666cce69b496cccccc966996719333666669986.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/e665326d999acc9b3319b3246666cce69b496cccccc966996719333666669986.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/e665326d999ecc92b399b32466269326b369cccccccd64d96199631364f33333.png" ], "iris.tests.test_plot.TestQuickplotPlot.test_t.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/83ffb5d67fd4e5962211d9c6a443da77d5389c8ed346d923d011d968dc00da48.png", diff --git a/lib/iris/tests/results/unit/analysis/cartography/project/TestAll/cube.cml b/lib/iris/tests/results/unit/analysis/cartography/project/TestAll/cube.cml index 5504f2a91f..e2a1ef2ea6 100644 --- a/lib/iris/tests/results/unit/analysis/cartography/project/TestAll/cube.cml +++ b/lib/iris/tests/results/unit/analysis/cartography/project/TestAll/cube.cml @@ -9,10 +9,10 @@ - + [nan, 62.6851802716, 39.629088106, ..., + 42.3249307728, 64.8680485778, nan], + [nan, nan, 46.2669891845, ..., 47.2804926757, + nan, nan]]" shape="(10, 10)" standard_name="latitude" units="Unit('degrees')" value_type="float64"> @@ -37,20 +37,20 @@ - + [nan, -35.1608514733, -42.5369291003, ..., + 43.052784475, 31.4703511243, nan], + [nan, nan, -15.3083916055, ..., 14.2709222711, + nan, nan]]" shape="(10, 10)" standard_name="longitude" units="Unit('degrees')" value_type="float64"> diff --git a/lib/iris/tests/unit/analysis/cartography/test_project.py b/lib/iris/tests/unit/analysis/cartography/test_project.py index 8c8f979f63..4dfa1a4a2e 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_project.py +++ b/lib/iris/tests/unit/analysis/cartography/test_project.py @@ -31,7 +31,7 @@ def low_res_4d(): class TestAll(tests.IrisTest): def setUp(self): - cs = iris.coord_systems.GeogCS(654321) + cs = iris.coord_systems.GeogCS(6371229) self.cube = iris.cube.Cube(np.zeros(25).reshape(5, 5)) self.cube.add_dim_coord( iris.coords.DimCoord( @@ -52,7 +52,7 @@ def setUp(self): 1, ) - self.tcs = iris.coord_systems.GeogCS(600000) + self.tcs = iris.coord_systems.GeogCS(6000000) def test_is_iris_coord_system(self): res, _ = project(self.cube, self.tcs) diff --git a/requirements/ci/py37.yml b/requirements/ci/py37.yml index a3b99e5ce3..30a75343cd 100644 --- a/requirements/ci/py37.yml +++ b/requirements/ci/py37.yml @@ -10,7 +10,7 @@ dependencies: - setuptools >=40.8.0 # Core dependencies. - - cartopy >=0.18 + - cartopy >=0.20 - cf-units - cftime >=1.5 - dask >=2 diff --git a/requirements/ci/py38.yml b/requirements/ci/py38.yml index 4393834207..ffc5ca9891 100644 --- a/requirements/ci/py38.yml +++ b/requirements/ci/py38.yml @@ -10,7 +10,7 @@ dependencies: - setuptools >=40.8.0 # Core dependencies. - - cartopy >=0.18 + - cartopy >=0.20 - cf-units - cftime >=1.5 - dask >=2 diff --git a/setup.cfg b/setup.cfg index b885872765..601c4fb5bf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,7 +47,7 @@ version = attr: iris.__version__ [options] include_package_data = True install_requires = - cartopy>=0.18 + cartopy>=0.20 cf-units cftime>=1.5.0 dask[array]>=2