From 2dbb4c0ac73b7f788d08e623731b6312f649e416 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Wed, 17 Mar 2021 13:55:44 -0700 Subject: [PATCH 1/6] Refactor xarray checksum logic to vcm This is generally useful for regression testing with xarray data. --- .../test_testing.test_checksum_dataarray.out | 1 + ...esting.test_checksum_dataarray_mapping.out | 1 + external/vcm/tests/test_testing.py | 17 ++++++++++++++ external/vcm/vcm/testing.py | 22 +++++++++++++++++++ .../tests/test_machine_learning.py | 18 +++++---------- 5 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 external/vcm/tests/_regtest_outputs/test_testing.test_checksum_dataarray.out create mode 100644 external/vcm/tests/_regtest_outputs/test_testing.test_checksum_dataarray_mapping.out diff --git a/external/vcm/tests/_regtest_outputs/test_testing.test_checksum_dataarray.out b/external/vcm/tests/_regtest_outputs/test_testing.test_checksum_dataarray.out new file mode 100644 index 0000000000..1c13734b30 --- /dev/null +++ b/external/vcm/tests/_regtest_outputs/test_testing.test_checksum_dataarray.out @@ -0,0 +1 @@ +a9aa230ec5c5bf71f92e77753b13023d diff --git a/external/vcm/tests/_regtest_outputs/test_testing.test_checksum_dataarray_mapping.out b/external/vcm/tests/_regtest_outputs/test_testing.test_checksum_dataarray_mapping.out new file mode 100644 index 0000000000..7a5d166651 --- /dev/null +++ b/external/vcm/tests/_regtest_outputs/test_testing.test_checksum_dataarray_mapping.out @@ -0,0 +1 @@ +[('one', 'a9aa230ec5c5bf71f92e77753b13023d'), ('two', '9a75cafb8e8600ef3aa16a87b7befc0c')] diff --git a/external/vcm/tests/test_testing.py b/external/vcm/tests/test_testing.py index be29560f2c..f8807e4402 100644 --- a/external/vcm/tests/test_testing.py +++ b/external/vcm/tests/test_testing.py @@ -2,9 +2,26 @@ import pytest from vcm import testing +import xarray def test_no_warning(): with pytest.raises(AssertionError): with testing.no_warning(None): warnings.warn("Warning") + + +def test_checksum_dataarray(regtest): + """If these checksums fail then some changed probably happened in + joblib.hash + """ + array = xarray.DataArray([1], dims=["x"]) + print(testing.checksum_dataarray(array), file=regtest) + + +def test_checksum_dataarray_mapping(regtest): + """If these checksums fail then some changed probably happened in + joblib.hash + """ + ds = xarray.Dataset({"one": ("x", [1]), "two": ("x", [2])}) + print(testing.checksum_dataarray_mapping(ds), file=regtest) diff --git a/external/vcm/vcm/testing.py b/external/vcm/vcm/testing.py index 582ed268d0..68c52fc071 100644 --- a/external/vcm/vcm/testing.py +++ b/external/vcm/vcm/testing.py @@ -1,5 +1,9 @@ +from typing import Hashable, List, Tuple, Mapping import contextlib import pytest +import numpy as np +import joblib +import xarray @contextlib.contextmanager @@ -28,3 +32,21 @@ def no_warning(*args): yield assert len(record) == 0 + + +def checksum_dataarray(xobj) -> str: + return joblib.hash(np.asarray(xobj)) + + +def checksum_dataarray_mapping( + d: Mapping[Hashable, xarray.DataArray] +) -> List[Tuple[Hashable, str]]: + """Checksum a mapping of datarrays + + Returns: + sorted list of (key, hash) combinations. This is sorted to simplify + regression testing. + + """ + sorted_keys = sorted(d.keys()) + return [(key, checksum_dataarray(d[key])) for key in sorted_keys] diff --git a/workflows/prognostic_c48_run/tests/test_machine_learning.py b/workflows/prognostic_c48_run/tests/test_machine_learning.py index cd3c096f7e..0554e61786 100644 --- a/workflows/prognostic_c48_run/tests/test_machine_learning.py +++ b/workflows/prognostic_c48_run/tests/test_machine_learning.py @@ -2,19 +2,11 @@ from machine_learning_mocks import get_mock_sklearn_model import requests import xarray as xr -import joblib -import numpy as np import yaml import pytest +import vcm.testing - -def checksum_xarray(xobj): - return joblib.hash(np.asarray(xobj)) - - -def checksum_xarray_dict(d): - sorted_keys = sorted(d.keys()) - return [(key, checksum_xarray(d[key])) for key in sorted_keys] +# TODO fix this import @pytest.fixture(scope="session") @@ -35,7 +27,7 @@ def test_PureMLStepper_schema_unchanged(state, regtest): def test_state_regression(state, regtest): - checksum = checksum_xarray_dict(state) + checksum = vcm.testing.checksum_dataarray_mapping(state) print(checksum, file=regtest) @@ -45,8 +37,8 @@ def test_PureMLStepper_regression_checksum(state, regtest): (tendencies, diagnostics, _,) = PureMLStepper(model, timestep)(None, state) checksums = yaml.safe_dump( [ - ("tendencies", checksum_xarray_dict(tendencies)), - ("diagnostics", checksum_xarray_dict(diagnostics)), + ("tendencies", vcm.testing.checksum_dataarray_mapping(tendencies)), + ("diagnostics", vcm.testing.checksum_dataarray_mapping(diagnostics)), ] ) From 212015eac4fdb19cd4ba2f38e0ed15dae69aa71b Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Wed, 17 Mar 2021 13:57:38 -0700 Subject: [PATCH 2/6] Remove skimage dependence in test suite Previously, the block_reduce tested the function by duplicating its implementation. This refactors this test to test for regressions using checksums. --- ...ray_block_reduce_dataarray[False-mean].out | 1 + ...y_block_reduce_dataarray[False-median].out | 1 + ...rray_block_reduce_dataarray[True-mean].out | 1 + ...ay_block_reduce_dataarray[True-median].out | 1 + external/vcm/tests/test_cubedsphere.py | 21 +++++-------------- 5 files changed, 9 insertions(+), 16 deletions(-) create mode 100644 external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-mean].out create mode 100644 external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-median].out create mode 100644 external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-mean].out create mode 100644 external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-median].out diff --git a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-mean].out b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-mean].out new file mode 100644 index 0000000000..4827d90644 --- /dev/null +++ b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-mean].out @@ -0,0 +1 @@ +919ca49721b5b0a8628f273067a8fb4f diff --git a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-median].out b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-median].out new file mode 100644 index 0000000000..4827d90644 --- /dev/null +++ b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-median].out @@ -0,0 +1 @@ +919ca49721b5b0a8628f273067a8fb4f diff --git a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-mean].out b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-mean].out new file mode 100644 index 0000000000..4827d90644 --- /dev/null +++ b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-mean].out @@ -0,0 +1 @@ +919ca49721b5b0a8628f273067a8fb4f diff --git a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-median].out b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-median].out new file mode 100644 index 0000000000..4827d90644 --- /dev/null +++ b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-median].out @@ -0,0 +1 @@ +919ca49721b5b0a8628f273067a8fb4f diff --git a/external/vcm/tests/test_cubedsphere.py b/external/vcm/tests/test_cubedsphere.py index a0ca039a28..bc4608f792 100644 --- a/external/vcm/tests/test_cubedsphere.py +++ b/external/vcm/tests/test_cubedsphere.py @@ -1,7 +1,6 @@ import numpy as np import pytest import xarray as xr -from skimage.measure import block_reduce as skimage_block_reduce import xgcm from vcm.cubedsphere.coarsen import ( @@ -30,6 +29,7 @@ from vcm.cubedsphere.io import all_filenames from vcm.cubedsphere import create_fv3_grid from vcm.xarray_utils import assert_identical_including_dtype +import vcm.testing def remove_duplicate_coords(ds): @@ -260,27 +260,16 @@ def input_dataset(input_dataarray): @pytest.mark.parametrize("reduction_function", [np.mean, np.median]) @pytest.mark.parametrize("use_dask", [False, True]) -def test_xarray_block_reduce_dataarray(reduction_function, use_dask, input_dataarray): - block_size = (2, 2, 1) - expected_data = skimage_block_reduce( - input_dataarray.values, block_size=block_size, func=reduction_function - ) - expected = xr.DataArray( - expected_data, - dims=input_dataarray.dims, - coords=None, - name="foo", - attrs={"units": "m"}, - ) - +def test_xarray_block_reduce_dataarray( + reduction_function, use_dask, input_dataarray, regtest +): if use_dask: input_dataarray = input_dataarray.chunk({"x": 2, "y": 2, "z": -1}) - block_sizes = {"x": 2, "y": 2} result = _xarray_block_reduce_dataarray( input_dataarray, block_sizes, reduction_function ) - assert_identical_including_dtype(result, expected) + print(vcm.testing.checksum_dataarray(result), file=regtest) def test_xarray_block_reduce_dataarray_bad_chunk_size(input_dataarray): From 19fdb81ec94703ebca2735eba2ef98fa383ee11c Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Wed, 17 Mar 2021 15:21:17 -0700 Subject: [PATCH 3/6] Vendorize the scikit-image code --- constraints.txt | 1 - environment.yml | 2 - external/fv3fit/requirements.txt | 2 - external/vcm/setup.py | 2 - external/vcm/vcm/cubedsphere/_skimage.py | 202 ++++++++++++++++++ external/vcm/vcm/cubedsphere/coarsen.py | 2 +- .../examples/diagnostics_to_zarr/setup.py | 1 - workflows/dataflow/setup.py | 2 - workflows/fine_res_budget/poetry.lock | 1 - 9 files changed, 203 insertions(+), 12 deletions(-) create mode 100644 external/vcm/vcm/cubedsphere/_skimage.py diff --git a/constraints.txt b/constraints.txt index 9a826e171d..cfad6d2f7b 100644 --- a/constraints.txt +++ b/constraints.txt @@ -200,7 +200,6 @@ requests-oauthlib==1.3.0 requests-toolbelt==0.8.0 requests==2.24.0 rsa==4.6 -scikit-image==0.16.2 scikit-learn==0.22.1 scipy==1.5.4 send2trash==1.5.0 diff --git a/environment.yml b/environment.yml index 5d94326fd0..031c6b0dfe 100644 --- a/environment.yml +++ b/environment.yml @@ -27,12 +27,10 @@ dependencies: - numba - numpy - partd - - pooch==1.1.1 - pyyaml==5.3 - pytest - pytest-mpl - python-kubernetes - - scikit-image - scikit-learn - scipy >= 1.5.0 - toolz diff --git a/external/fv3fit/requirements.txt b/external/fv3fit/requirements.txt index 436ef7aa3c..a2cb95941c 100644 --- a/external/fv3fit/requirements.txt +++ b/external/fv3fit/requirements.txt @@ -61,7 +61,6 @@ partd Pillow Pint pluggy -pooch py pyarrow pyasn1 @@ -73,7 +72,6 @@ PyWavelets requests requests-oauthlib rsa -scikit-image scipy >= 1.5.0 six traitlets diff --git a/external/vcm/setup.py b/external/vcm/setup.py index b5e4695e1a..8bcef9d140 100644 --- a/external/vcm/setup.py +++ b/external/vcm/setup.py @@ -17,9 +17,7 @@ "xarray", "toolz", "scipy", - "scikit-image", "metpy", - "pooch==1.1.1", "intake", "gcsfs", "zarr", diff --git a/external/vcm/vcm/cubedsphere/_skimage.py b/external/vcm/vcm/cubedsphere/_skimage.py new file mode 100644 index 0000000000..60b13a9b28 --- /dev/null +++ b/external/vcm/vcm/cubedsphere/_skimage.py @@ -0,0 +1,202 @@ +""" +Vendorized scikit-image code. + +From https://github.com/scikit-image/scikit-image/tree/a69d49272145d9839df75f3ee398c0bbde32f448/skimage/util # noqa + + +## License (Modified BSD) + +Copyright (C) 2011, the scikit-image team +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. Neither the name of skimage nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +""" +import numpy as np +from numpy.lib.stride_tricks import as_strided + + +def view_as_blocks(arr_in, block_shape): + """Block view of the input n-dimensional array (using re-striding). + Blocks are non-overlapping views of the input array. + Parameters + ---------- + arr_in : ndarray + N-d input array. + block_shape : tuple + The shape of the block. Each dimension must divide evenly into the + corresponding dimensions of `arr_in`. + Returns + ------- + arr_out : ndarray + Block view of the input array. + Examples + -------- + >>> import numpy as np + >>> from skimage.util.shape import view_as_blocks + >>> A = np.arange(4*4).reshape(4,4) + >>> A + array([[ 0, 1, 2, 3], + [ 4, 5, 6, 7], + [ 8, 9, 10, 11], + [12, 13, 14, 15]]) + >>> B = view_as_blocks(A, block_shape=(2, 2)) + >>> B[0, 0] + array([[0, 1], + [4, 5]]) + >>> B[0, 1] + array([[2, 3], + [6, 7]]) + >>> B[1, 0, 1, 1] + 13 + >>> A = np.arange(4*4*6).reshape(4,4,6) + >>> A # doctest: +NORMALIZE_WHITESPACE + array([[[ 0, 1, 2, 3, 4, 5], + [ 6, 7, 8, 9, 10, 11], + [12, 13, 14, 15, 16, 17], + [18, 19, 20, 21, 22, 23]], + [[24, 25, 26, 27, 28, 29], + [30, 31, 32, 33, 34, 35], + [36, 37, 38, 39, 40, 41], + [42, 43, 44, 45, 46, 47]], + [[48, 49, 50, 51, 52, 53], + [54, 55, 56, 57, 58, 59], + [60, 61, 62, 63, 64, 65], + [66, 67, 68, 69, 70, 71]], + [[72, 73, 74, 75, 76, 77], + [78, 79, 80, 81, 82, 83], + [84, 85, 86, 87, 88, 89], + [90, 91, 92, 93, 94, 95]]]) + >>> B = view_as_blocks(A, block_shape=(1, 2, 2)) + >>> B.shape + (4, 2, 3, 1, 2, 2) + >>> B[2:, 0, 2] # doctest: +NORMALIZE_WHITESPACE + array([[[[52, 53], + [58, 59]]], + [[[76, 77], + [82, 83]]]]) + """ + if not isinstance(block_shape, tuple): + raise TypeError("block needs to be a tuple") + + block_shape = np.array(block_shape) + if (block_shape <= 0).any(): + raise ValueError("'block_shape' elements must be strictly positive") + + if block_shape.size != arr_in.ndim: + raise ValueError("'block_shape' must have the same length " "as 'arr_in.shape'") + + arr_shape = np.array(arr_in.shape) + if (arr_shape % block_shape).sum() != 0: + raise ValueError("'block_shape' is not compatible with 'arr_in'") + + # -- restride the array to build the block view + new_shape = tuple(arr_shape // block_shape) + tuple(block_shape) + new_strides = tuple(arr_in.strides * block_shape) + arr_in.strides + + arr_out = as_strided(arr_in, shape=new_shape, strides=new_strides) + + return arr_out + + +def block_reduce(image, block_size, func=np.sum, cval=0, func_kwargs=None): + """Downsample image by applying function `func` to local blocks. + This function is useful for max and mean pooling, for example. + Parameters + ---------- + image : ndarray + N-dimensional input image. + block_size : array_like + Array containing down-sampling integer factor along each axis. + func : callable + Function object which is used to calculate the return value for each + local block. This function must implement an ``axis`` parameter. + Primary functions are ``numpy.sum``, ``numpy.min``, ``numpy.max``, + ``numpy.mean`` and ``numpy.median``. See also `func_kwargs`. + cval : float + Constant padding value if image is not perfectly divisible by the + block size. + func_kwargs : dict + Keyword arguments passed to `func`. Notably useful for passing dtype + argument to ``np.mean``. Takes dictionary of inputs, e.g.: + ``func_kwargs={'dtype': np.float16})``. + Returns + ------- + image : ndarray + Down-sampled image with same number of dimensions as input image. + Examples + -------- + >>> from skimage.measure import block_reduce + >>> image = np.arange(3*3*4).reshape(3, 3, 4) + >>> image # doctest: +NORMALIZE_WHITESPACE + array([[[ 0, 1, 2, 3], + [ 4, 5, 6, 7], + [ 8, 9, 10, 11]], + [[12, 13, 14, 15], + [16, 17, 18, 19], + [20, 21, 22, 23]], + [[24, 25, 26, 27], + [28, 29, 30, 31], + [32, 33, 34, 35]]]) + >>> block_reduce(image, block_size=(3, 3, 1), func=np.mean) + array([[[16., 17., 18., 19.]]]) + >>> image_max1 = block_reduce(image, block_size=(1, 3, 4), func=np.max) + >>> image_max1 # doctest: +NORMALIZE_WHITESPACE + array([[[11]], + [[23]], + [[35]]]) + >>> image_max2 = block_reduce(image, block_size=(3, 1, 4), func=np.max) + >>> image_max2 # doctest: +NORMALIZE_WHITESPACE + array([[[27], + [31], + [35]]]) + """ + + if len(block_size) != image.ndim: + raise ValueError("`block_size` must have the same length " "as `image.shape`.") + + if func_kwargs is None: + func_kwargs = {} + + pad_width = [] + for i in range(len(block_size)): + if block_size[i] < 1: + raise ValueError( + "Down-sampling factors must be >= 1. Use " + "`skimage.transform.resize` to up-sample an " + "image." + ) + if image.shape[i] % block_size[i] != 0: + after_width = block_size[i] - (image.shape[i] % block_size[i]) + else: + after_width = 0 + pad_width.append((0, after_width)) + + image = np.pad(image, pad_width=pad_width, mode="constant", constant_values=cval) + + blocked = view_as_blocks(image, block_size) + + return func(blocked, axis=tuple(range(image.ndim, blocked.ndim)), **func_kwargs) diff --git a/external/vcm/vcm/cubedsphere/coarsen.py b/external/vcm/vcm/cubedsphere/coarsen.py index e10b2350e7..3c1f5d8537 100644 --- a/external/vcm/vcm/cubedsphere/coarsen.py +++ b/external/vcm/vcm/cubedsphere/coarsen.py @@ -18,7 +18,7 @@ import numpy as np import scipy.stats import xarray as xr -from skimage.measure import block_reduce as skimage_block_reduce +from ._skimage import block_reduce as skimage_block_reduce from .. import xarray_utils from vcm.cubedsphere.constants import COORD_X_OUTER, COORD_Y_OUTER diff --git a/workflows/dataflow/examples/diagnostics_to_zarr/setup.py b/workflows/dataflow/examples/diagnostics_to_zarr/setup.py index c3a9ce0b00..744c26ba00 100644 --- a/workflows/dataflow/examples/diagnostics_to_zarr/setup.py +++ b/workflows/dataflow/examples/diagnostics_to_zarr/setup.py @@ -9,7 +9,6 @@ "google-cloud-storage", "intake", "numba", - "scikit-image", "netCDF4", "xarray==0.15.0", "partd", diff --git a/workflows/dataflow/setup.py b/workflows/dataflow/setup.py index a8b4bf6127..a2e6f6d928 100644 --- a/workflows/dataflow/setup.py +++ b/workflows/dataflow/setup.py @@ -6,9 +6,7 @@ "fsspec==0.7.1", "gcsfs==0.6.1", "intake==0.5.4", - "scikit-image==0.16.2", "MetPy==0.12.0", - "pooch", "toolz==0.10.0", "xarray==0.15.1", "xgcm==0.3.0", diff --git a/workflows/fine_res_budget/poetry.lock b/workflows/fine_res_budget/poetry.lock index fc3bdb5a65..a56f0b6e61 100644 --- a/workflows/fine_res_budget/poetry.lock +++ b/workflows/fine_res_budget/poetry.lock @@ -843,7 +843,6 @@ matplotlib = ">=2.1.0" numpy = ">=1.16.0" pandas = ">=0.22.0" pint = ">=0.10.1" -pooch = ">=0.1" scipy = ">=1.0" traitlets = ">=4.3.0" xarray = ">=0.13.0" From 3f3843c001c8cd4f176dea9ec38d41e18f155233 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Wed, 17 Mar 2021 15:34:49 -0700 Subject: [PATCH 4/6] Remove todo --- workflows/prognostic_c48_run/tests/test_machine_learning.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/workflows/prognostic_c48_run/tests/test_machine_learning.py b/workflows/prognostic_c48_run/tests/test_machine_learning.py index 0554e61786..565684c39a 100644 --- a/workflows/prognostic_c48_run/tests/test_machine_learning.py +++ b/workflows/prognostic_c48_run/tests/test_machine_learning.py @@ -6,8 +6,6 @@ import pytest import vcm.testing -# TODO fix this import - @pytest.fixture(scope="session") def state(tmp_path_factory): From 89d739c4a9b51663439360c7fdcee943b5d428d5 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Wed, 17 Mar 2021 15:46:30 -0700 Subject: [PATCH 5/6] Update lock files --- conda-linux-64.lock | 111 ++++++++++------------- conda-osx-64.lock | 121 +++++++++++--------------- conda-win-64.lock | 115 ++++++++++-------------- environment.yml | 1 - external/vcm/setup.py | 1 + workflows/fine_res_budget/poetry.lock | 1 + 6 files changed, 141 insertions(+), 209 deletions(-) diff --git a/conda-linux-64.lock b/conda-linux-64.lock index 7a1f2b94bb..2913cbb828 100644 --- a/conda-linux-64.lock +++ b/conda-linux-64.lock @@ -1,39 +1,30 @@ # platform: linux-64 -# env_hash: ce018920778a05d78ef71f33a8005160198f5cfaaadf050c41b15c3f34429179 +# env_hash: 2661ffcb04e9e2e04445d13a52a8f24f7ed18b2f98de80a2c70090c8fc729177 @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/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_18.tar.bz2#86a1cade1bc2b99a6419ba980f730bff https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-9.3.0-h6de172a_18.tar.bz2#2f03cd1e5c966d4af5822c7ae089ab03 -https://conda.anaconda.org/conda-forge/linux-64/pandoc-2.11.4-h7f98852_0.tar.bz2#1c827fa4db40e5e92c2619ba8fe30500 +https://conda.anaconda.org/conda-forge/linux-64/pandoc-2.12-h7f98852_0.tar.bz2#21d4ae04f0c60b1e1150ded8ac24b4c2 https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-9.3.0-hff62375_18.tar.bz2#db417845fae12a62b6720f09f51ab6a7 https://conda.anaconda.org/conda-forge/linux-64/libgomp-9.3.0-h2828fa1_18.tar.bz2#fc7a2a7e6a741c8afdd764715ac7039d https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-1_gnu.tar.bz2#561e277319a41d4f24f5c05a9ef63c04 https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-9.3.0-h2828fa1_18.tar.bz2#5a9490c49a3505a6d19bda012cde6ad3 -https://conda.anaconda.org/conda-forge/linux-64/blosc-1.21.0-h9c3ff4c_0.tar.bz2#5e815e5126c6f7e34ab4496fa1b48dca -https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h9c3ff4c_4.tar.bz2#f4f75dc7038aaeb6eaae16a5ef5350b3 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-h36c2ea0_0.tar.bz2#1aa683618a2df66800d568409d6841d1 -https://conda.anaconda.org/conda-forge/linux-64/charls-2.2.0-h9c3ff4c_0.tar.bz2#bc0a1a5c99af57d2821914ab074797f9 -https://conda.anaconda.org/conda-forge/linux-64/geos-3.9.1-h9c3ff4c_0.tar.bz2#05530b5a788605eb45cbc4b7b4780fcb -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/c-ares-1.17.1-h7f98852_1.tar.bz2#ed1dc233ed5e3eaa9bfbaac64d130c5e +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/gmp-6.2.1-h58526e2_0.tar.bz2#b94cf2db16066b242ebd26db2facbd56 https://conda.anaconda.org/conda-forge/linux-64/icu-67.1-he1b5a44_0.tar.bz2#7ced6a5e5c94726af797d2b5a2b09228 https://conda.anaconda.org/conda-forge/linux-64/jpeg-9d-h36c2ea0_0.tar.bz2#ea02ce6037dbe81803ae6123e5ba1568 -https://conda.anaconda.org/conda-forge/linux-64/jxrlib-1.1-h7f98852_2.tar.bz2#8e787b08fe19986d99d034b839df2961 https://conda.anaconda.org/conda-forge/linux-64/lame-3.100-h7f98852_1001.tar.bz2#60939f1940312bba87bb2e4da5032f99 -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/libaec-1.0.4-h9c3ff4c_1.tar.bz2#90dbd3066828b76fa810578e49cef920 -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/libiconv-1.16-h516909a_0.tar.bz2#5c0f338a513a2943c659ae619fca9211 https://conda.anaconda.org/conda-forge/linux-64/liblief-0.10.1-he1b5a44_2.tar.bz2#6dcf6265e59105e5e80185f1a95d33c7 https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.12-pthreads_h4812303_1.tar.bz2#2c7126a584f05e7bc8885d64dad3d21a https://conda.anaconda.org/conda-forge/linux-64/libsodium-1.0.18-h36c2ea0_1.tar.bz2#c3788462a6fbddafdb413a9f9053e58d -https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.2.0-h7f98852_0.tar.bz2#747d8f09e5340bc40480eb765903ec97 -https://conda.anaconda.org/conda-forge/linux-64/libzopfli-1.0.3-h9c3ff4c_0.tar.bz2#c66fe2d123249af7651ebde8984c51c2 +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/lzo-2.10-h516909a_1000.tar.bz2#bb14fcb13341b81d5eb386423b9d2bac https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.2-h58526e2_4.tar.bz2#509f2a21c4a09214cd737a480dfd80c9 @@ -41,13 +32,10 @@ https://conda.anaconda.org/conda-forge/linux-64/nettle-3.6-he412f7d_0.tar.bz2#f0 https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1j-h7f98852_0.tar.bz2#f91545bee2ac8cf86f1dc53e55a7bb2b https://conda.anaconda.org/conda-forge/linux-64/patchelf-0.11-he1b5a44_0.tar.bz2#da683ac27e9d838254e01639868a5a3e https://conda.anaconda.org/conda-forge/linux-64/ripgrep-12.1.1-h516909a_1.tar.bz2#c15785868032b2612c3719dcd44108ad -https://conda.anaconda.org/conda-forge/linux-64/snappy-1.1.8-he1b5a44_3.tar.bz2#83f1dc295c711bdbaf97e1f3bedf2f52 https://conda.anaconda.org/conda-forge/linux-64/x264-1!161.3030-h7f98852_0.tar.bz2#ccb6ae522c34d482b98afa3530f631a3 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/zfp-0.5.5-h9c3ff4c_4.tar.bz2#d93d7bb8ec66c5530ee3b6b4ec52b354 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/brunsli-0.1-h9c3ff4c_0.tar.bz2#c1ac6229d0bfd14f8354ff9ad2a26cad https://conda.anaconda.org/conda-forge/linux-64/gnutls-3.6.13-h85f3911_1.tar.bz2#7d1b6fff16c1431d96cb4934938799fd https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.13-h10796ff_1004.tar.bz2#aa1b96c7801b4876bb40f46f4d519836 https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-8_openblas.tar.bz2#95cee6371a5b901797075040941171f3 @@ -55,13 +43,13 @@ https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2. https://conda.anaconda.org/conda-forge/linux-64/libllvm10-10.0.1-he513fc3_3.tar.bz2#b1c57947b2a9231e0cd037ab0ed96b5d 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-hab1572f_5.tar.bz2#18aaa1bd2238ae2b5e89591046973123 +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/libxml2-2.9.10-h68273f3_2.tar.bz2#0315cae0468a1e17f1e7fad5b13d53f8 https://conda.anaconda.org/conda-forge/linux-64/openh264-2.1.1-h780b84a_0.tar.bz2#034a6f90f1bbc7ba11d04b84ec9d74c8 https://conda.anaconda.org/conda-forge/linux-64/readline-8.0-he28a2e2_2.tar.bz2#4d0ae8d473f863696088f76800ef9d38 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/zeromq-4.3.4-h9c3ff4c_0.tar.bz2#9105c7da67ebfb39ff08e2a8ea72bb71 -https://conda.anaconda.org/conda-forge/linux-64/zstd-1.4.8-ha95c52a_1.tar.bz2#ed4dbbaf7d81423678632bf982f45ede +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/libarchive-3.5.1-h3f442fb_1.tar.bz2#1579ccb4f14593e95627bcdb29af953a @@ -72,8 +60,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libxslt-1.1.33-hf705e74_1.tar.bz https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.34.0-h74cdb3f_0.tar.bz2#0a83e21e8c1929cc9a1e21ebb2459fc5 https://conda.anaconda.org/conda-forge/linux-64/ffmpeg-4.3.1-hca11adc_2.tar.bz2#94b778570f9a32e630701de15e9c7abb 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.71.1-hcdd3856_8.tar.bz2#2c81fb9f0d82c04b08617fc73eb615af -https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.4.0-hf7af979_0.tar.bz2#f677c4652b03ed5d1352bf976be7192c +https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.75.0-hc4aaa36_0.tar.bz2#7283260c001a5f62d831b6c660c5afe7 https://conda.anaconda.org/conda-forge/linux-64/python-3.7.10-hffdb5ce_100_cpython.tar.bz2#7425fffa658971915f595e9110163c3c https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b https://conda.anaconda.org/conda-forge/noarch/asciitree-0.3.3-py_2.tar.bz2#c0481c9de49f040272556e2cedf42816 @@ -84,19 +71,19 @@ https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz https://conda.anaconda.org/conda-forge/noarch/backoff-1.10.0-py_0.tar.bz2#e59e9185ec7c2937a46c1aa1b17642b7 https://conda.anaconda.org/conda-forge/noarch/backports-1.0-py_2.tar.bz2#0da16b293affa6ac31812376f8eb79dd https://conda.anaconda.org/conda-forge/noarch/blinker-1.4-py_1.tar.bz2#fa509a09190583f869ae442bf4d17f5f -https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.1-py_0.tar.bz2#a5773589b22d6d4f6201fb7c261bf77f +https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a https://conda.anaconda.org/conda-forge/noarch/cachetools-4.2.1-pyhd8ed1ab_0.tar.bz2#c48f5ea63f27d8ede4117b6d99c6142b 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/crcmod-1.7-pyhd8ed1ab_1005.tar.bz2#9158f567c19ae53083b7207a086d8347 https://conda.anaconda.org/conda-forge/noarch/cssselect-1.1.0-py_0.tar.bz2#c2b0104cc7d2ef771a40281a26524b87 -https://conda.anaconda.org/conda-forge/linux-64/curl-7.71.1-he644dc0_8.tar.bz2#7fadfa44182e1cc0dbbe0c169c0b15cc +https://conda.anaconda.org/conda-forge/linux-64/curl-7.75.0-h979ede3_0.tar.bz2#39afe69f0df2dbdc81663666e0559bf8 https://conda.anaconda.org/conda-forge/noarch/decorator-4.4.2-py_0.tar.bz2#d2eabb9cabd212e1ec6a9463bd846243 -https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.6.0-py_0.tar.bz2#37e1033daee0e2edaa5ff42584c52b21 +https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2 https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.3-pyhd8ed1ab_1003.tar.bz2#bbf9a201f6ce99a506f4955374d9a9f4 https://conda.anaconda.org/conda-forge/noarch/f90nml-1.2-pyh9f0ad1d_0.tar.bz2#1969f3ac0952e50b2ba35a05c11129de https://conda.anaconda.org/conda-forge/noarch/filelock-3.0.12-pyh9f0ad1d_0.tar.bz2#7544ed05bbbe9bb687bc9bcbe4d6cb46 -https://conda.anaconda.org/conda-forge/noarch/fsspec-0.8.5-pyhd8ed1ab_0.tar.bz2#6f86dae0901b373f96b7e92768ef6ebe +https://conda.anaconda.org/conda-forge/noarch/fsspec-0.8.7-pyhd8ed1ab_0.tar.bz2#b93ab5a4692ba685b455f0e8e5dc93e4 https://conda.anaconda.org/conda-forge/noarch/glob2-0.7-py_0.tar.bz2#1f3a88e65e61216e1d475135922dbf6a https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.10.6-nompi_h6a2412b_1114.tar.bz2#0a2984b78f51148d7ff6219abe73509e https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95 @@ -138,28 +125,29 @@ https://conda.anaconda.org/conda-forge/noarch/testpath-0.4.4-py_0.tar.bz2#3b98ff https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-2.1.0-pyh5ca1d4c_0.tar.bz2#9eb32b63458380aa3804de519b6e5749 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/tqdm-4.57.0-pyhd8ed1ab_0.tar.bz2#d9b5df7cfaf4d7ac83d1cf3aba52cfd1 +https://conda.anaconda.org/conda-forge/noarch/tqdm-4.59.0-pyhd8ed1ab_0.tar.bz2#9ae6fb908a7f989e59a02fef85a5fd6f 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/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136 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.0-py_0.tar.bz2#0df927d2e46244cef8fd75d7ec2ba51c +https://conda.anaconda.org/conda-forge/noarch/zipp-3.4.1-pyhd8ed1ab_0.tar.bz2#a4fa30eb74a326092b3d8078b1f1aae1 https://conda.anaconda.org/conda-forge/noarch/babel-2.9.0-pyhd3deb0d_0.tar.bz2#1cb532c9a6fd4e56a9f0906b87c17b76 https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.9.3-pyhb0f4dca_0.tar.bz2#d243a293d7303ab6195d96ce8c16b1cb +https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551 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/cffi-1.14.5-py37hc58025e_0.tar.bz2#e05f1fad0c52c21b6b92778d31f89cd0 -https://conda.anaconda.org/conda-forge/linux-64/chardet-3.0.4-py37he5f6b98_1008.tar.bz2#2f4cf1309df625c3eb0314a170fb9593 +https://conda.anaconda.org/conda-forge/linux-64/chardet-4.0.0-py37h89c1867_1.tar.bz2#f4fbd4721b80f0d6b53b3a3374914068 https://conda.anaconda.org/conda-forge/linux-64/conda-package-handling-1.7.2-py37hb5d75c8_0.tar.bz2#f339f7aca7602c5ca609ccad0162d651 -https://conda.anaconda.org/conda-forge/linux-64/coverage-5.4-py37h5e8e339_0.tar.bz2#e6ae2d570a84e7991e7d4be9ede77583 +https://conda.anaconda.org/conda-forge/linux-64/coverage-5.5-py37h5e8e339_0.tar.bz2#17c44ef3124f48c92ed77744ec4a9b12 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-py37h5e8e339_3.tar.bz2#2e89a6f3baf5eeb13763f61ea3d0601f https://conda.anaconda.org/conda-forge/noarch/docrep-0.2.7-py_0.tar.bz2#7a8411a58c16dffe32424251e62e3149 https://conda.anaconda.org/conda-forge/noarch/fasteners-0.14.1-py_3.tar.bz2#8af0bf3cfe806fb001d9923b4fe1594b https://conda.anaconda.org/conda-forge/linux-64/future-0.18.2-py37h89c1867_3.tar.bz2#1f5b95fabd80a6d0cd3e833e182cb6b9 -https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-3.4.0-py37h89c1867_0.tar.bz2#d3807b35a6a38d7194f81172705a1da7 +https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-3.7.3-py37h89c1867_0.tar.bz2#347a69168ac58089e8bb92196bfe2e2c https://conda.anaconda.org/conda-forge/linux-64/jedi-0.18.0-py37h89c1867_2.tar.bz2#5e95b453f199caec4dd1bf6002ae0ce2 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.7.4-nompi_h56d31a8_107.tar.bz2#ef3d349e818876a175de7d87bd6451df -https://conda.anaconda.org/conda-forge/linux-64/llvmlite-0.35.0-py37h9d7f4d0_1.tar.bz2#5544c7a11dc7737f9e43a5cf726b0b89 +https://conda.anaconda.org/conda-forge/linux-64/llvmlite-0.36.0-py37h9d7f4d0_0.tar.bz2#8e333fd35f32fd48850476bb9806ba42 https://conda.anaconda.org/conda-forge/linux-64/lxml-4.6.2-py37h77fd288_1.tar.bz2#b51ff39aef45960eedbb836054d6f9bb 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/mistune-0.8.4-py37h5e8e339_1003.tar.bz2#6a636219f0f50dab2c327237e95f98c7 @@ -170,7 +158,7 @@ https://conda.anaconda.org/conda-forge/linux-64/numpy-1.20.1-py37haa41c4c_0.tar. https://conda.anaconda.org/conda-forge/noarch/packaging-20.9-pyh44b312d_0.tar.bz2#be69a38e912054a62dc82cc3c7711a64 https://conda.anaconda.org/conda-forge/noarch/partd-1.1.0-py_0.tar.bz2#4afbf2cdf4e6ad279080d3adb5cefaae https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh9f0ad1d_2.tar.bz2#5909e7b978141dd80d28dbf9de627827 -https://conda.anaconda.org/conda-forge/linux-64/pillow-8.1.0-py37h4600e1f_2.tar.bz2#cfea63a7cf332388753e6d69138dccf8 +https://conda.anaconda.org/conda-forge/linux-64/pillow-8.1.2-py37h4600e1f_0.tar.bz2#e3c603a26c7ccc1f550c037275b62173 https://conda.anaconda.org/conda-forge/linux-64/psutil-5.8.0-py37h5e8e339_1.tar.bz2#2923250371b05e798f3732531cdb5300 https://conda.anaconda.org/conda-forge/linux-64/py-lief-0.10.1-py37hb892b2f_2.tar.bz2#4f7920fb33c65860b3bc2f9bbd019714 https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c @@ -182,9 +170,9 @@ https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.1-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/python-libarchive-c-2.9-py37h89c1867_2.tar.bz2#f1045e994ae3203f0618722aff89a1ac https://conda.anaconda.org/conda-forge/noarch/pyviz_comms-2.0.1-pyhd3deb0d_0.tar.bz2#12e4d3289ffcbdf465864af6eb2c6f4b https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.3-py37h8f50634_1.tar.bz2#a984d3bc9bc6198c85f6069d75b17508 -https://conda.anaconda.org/conda-forge/linux-64/pyzmq-22.0.3-py37h499b945_0.tar.bz2#99a5bc0205976e5dcc706554a6bac5ce +https://conda.anaconda.org/conda-forge/linux-64/pyzmq-22.0.3-py37h336d617_1.tar.bz2#798e421f018bba8ef90546e447e11060 https://conda.anaconda.org/conda-forge/linux-64/regex-2020.11.13-py37h5e8e339_1.tar.bz2#e2c17616c22bb120a42afdf91d7b1ec1 -https://conda.anaconda.org/conda-forge/noarch/rsa-4.7.1-pyh44b312d_0.tar.bz2#ff8e0c6a909a84c9496762fa5d438c8c +https://conda.anaconda.org/conda-forge/noarch/rsa-4.7.2-pyh44b312d_0.tar.bz2#3452ab3790dbb1df9508b3fa4ea2f806 https://conda.anaconda.org/conda-forge/linux-64/ruamel_yaml-0.15.80-py37h5e8e339_1004.tar.bz2#0c520ba7aa566aec5c41012df4edbb65 https://conda.anaconda.org/conda-forge/linux-64/sniffio-1.2.0-py37h89c1867_1.tar.bz2#a48a71b3c0a40b5227056a7cb653d99d https://conda.anaconda.org/conda-forge/linux-64/tornado-6.1-py37h5e8e339_1.tar.bz2#92449128c4639feae48d731ef2186099 @@ -193,79 +181,69 @@ https://conda.anaconda.org/conda-forge/linux-64/typed-ast-1.4.2-py37h5e8e339_0.t https://conda.anaconda.org/conda-forge/noarch/typing-extensions-3.7.4.3-0.tar.bz2#36bdcdb4c2bf1efb987f2e9e80f4c9a6 https://conda.anaconda.org/conda-forge/linux-64/websocket-client-0.57.0-py37h89c1867_4.tar.bz2#b7d10c52e3aaca152f4e16f90e40cd55 https://conda.anaconda.org/conda-forge/noarch/zict-2.0.0-py_0.tar.bz2#4750152be22f24d695b3004c5e1712d3 -https://conda.anaconda.org/conda-forge/linux-64/anyio-2.1.0-py37h89c1867_0.tar.bz2#6f1331894e5fd4a34967f08f5d739ab1 +https://conda.anaconda.org/conda-forge/linux-64/anyio-2.2.0-py37h89c1867_0.tar.bz2#a082290cb8d4e7047e6ade7302debd99 https://conda.anaconda.org/conda-forge/linux-64/argon2-cffi-20.1.0-py37h5e8e339_2.tar.bz2#5403470dcc6211e0ad72077616e2519d https://conda.anaconda.org/conda-forge/noarch/black-19.10b0-py_4.tar.bz2#ae8375ed2a4c1c67966ab08dc44d96a3 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.4.1-py37h902c9e0_0.tar.bz2#8ebdfca0cb2576e0c0c8aabd1dbf3e6b -https://conda.anaconda.org/conda-forge/linux-64/cryptography-3.4.4-py37hf1a17b8_0.tar.bz2#7df98bae15827ec0489f7c44cb22dbeb +https://conda.anaconda.org/conda-forge/linux-64/cryptography-3.4.6-py37h5d9358c_0.tar.bz2#b345cf4500c6ebbec61c1f0e1a187579 https://conda.anaconda.org/conda-forge/noarch/dask-core-2.22.0-py_0.tar.bz2#56a42c164454e6f2187c02803bb0440d https://conda.anaconda.org/conda-forge/linux-64/h5py-3.1.0-nompi_py37h1e651dc_100.tar.bz2#b45bff851699e73b940c8d0684e5d2db -https://conda.anaconda.org/conda-forge/linux-64/imagecodecs-2021.1.11-py37h95c7a1b_1.tar.bz2#7854295f070f5371730034e4601071bb -https://conda.anaconda.org/conda-forge/noarch/imageio-2.9.0-py_0.tar.bz2#62ad9e579278e777d4abaa8c9312b6a7 -https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-3.4.0-hd8ed1ab_0.tar.bz2#6d962cade0658bb1040a3e994add14e0 +https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-3.7.3-hd8ed1ab_0.tar.bz2#ad08b40b6f4550b6fad9806d16df8050 https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-4.7.1-py37h89c1867_0.tar.bz2#42202575ecb1cc9491d57a4ad25f14bb -https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.3-pyh9f0ad1d_0.tar.bz2#59bb2a2c29091c3a243701e26f6f1f5e +https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.4-pyhd8ed1ab_0.tar.bz2#b8054f74fbed2b282f032219f114421a https://conda.anaconda.org/conda-forge/noarch/mypy-0.770-py_0.tar.bz2#6f6066180325653cb41bd4bab930dc4c https://conda.anaconda.org/conda-forge/linux-64/numcodecs-0.7.3-py37hcd2ae1e_0.tar.bz2#8afeff0794db2313188dff9ecef5b1d1 https://conda.anaconda.org/conda-forge/linux-64/pandas-1.0.1-py37hb3f55d8_0.tar.bz2#568004aab34355c568b5831783beb10a -https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.0.0.post1-py37hf874b97_0.tar.bz2#79d826d3bb31b6aa5f223bff5aa49e7e https://conda.anaconda.org/conda-forge/noarch/pyquery-1.4.3-pyhd8ed1ab_0.tar.bz2#a375af7e878ae426a297e98ee98c6a9a -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/scipy-1.6.0-py37h14a347d_0.tar.bz2#fe9b5f9c53e6e49bd71d6ad25fac18e7 +https://conda.anaconda.org/conda-forge/linux-64/scipy-1.6.1-py37h14a347d_0.tar.bz2#acfce202a1f376f2968ca6165b164342 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/terminado-0.9.2-py37h89c1867_0.tar.bz2#660216081c3ff3826a726bb16a623576 https://conda.anaconda.org/conda-forge/linux-64/yarl-1.6.3-py37h5e8e339_1.tar.bz2#11ee71d9c49f5d467c229917feaa0be0 -https://conda.anaconda.org/conda-forge/linux-64/aiohttp-3.7.3-py37h5e8e339_2.tar.bz2#6002976673fcb4cc3d07f5c2c35e86de +https://conda.anaconda.org/conda-forge/linux-64/aiohttp-3.7.4-py37h5e8e339_0.tar.bz2#724d055e52e8799357d6a66693dc3199 https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.1-py_0.tar.bz2#d36df15eaef96549ce6231e3088fba54 https://conda.anaconda.org/conda-forge/noarch/bleach-3.3.0-pyh44b312d_0.tar.bz2#abf6b76c39358ca36ca706c46f054f2a https://conda.anaconda.org/conda-forge/linux-64/distributed-2.30.1-py37h89c1867_0.tar.bz2#1b3ed8d564162fb8eac084f10dbf1926 https://conda.anaconda.org/conda-forge/linux-64/flake8-3.7.9-py37hc8dfbb8_1.tar.bz2#77c92eec6027fece8b5be42092fc3a66 https://conda.anaconda.org/conda-forge/noarch/h5netcdf-0.10.0-pyhd8ed1ab_0.tar.bz2#b5c92155f9e1c3c7c18b95453f90145a -https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.3.0-pyhd8ed1ab_0.tar.bz2#a3fca24e8915ada4945962d5a4abe8c7 -https://conda.anaconda.org/conda-forge/linux-64/importlib_resources-5.1.0-py37h89c1867_0.tar.bz2#73e16856addd8f46afef612fa77f76b9 +https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.8.1-pyhd8ed1ab_0.tar.bz2#b6900f6500a083e2819020e19db7d21f https://conda.anaconda.org/conda-forge/noarch/isort-5.7.0-pyhd8ed1ab_0.tar.bz2#073e46728e0d9a8722457cbf1c335c14 https://conda.anaconda.org/conda-forge/noarch/jinja2-2.11.3-pyh44b312d_0.tar.bz2#1d4c3605d85a3655b1595e0694138eb6 https://conda.anaconda.org/conda-forge/noarch/joblib-1.0.1-pyhd8ed1ab_0.tar.bz2#27d5ed1aaf2bbb5a0cc307a12d8e032f -https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-py_2.tar.bz2#a17aa962de6145d08e1008cb37c20161 +https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-pyhd8ed1ab_3.tar.bz2#66125e28711d8ffc04a207a2b170316d https://conda.anaconda.org/conda-forge/noarch/jupyter-packaging-0.7.12-pyhd8ed1ab_0.tar.bz2#ab2fd67d07b63afe5ea6db6c5f32b5fd -https://conda.anaconda.org/conda-forge/noarch/jupyter_client-6.1.11-pyhd8ed1ab_1.tar.bz2#0fcd80df6d4e0558754c39453ffa3110 +https://conda.anaconda.org/conda-forge/noarch/jupyter_client-6.1.12-pyhd8ed1ab_0.tar.bz2#f58b38ddb9f94fa3cafea4ba2b17f93b https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.2.2-py37h1d35a4c_1.tar.bz2#661a18be996c9daae28a9a3dca72a58b https://conda.anaconda.org/conda-forge/linux-64/netcdf4-1.5.6-nompi_py37hdbee05a_100.tar.bz2#a8c31d11f594c8b5dc7c788f76851eb2 -https://conda.anaconda.org/conda-forge/noarch/networkx-2.5-py_0.tar.bz2#d836ad8453c22192357707026ca21653 -https://conda.anaconda.org/conda-forge/linux-64/numba-0.52.0-py37hdc94413_0.tar.bz2#d148603e968d3ecc95cafc6d47cf1a25 +https://conda.anaconda.org/conda-forge/linux-64/numba-0.53.0-py37h7dd73a4_0.tar.bz2#d5b4fb469946096d2f49fed3cd70e078 https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.0.1-py_0.tar.bz2#faaf2a8fd1cddecbf1818fcf0ed3a3b6 https://conda.anaconda.org/conda-forge/noarch/pip-20.2.4-py_0.tar.bz2#d2c0e7b7ca15440dc445e725f1e79ccf https://conda.anaconda.org/conda-forge/linux-64/pluggy-0.13.1-py37h89c1867_4.tar.bz2#fae2ad595398817ce166a1af18dfe295 -https://conda.anaconda.org/conda-forge/noarch/pygments-2.8.0-pyhd8ed1ab_0.tar.bz2#226cd14ba0554ca2648fecd11090f473 +https://conda.anaconda.org/conda-forge/noarch/pygments-2.8.1-pyhd8ed1ab_0.tar.bz2#196e0cff141677f430fc06eb0d0ad94d https://conda.anaconda.org/conda-forge/noarch/pyopenssl-20.0.1-pyhd8ed1ab_0.tar.bz2#92371c25994d0f5d28a01c1fb75ebf86 -https://conda.anaconda.org/conda-forge/noarch/tifffile-2021.2.1-pyhd8ed1ab_0.tar.bz2#b7d06b595056cfe6fae98488e1f9239d -https://conda.anaconda.org/conda-forge/noarch/xarray-0.16.2-pyhd8ed1ab_0.tar.bz2#45057a982fbac8e5c5ba5167358d4bbb +https://conda.anaconda.org/conda-forge/noarch/xarray-0.17.0-pyhd8ed1ab_0.tar.bz2#972b41b5afded8acbfed8ea18d016765 https://conda.anaconda.org/conda-forge/noarch/zarr-2.6.1-pyhd8ed1ab_0.tar.bz2#cde929aee3ed7ceb99169b2b254735eb -https://conda.anaconda.org/conda-forge/linux-64/bokeh-2.2.3-py37h89c1867_0.tar.bz2#fdcdc0165dc38bd0f2035c3f4ae0c7ec -https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.18.0-py37h26456f9_12.tar.bz2#eca377abe8f3c61a3b0c915b03d71f66 +https://conda.anaconda.org/conda-forge/linux-64/bokeh-2.3.0-py37h89c1867_0.tar.bz2#7a2c658e3e06dc1daf4776d7baae1f3f +https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.18.0-py37h26456f9_13.tar.bz2#40402d7cd34852b8da829f45c5dc5d80 https://conda.anaconda.org/conda-forge/noarch/google-auth-1.24.0-pyhd3deb0d_0.tar.bz2#98d64bae24359f0872abc24368691582 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.1.2-pyh9f0ad1d_0.tar.bz2#2cbd910890bb328e8959246a1e16fac7 https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.2.2-1.tar.bz2#6b8ed6d42771384dbd3f29af9078820e https://conda.anaconda.org/conda-forge/noarch/nbformat-5.1.2-pyhd8ed1ab_1.tar.bz2#9633dbb668ac1f9266427672816899dc -https://conda.anaconda.org/conda-forge/noarch/pint-0.16.1-py_0.tar.bz2#3a147e648229168687fa22d309faa6fb https://conda.anaconda.org/conda-forge/linux-64/pytest-6.2.2-py37h89c1867_0.tar.bz2#0a75bc96b711fddbe3d62d40eefd61ae -https://conda.anaconda.org/conda-forge/linux-64/scikit-image-0.17.2-py37hdc94413_4.tar.bz2#e4c389f1875612d90c2950373aa1f13a https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-0.24.1-py37h69acf81_0.tar.bz2#5ae5e2cf0695bb8e41092d93c67745fd -https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.3-pyhd8ed1ab_0.tar.bz2#25573e57774dd54cfa848e5dd44503ed +https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.4-pyhd8ed1ab_0.tar.bz2#d7b20b328e23d993994ea02077c009c0 https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.5-pyh9f0ad1d_2.tar.bz2#5266fcd697043c59621fda522b3d78ee https://conda.anaconda.org/conda-forge/noarch/dask-2.22.0-py_0.tar.bz2#a018fdec534461186d22bd812ece72b3 -https://conda.anaconda.org/conda-forge/noarch/nbclient-0.5.2-pyhd8ed1ab_0.tar.bz2#06970c2047dd29a7d320b0a765f9b1e4 -https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.16-pyha770c72_0.tar.bz2#1a7cec3da4a94cd23d3de4155bff4941 +https://conda.anaconda.org/conda-forge/noarch/nbclient-0.5.3-pyhd8ed1ab_0.tar.bz2#67f12831640fde52fe9be1bbc6b699e7 +https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.17-pyha770c72_0.tar.bz2#d3ff1dc51da26f2757c8d95c3522138e https://conda.anaconda.org/conda-forge/noarch/pytest-mpl-0.12-pyhd3deb0d_0.tar.bz2#aa4920fbebc7d1338e59928bf5189644 https://conda.anaconda.org/conda-forge/noarch/requests-2.25.1-pyhd3deb0d_0.tar.bz2#ae687aba31a1c400192a86a2e993ffdc https://conda.anaconda.org/conda-forge/noarch/adal-1.2.6-pyh44b312d_0.tar.bz2#df655c77a2dc5e0afa4beb0101bb261d https://conda.anaconda.org/conda-forge/linux-64/conda-4.9.2-py37h89c1867_0.tar.bz2#8c24efe074ff6c56eec13ab5e0829302 -https://conda.anaconda.org/conda-forge/noarch/intake-0.6.1-pyhd8ed1ab_0.tar.bz2#208abfece70ea3558b9fbb215e4a8cb2 -https://conda.anaconda.org/conda-forge/linux-64/ipython-7.20.0-py37h888b3d9_2.tar.bz2#bf2cbcec6af211ce97024160d5cc9280 +https://conda.anaconda.org/conda-forge/noarch/intake-0.6.2-pyhd8ed1ab_0.tar.bz2#159c093fadd067d8e1d6e559fae44288 +https://conda.anaconda.org/conda-forge/linux-64/ipython-7.21.0-py37h888b3d9_0.tar.bz2#8a22b88a82fd83f9b01e9b238a9272ef https://conda.anaconda.org/conda-forge/linux-64/nbconvert-6.0.7-py37h89c1867_3.tar.bz2#aa3710e0a8a44d7c7313b37775018446 -https://conda.anaconda.org/conda-forge/noarch/pooch-1.1.1-py_0.tar.bz2#8f03395636c174d5e85c2c37fec932d8 https://conda.anaconda.org/conda-forge/noarch/pyct-0.4.6-py_0.tar.bz2#42d91c89bc3993ec88681cffd3c0e326 https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.0-pyh9f0ad1d_0.tar.bz2#acdcfb3267ef1a8e576e84480a5e259d https://conda.anaconda.org/conda-forge/noarch/xgcm-0.5.1-py_0.tar.bz2#935f4608a93c5bf80d9c33810ef40aa0 @@ -274,11 +252,10 @@ https://conda.anaconda.org/conda-forge/linux-64/conda-build-3.21.4-py37h89c1867_ https://conda.anaconda.org/conda-forge/noarch/intake-xarray-0.4.1-pyhd8ed1ab_0.tar.bz2#a3204c2105c162fb1c3087ee43513fdd https://conda.anaconda.org/conda-forge/linux-64/ipykernel-5.5.0-py37h888b3d9_1.tar.bz2#0f3659210c464bbc885642b9750e7a2a https://conda.anaconda.org/conda-forge/linux-64/jupyter_server-1.4.1-py37h89c1867_0.tar.bz2#3f29458c7738d7896de7d5c34199a6bf -https://conda.anaconda.org/conda-forge/noarch/metpy-1.0-pyhd8ed1ab_0.tar.bz2#b7da8602ec108ea1e056598f8d861909 -https://conda.anaconda.org/conda-forge/noarch/panel-0.10.3-pyhd8ed1ab_0.tar.bz2#728cb40d5b9b8b1b12232c05135b5709 +https://conda.anaconda.org/conda-forge/noarch/panel-0.11.0-pyhd8ed1ab_0.tar.bz2#4708a89fcfa9d608828b4a99a8387220 https://conda.anaconda.org/conda-forge/noarch/python-kubernetes-12.0.1-pyhd3deb0d_0.tar.bz2#ea05dfb791055ec8f6c0bf696bfe92d0 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.3.0-pyhd8ed1ab_0.tar.bz2#e1ab43655ba7ede6917e2daa37c7b217 https://conda.anaconda.org/conda-forge/linux-64/notebook-6.2.0-py37h89c1867_0.tar.bz2#3bead31ff255215b069399b1dfb06200 -https://conda.anaconda.org/conda-forge/noarch/holoviews-1.14.1-pyhd3deb0d_0.tar.bz2#6eb38f813c06691658f9cb00235191a0 +https://conda.anaconda.org/conda-forge/noarch/holoviews-1.14.2-pyhd8ed1ab_0.tar.bz2#58586aaed3d6e1313796a3feda90ac34 https://conda.anaconda.org/conda-forge/noarch/nbclassic-0.2.6-pyhd8ed1ab_0.tar.bz2#49be35e31b49012ea91fcd667ebdf4ad -https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.0.9-pyhd8ed1ab_0.tar.bz2#083a50575417a6148ce09133f6d4d63d +https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.0.11-pyhd8ed1ab_0.tar.bz2#af8e216cd0b7f5e4f9adc17b68857d41 diff --git a/conda-osx-64.lock b/conda-osx-64.lock index b025db0fb0..180a8a2097 100644 --- a/conda-osx-64.lock +++ b/conda-osx-64.lock @@ -1,66 +1,54 @@ # platform: osx-64 -# env_hash: 7ca417a3115c3e4d3c5a94a2ae1f362caa99200247c561afc02da322a35f652a +# env_hash: 3c7d2b17650f45ac42a1b08d641493ec036a89816474db51aa47f2106529e4a1 @EXPLICIT https://conda.anaconda.org/conda-forge/osx-64/bzip2-1.0.8-hc929b4f_4.tar.bz2#521b82c700a64bac7d8da27539422e91 -https://conda.anaconda.org/conda-forge/osx-64/c-ares-1.17.1-hc929b4f_0.tar.bz2#24fc0b91a6eacc6753fef90514d67ce9 +https://conda.anaconda.org/conda-forge/osx-64/c-ares-1.17.1-h0d85af4_1.tar.bz2#786a1af1bc9194e43bb3a9e1ea0146ed https://conda.anaconda.org/conda-forge/osx-64/ca-certificates-2020.12.5-h033912b_0.tar.bz2#4483d8ea13bd57b52e3539e741501a7d -https://conda.anaconda.org/conda-forge/osx-64/giflib-5.2.1-hbcb3906_2.tar.bz2#be8f747c37e4d7e346c133e641966750 https://conda.anaconda.org/conda-forge/osx-64/jpeg-9d-hbcb3906_0.tar.bz2#ff6fba028f282f94ceb10597d58a56e8 -https://conda.anaconda.org/conda-forge/osx-64/jxrlib-1.1-h35c211d_2.tar.bz2#1c2379fd9d5d4ecb151231f6282e699d https://conda.anaconda.org/conda-forge/osx-64/lame-3.100-h35c211d_1001.tar.bz2#6bb207f7b08380ce2bc833bb60f91046 -https://conda.anaconda.org/conda-forge/osx-64/libcxx-11.0.1-habf9029_0.tar.bz2#51c221f12b7975d60dae27cd8280efac -https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.7-h35c211d_5.tar.bz2#6608b6a46fd4555b5c83cda6171cc694 +https://conda.anaconda.org/conda-forge/osx-64/libcxx-11.1.0-habf9029_0.tar.bz2#a88609e545f948a404419c65cd96fa1a https://conda.anaconda.org/conda-forge/osx-64/libev-4.33-haf1e3a3_1.tar.bz2#79dc2be110b2a3d1e97ec21f691c50ad https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.16-haf1e3a3_0.tar.bz2#c5fab167412a52e491c8e11453ae016f https://conda.anaconda.org/conda-forge/osx-64/libsodium-1.0.18-hbcb3906_1.tar.bz2#24632c09ed931af617fe6d5292919cab -https://conda.anaconda.org/conda-forge/osx-64/libwebp-base-1.2.0-hbcf498f_0.tar.bz2#1405fc14579e59a44962ad6317a06f23 -https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-11.0.1-h7c73e74_0.tar.bz2#86683a2ccd280574c0af1efb95b20aec +https://conda.anaconda.org/conda-forge/osx-64/libwebp-base-1.2.0-h0d85af4_2.tar.bz2#a5d807d5f16967981d45d6f33621f580 +https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-11.1.0-hda6cdc1_0.tar.bz2#5bef8ce3f0d9f2705ad947e214f3e615 https://conda.anaconda.org/conda-forge/osx-64/lzo-2.10-haf1e3a3_1000.tar.bz2#0b6bca372a95d6c602c7a922e928ce79 https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.2-h2e338ed_4.tar.bz2#9cef1910395d1543527583e73dba30f1 https://conda.anaconda.org/conda-forge/osx-64/nettle-3.6-hedd7734_0.tar.bz2#9c9d5d69c39596b22a7495aef3310a3d -https://conda.anaconda.org/conda-forge/osx-64/pandoc-2.11.4-h35c211d_0.tar.bz2#7d3282f19abe9745707987104954bbcb +https://conda.anaconda.org/conda-forge/osx-64/pandoc-2.12-h0d85af4_0.tar.bz2#5a9859dd7cc0ed1285b04492d2eb7bb7 https://conda.anaconda.org/conda-forge/osx-64/ripgrep-12.1.1-haf1e3a3_1.tar.bz2#4ef0173af511e6fcf01c0c815b2ec9b7 https://conda.anaconda.org/conda-forge/osx-64/x264-1!161.3030-h35c211d_0.tar.bz2#80ee9527d11fec0ab628b614260ba483 https://conda.anaconda.org/conda-forge/osx-64/xz-5.2.5-haf1e3a3_1.tar.bz2#41116deb499e9bc58048c297d6403ce6 https://conda.anaconda.org/conda-forge/osx-64/yaml-0.2.5-haf1e3a3_0.tar.bz2#84c2fc186995c25a43e86ed708065572 https://conda.anaconda.org/conda-forge/osx-64/zlib-1.2.11-h7795811_1010.tar.bz2#7d39e47e16ed0107f37c7224d5b5be8b -https://conda.anaconda.org/conda-forge/osx-64/blosc-1.21.0-h046ec9c_0.tar.bz2#2475eabe99e30e5bf1a4570f0a228328 -https://conda.anaconda.org/conda-forge/osx-64/brotli-1.0.9-h046ec9c_4.tar.bz2#f278d8e33a74fe98850d835a69be1a71 -https://conda.anaconda.org/conda-forge/osx-64/charls-2.2.0-h046ec9c_0.tar.bz2#f685a772dc68f4e469c373a0588e89e4 -https://conda.anaconda.org/conda-forge/osx-64/geos-3.9.1-h1c7c35f_0.tar.bz2#ea118dfeeefe10c86b32d9b98e52577a +https://conda.anaconda.org/conda-forge/osx-64/geos-3.9.1-he49afe7_2.tar.bz2#bd87b3078f6c10345cab62f3f8a6a04e https://conda.anaconda.org/conda-forge/osx-64/gmp-6.2.1-h2e338ed_0.tar.bz2#dedc96914428dae572a39e69ee2a392f https://conda.anaconda.org/conda-forge/osx-64/hdf4-4.2.13-h71d84a9_1004.tar.bz2#798adc59c4f9633b4146fd0bde19437b https://conda.anaconda.org/conda-forge/osx-64/icu-68.1-h74dc148_0.tar.bz2#e4e7f8580abd1275ea2250fe606b66ac -https://conda.anaconda.org/conda-forge/osx-64/lerc-2.2.1-h046ec9c_0.tar.bz2#2b4abd282f644dc51225fa9b90218567 -https://conda.anaconda.org/conda-forge/osx-64/libaec-1.0.4-h046ec9c_1.tar.bz2#b573eb14edcd87c201135eedc7057361 https://conda.anaconda.org/conda-forge/osx-64/libedit-3.1.20191231-h0678c8f_2.tar.bz2#6016a8a1d0e63cac3de2c352cd40208b https://conda.anaconda.org/conda-forge/osx-64/libffi-3.3-h046ec9c_2.tar.bz2#c7a196accaf92d40985d5c9b4d14f9cb -https://conda.anaconda.org/conda-forge/osx-64/libgfortran5-9.3.0-h6c81a4c_18.tar.bz2#02383e6cf682ef893c6e1f7892a6865e +https://conda.anaconda.org/conda-forge/osx-64/libgfortran5-9.3.0-h6c81a4c_20.tar.bz2#c2733d71485598cfda378ee3c78e6ed7 https://conda.anaconda.org/conda-forge/osx-64/liblief-0.10.1-hb1e8313_2.tar.bz2#14c7fe39f28d8f23f8bd6312e9d47f6f https://conda.anaconda.org/conda-forge/osx-64/libllvm10-10.0.1-h009f743_3.tar.bz2#cc65eb0b26253d2789320bfd661852f9 https://conda.anaconda.org/conda-forge/osx-64/libpng-1.6.37-h7cec526_2.tar.bz2#9e52521faba2b53269672628d34e1513 -https://conda.anaconda.org/conda-forge/osx-64/libzopfli-1.0.3-h046ec9c_0.tar.bz2#55f3f5c9bccca18d33cb3a4bcfe002d7 https://conda.anaconda.org/conda-forge/osx-64/lz4-c-1.9.3-h046ec9c_0.tar.bz2#7f13d69c1b7989b85029efb6f3e35af9 https://conda.anaconda.org/conda-forge/osx-64/openh264-2.1.1-hfd3ada9_0.tar.bz2#468e32402dae56c73b29fb74160a9b2a https://conda.anaconda.org/conda-forge/osx-64/openssl-1.1.1j-hbcf498f_0.tar.bz2#09a02162d159d2f7ebe8749ae6960667 https://conda.anaconda.org/conda-forge/osx-64/readline-8.0-h0678c8f_2.tar.bz2#8f69d684fce8e73328995d7efb77816a -https://conda.anaconda.org/conda-forge/osx-64/snappy-1.1.8-hb1e8313_3.tar.bz2#73b65b3935375b56deb96f6794ed721e https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.10-h0419947_1.tar.bz2#9a79a432473acddd936ff8bab8b86145 https://conda.anaconda.org/conda-forge/osx-64/zeromq-4.3.4-h1c7c35f_0.tar.bz2#2af55e3523e9210b2b2dff5855fb5382 -https://conda.anaconda.org/conda-forge/osx-64/zfp-0.5.5-h046ec9c_4.tar.bz2#c922f80fe4695b780d87ef69c12b002c -https://conda.anaconda.org/conda-forge/osx-64/brunsli-0.1-h046ec9c_0.tar.bz2#28d47920c95b85499c9a61994cc49b87 https://conda.anaconda.org/conda-forge/osx-64/freetype-2.10.4-h4cff582_1.tar.bz2#5a136a432c6062362cd7990c514bd8d6 https://conda.anaconda.org/conda-forge/osx-64/gettext-0.19.8.1-h7937167_1005.tar.bz2#52fd84c5cc5d61a6e05885f44d033efa https://conda.anaconda.org/conda-forge/osx-64/krb5-1.17.2-h60d9502_0.tar.bz2#abf2add2a1ade1920b25a8f3327a1aa0 -https://conda.anaconda.org/conda-forge/osx-64/libgfortran-5.0.0-9_3_0_h6c81a4c_18.tar.bz2#3eb238d3935324db974670ff07f97767 +https://conda.anaconda.org/conda-forge/osx-64/libgfortran-5.0.0-9_3_0_h6c81a4c_20.tar.bz2#e215efc96abf826fb84cc51e79a45a7e https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.43.0-h07e645a_0.tar.bz2#b4a9c405d47f3b120ed6cf86cc8a13aa -https://conda.anaconda.org/conda-forge/osx-64/libssh2-1.9.0-h8a08a2b_5.tar.bz2#2e0e86262d3c9a11230ab55fc0468e49 +https://conda.anaconda.org/conda-forge/osx-64/libssh2-1.9.0-h52ee1ee_6.tar.bz2#42cebefd1fd127d1180e3df004a413b7 https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.9.10-h802ca4f_3.tar.bz2#42435730cf54092342e0c3eb571b511b https://conda.anaconda.org/conda-forge/osx-64/sqlite-3.34.0-h17101e1_0.tar.bz2#9e9694f119bb1a2362a0cc0249651835 -https://conda.anaconda.org/conda-forge/osx-64/zstd-1.4.8-hf387650_1.tar.bz2#c17f2ece6445e21c290df2f9a0f1f94d +https://conda.anaconda.org/conda-forge/osx-64/zstd-1.4.9-h582d3a0_0.tar.bz2#551e04087371339ee63524f2988faa62 https://conda.anaconda.org/conda-forge/osx-64/gnutls-3.6.13-h756fd2b_1.tar.bz2#cf812214a917b4d48ce536d427770ec9 https://conda.anaconda.org/conda-forge/osx-64/libarchive-3.5.1-h0a5793d_1.tar.bz2#cb556c11c227bb7c568204768bf2a100 -https://conda.anaconda.org/conda-forge/osx-64/libcurl-7.71.1-h9bf37e3_8.tar.bz2#1a136204085b4c620fe2ed74fb1112bf +https://conda.anaconda.org/conda-forge/osx-64/libcurl-7.75.0-h8ef9fac_0.tar.bz2#fc1b048751c16b877364f9ac1b4a1e4b https://conda.anaconda.org/conda-forge/osx-64/libopenblas-0.3.12-openmp_h54245bb_1.tar.bz2#ecaffce11312c27c18ad35e65095fecc https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.2.0-h355d032_0.tar.bz2#ad3cbf0f77b9f89df082eef584d9009a https://conda.anaconda.org/conda-forge/osx-64/libxslt-1.1.33-h5739fc3_2.tar.bz2#14333dae9eef1116162a1bb6119d3537 @@ -74,20 +62,20 @@ https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz https://conda.anaconda.org/conda-forge/noarch/backoff-1.10.0-py_0.tar.bz2#e59e9185ec7c2937a46c1aa1b17642b7 https://conda.anaconda.org/conda-forge/noarch/backports-1.0-py_2.tar.bz2#0da16b293affa6ac31812376f8eb79dd https://conda.anaconda.org/conda-forge/noarch/blinker-1.4-py_1.tar.bz2#fa509a09190583f869ae442bf4d17f5f -https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.1-py_0.tar.bz2#a5773589b22d6d4f6201fb7c261bf77f +https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a https://conda.anaconda.org/conda-forge/noarch/cachetools-4.2.1-pyhd8ed1ab_0.tar.bz2#c48f5ea63f27d8ede4117b6d99c6142b 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/crcmod-1.7-pyhd8ed1ab_1005.tar.bz2#9158f567c19ae53083b7207a086d8347 https://conda.anaconda.org/conda-forge/noarch/cssselect-1.1.0-py_0.tar.bz2#c2b0104cc7d2ef771a40281a26524b87 -https://conda.anaconda.org/conda-forge/osx-64/curl-7.71.1-hcb81553_8.tar.bz2#82d166def6b920c17688f9ec0d766908 +https://conda.anaconda.org/conda-forge/osx-64/curl-7.75.0-h06286d4_0.tar.bz2#421987ab449d9416fa2b8645d45199b7 https://conda.anaconda.org/conda-forge/noarch/decorator-4.4.2-py_0.tar.bz2#d2eabb9cabd212e1ec6a9463bd846243 -https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.6.0-py_0.tar.bz2#37e1033daee0e2edaa5ff42584c52b21 +https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2 https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.3-pyhd8ed1ab_1003.tar.bz2#bbf9a201f6ce99a506f4955374d9a9f4 https://conda.anaconda.org/conda-forge/noarch/f90nml-1.2-pyh9f0ad1d_0.tar.bz2#1969f3ac0952e50b2ba35a05c11129de https://conda.anaconda.org/conda-forge/osx-64/ffmpeg-4.3.1-hb787a4c_2.tar.bz2#7141d6db28f316a2d62ee1fd3182ec9c https://conda.anaconda.org/conda-forge/noarch/filelock-3.0.12-pyh9f0ad1d_0.tar.bz2#7544ed05bbbe9bb687bc9bcbe4d6cb46 -https://conda.anaconda.org/conda-forge/noarch/fsspec-0.8.5-pyhd8ed1ab_0.tar.bz2#6f86dae0901b373f96b7e92768ef6ebe +https://conda.anaconda.org/conda-forge/noarch/fsspec-0.8.7-pyhd8ed1ab_0.tar.bz2#b93ab5a4692ba685b455f0e8e5dc93e4 https://conda.anaconda.org/conda-forge/noarch/glob2-0.7-py_0.tar.bz2#1f3a88e65e61216e1d475135922dbf6a https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.10.6-nompi_hc5d9132_1114.tar.bz2#b7f592b79c2c97646a6c7f874b0db33a https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95 @@ -103,7 +91,6 @@ https://conda.anaconda.org/conda-forge/noarch/monotonic-1.5-py_0.tar.bz2#0cc5fd0 https://conda.anaconda.org/conda-forge/noarch/more-itertools-8.7.0-pyhd8ed1ab_0.tar.bz2#3be1ba5a28d394d78f3d692fb9e5c1c2 https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.4.3-pyhd8ed1ab_0.tar.bz2#a1f2fda4d88c624810bf2029aa4c0827 https://conda.anaconda.org/conda-forge/noarch/olefile-0.46-pyh9f0ad1d_1.tar.bz2#0b2e68acc8c78c8cc392b90983481f58 -https://conda.anaconda.org/conda-forge/osx-64/openjpeg-2.4.0-h6cbf5cd_0.tar.bz2#38e701cb94a7e667a19c287f2398f04b https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.4.2-py_1.tar.bz2#ba6f4a308f1ea22abe1d72e72544af76 https://conda.anaconda.org/conda-forge/noarch/param-1.10.1-pyhd3deb0d_0.tar.bz2#e990456731e2381b8801b26242234e26 https://conda.anaconda.org/conda-forge/noarch/parso-0.8.1-pyhd8ed1ab_0.tar.bz2#8b0a19d867a59005c1ae631d61a12194 @@ -132,31 +119,32 @@ https://conda.anaconda.org/conda-forge/noarch/testpath-0.4.4-py_0.tar.bz2#3b98ff https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-2.1.0-pyh5ca1d4c_0.tar.bz2#9eb32b63458380aa3804de519b6e5749 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/tqdm-4.57.0-pyhd8ed1ab_0.tar.bz2#d9b5df7cfaf4d7ac83d1cf3aba52cfd1 +https://conda.anaconda.org/conda-forge/noarch/tqdm-4.59.0-pyhd8ed1ab_0.tar.bz2#9ae6fb908a7f989e59a02fef85a5fd6f 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/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136 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.0-py_0.tar.bz2#0df927d2e46244cef8fd75d7ec2ba51c +https://conda.anaconda.org/conda-forge/noarch/zipp-3.4.1-pyhd8ed1ab_0.tar.bz2#a4fa30eb74a326092b3d8078b1f1aae1 https://conda.anaconda.org/conda-forge/osx-64/appnope-0.1.2-py37hf985489_1.tar.bz2#1bee6125d3ade317803d5358ea3f0e83 https://conda.anaconda.org/conda-forge/noarch/babel-2.9.0-pyhd3deb0d_0.tar.bz2#1cb532c9a6fd4e56a9f0906b87c17b76 https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.9.3-pyhb0f4dca_0.tar.bz2#d243a293d7303ab6195d96ce8c16b1cb +https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551 https://conda.anaconda.org/conda-forge/osx-64/certifi-2020.12.5-py37hf985489_1.tar.bz2#176e0bb42110e5090e859847d11cf5e6 https://conda.anaconda.org/conda-forge/osx-64/cffi-1.14.5-py37h4d371b4_0.tar.bz2#fe873b3f987f3e9203bb4165197a1281 -https://conda.anaconda.org/conda-forge/osx-64/chardet-3.0.4-py37h2987424_1008.tar.bz2#cc67a92b9d49d74caf6a71e6c8685141 +https://conda.anaconda.org/conda-forge/osx-64/chardet-4.0.0-py37hf985489_1.tar.bz2#212f48113f4aa416eb58404fbece967b https://conda.anaconda.org/conda-forge/osx-64/conda-package-handling-1.7.2-py37h395d20d_0.tar.bz2#b227ace74379574f65804db465891b71 -https://conda.anaconda.org/conda-forge/osx-64/coverage-5.4-py37hf967b71_0.tar.bz2#b776ba3e8faf49be218c0fc57880a800 +https://conda.anaconda.org/conda-forge/osx-64/coverage-5.5-py37h271585c_0.tar.bz2#201c87c73c558a823cd133beaa5dfdce https://conda.anaconda.org/conda-forge/noarch/cycler-0.10.0-py_2.tar.bz2#f6d7c7e6d8f42cbbec7e07a8d879f91c https://conda.anaconda.org/conda-forge/osx-64/cytoolz-0.11.0-py37hf967b71_3.tar.bz2#476be4e1c4643e52eb01bba3f95fe4f8 https://conda.anaconda.org/conda-forge/noarch/docrep-0.2.7-py_0.tar.bz2#7a8411a58c16dffe32424251e62e3149 https://conda.anaconda.org/conda-forge/noarch/fasteners-0.14.1-py_3.tar.bz2#8af0bf3cfe806fb001d9923b4fe1594b https://conda.anaconda.org/conda-forge/osx-64/future-0.18.2-py37hf985489_3.tar.bz2#5137794442657f0dbafb035a31627fc6 -https://conda.anaconda.org/conda-forge/osx-64/importlib-metadata-3.4.0-py37hf985489_0.tar.bz2#cd3d5e409614339e065a58d649c6186c +https://conda.anaconda.org/conda-forge/osx-64/importlib-metadata-3.7.3-py37hf985489_0.tar.bz2#d609cb55aa8d95f728e91b1eea709344 https://conda.anaconda.org/conda-forge/osx-64/jedi-0.18.0-py37hf985489_2.tar.bz2#8cf41e3992c9d1ae8549dfaf03d4bc14 https://conda.anaconda.org/conda-forge/osx-64/kiwisolver-1.3.1-py37h70f7d40_1.tar.bz2#2b3639e4db0eab6a502a11ff8ca9a1e8 https://conda.anaconda.org/conda-forge/osx-64/libcblas-3.9.0-8_openblas.tar.bz2#67acafbc05ce608462a59740ef546b52 https://conda.anaconda.org/conda-forge/osx-64/liblapack-3.9.0-8_openblas.tar.bz2#f20c01455d69b8a613bb92cd4544b553 https://conda.anaconda.org/conda-forge/osx-64/libnetcdf-4.7.4-nompi_h9d8a93f_107.tar.bz2#09ef7d30cb89bacb8ed62ca2f87046b6 -https://conda.anaconda.org/conda-forge/osx-64/llvmlite-0.35.0-py37hd32b0aa_1.tar.bz2#6fa051da00d899eb975a9933587994d1 +https://conda.anaconda.org/conda-forge/osx-64/llvmlite-0.36.0-py37h62ea057_0.tar.bz2#29b97546521cad2c06c0a4b44f4f3917 https://conda.anaconda.org/conda-forge/osx-64/lxml-4.6.2-py37he94f95d_1.tar.bz2#d81b5787a960c3ddc20df3b7c35ee581 https://conda.anaconda.org/conda-forge/osx-64/markupsafe-1.1.1-py37hf967b71_3.tar.bz2#012d1704c4914ea54b2166c6c8123d2e https://conda.anaconda.org/conda-forge/osx-64/mistune-0.8.4-py37hf967b71_1003.tar.bz2#0774ff87ae140bb568ac2b0a35ea31ec @@ -166,7 +154,7 @@ https://conda.anaconda.org/conda-forge/osx-64/mypy_extensions-0.4.3-py37hf985489 https://conda.anaconda.org/conda-forge/noarch/packaging-20.9-pyh44b312d_0.tar.bz2#be69a38e912054a62dc82cc3c7711a64 https://conda.anaconda.org/conda-forge/noarch/partd-1.1.0-py_0.tar.bz2#4afbf2cdf4e6ad279080d3adb5cefaae https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh9f0ad1d_2.tar.bz2#5909e7b978141dd80d28dbf9de627827 -https://conda.anaconda.org/conda-forge/osx-64/pillow-8.1.0-py37hd722d6e_2.tar.bz2#fee097e3f28a1301a4a4beabc8aaa5af +https://conda.anaconda.org/conda-forge/osx-64/pillow-8.1.2-py37hd4e48bc_0.tar.bz2#338012d846b30e1677c08f47259bbfe3 https://conda.anaconda.org/conda-forge/osx-64/psutil-5.8.0-py37hf967b71_1.tar.bz2#a5cb28290dc234deaa40fb2805411148 https://conda.anaconda.org/conda-forge/osx-64/py-lief-0.10.1-py37h08f6e3d_2.tar.bz2#acea81f93a51511d87552b099f84cab4 https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c @@ -178,9 +166,9 @@ https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.1-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/osx-64/python-libarchive-c-2.9-py37hf985489_2.tar.bz2#8788bd20aaac6a0fe23820015b75c845 https://conda.anaconda.org/conda-forge/noarch/pyviz_comms-2.0.1-pyhd3deb0d_0.tar.bz2#12e4d3289ffcbdf465864af6eb2c6f4b https://conda.anaconda.org/conda-forge/osx-64/pyyaml-5.3-py37h9bfed18_1.tar.bz2#6db76214d53505ec7bf8c36d57b41d47 -https://conda.anaconda.org/conda-forge/osx-64/pyzmq-22.0.3-py37hf4687c3_0.tar.bz2#8bf5c3e8d1ab26477fde8ff778beecb5 +https://conda.anaconda.org/conda-forge/osx-64/pyzmq-22.0.3-py37h8f778e5_1.tar.bz2#cc9996c40d8fa5d4242ae539e1464a16 https://conda.anaconda.org/conda-forge/osx-64/regex-2020.11.13-py37hf967b71_1.tar.bz2#e67c3476a91189574a4a9e30c502db5d -https://conda.anaconda.org/conda-forge/noarch/rsa-4.7.1-pyh44b312d_0.tar.bz2#ff8e0c6a909a84c9496762fa5d438c8c +https://conda.anaconda.org/conda-forge/noarch/rsa-4.7.2-pyh44b312d_0.tar.bz2#3452ab3790dbb1df9508b3fa4ea2f806 https://conda.anaconda.org/conda-forge/osx-64/ruamel_yaml-0.15.80-py37h7585375_1004.tar.bz2#66e51f9e5f98dee5558f092ebc9ac5c5 https://conda.anaconda.org/conda-forge/osx-64/sniffio-1.2.0-py37hf985489_1.tar.bz2#d2624002903acd9b87e73b436b18c7fe https://conda.anaconda.org/conda-forge/osx-64/tornado-6.1-py37hf967b71_1.tar.bz2#b2ae53e0e2bfded281be471b4391cfdf @@ -189,80 +177,70 @@ https://conda.anaconda.org/conda-forge/osx-64/typed-ast-1.4.2-py37hf967b71_0.tar https://conda.anaconda.org/conda-forge/noarch/typing-extensions-3.7.4.3-0.tar.bz2#36bdcdb4c2bf1efb987f2e9e80f4c9a6 https://conda.anaconda.org/conda-forge/osx-64/websocket-client-0.57.0-py37hf985489_4.tar.bz2#b8d9e2ad187b18d0abd25441db9f4ac9 https://conda.anaconda.org/conda-forge/noarch/zict-2.0.0-py_0.tar.bz2#4750152be22f24d695b3004c5e1712d3 -https://conda.anaconda.org/conda-forge/osx-64/anyio-2.1.0-py37hf985489_0.tar.bz2#bd429dda49e4fa43d900129b2c2a75c8 +https://conda.anaconda.org/conda-forge/osx-64/anyio-2.2.0-py37hf985489_0.tar.bz2#0d40048074c79de881199c7756a8d27a https://conda.anaconda.org/conda-forge/osx-64/argon2-cffi-20.1.0-py37hf967b71_2.tar.bz2#4548b36af838ff2f9a0cc021348890f3 https://conda.anaconda.org/conda-forge/noarch/black-19.10b0-py_4.tar.bz2#ae8375ed2a4c1c67966ab08dc44d96a3 https://conda.anaconda.org/conda-forge/osx-64/brotlipy-0.7.0-py37hf967b71_1001.tar.bz2#2e1016af5a81ba9e50d8bd25bf82b352 -https://conda.anaconda.org/conda-forge/osx-64/cryptography-3.4.4-py37ha1e1f9f_0.tar.bz2#8f27a350192cae363a244ba30a549ffc +https://conda.anaconda.org/conda-forge/osx-64/cryptography-3.4.6-py37hce4a858_0.tar.bz2#7c92473e90da28313a08eee67997832b https://conda.anaconda.org/conda-forge/noarch/dask-core-2.22.0-py_0.tar.bz2#56a42c164454e6f2187c02803bb0440d -https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-3.4.0-hd8ed1ab_0.tar.bz2#6d962cade0658bb1040a3e994add14e0 +https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-3.7.3-hd8ed1ab_0.tar.bz2#ad08b40b6f4550b6fad9806d16df8050 https://conda.anaconda.org/conda-forge/osx-64/jupyter_core-4.7.1-py37hf985489_0.tar.bz2#a49ae78b4a221744cca02dfed08a990f -https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.3-pyh9f0ad1d_0.tar.bz2#59bb2a2c29091c3a243701e26f6f1f5e +https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.4-pyhd8ed1ab_0.tar.bz2#b8054f74fbed2b282f032219f114421a https://conda.anaconda.org/conda-forge/noarch/mypy-0.770-py_0.tar.bz2#6f6066180325653cb41bd4bab930dc4c https://conda.anaconda.org/conda-forge/osx-64/numpy-1.20.1-py37ha9839cc_0.tar.bz2#6e1a96b3966426d0089ba888c6832ff4 -https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.0.0.post1-py37hec45f38_0.tar.bz2#220085c53022f4c2370593d7751cff81 https://conda.anaconda.org/conda-forge/noarch/pyquery-1.4.3-pyhd8ed1ab_0.tar.bz2#a375af7e878ae426a297e98ee98c6a9a https://conda.anaconda.org/conda-forge/osx-64/setuptools-49.6.0-py37hf985489_3.tar.bz2#5030dea82548d67ec8b80882e8e4a099 https://conda.anaconda.org/conda-forge/osx-64/terminado-0.9.2-py37hf985489_0.tar.bz2#dad18ca09ac039309ee0aace6e9010f1 https://conda.anaconda.org/conda-forge/osx-64/yarl-1.6.3-py37hf967b71_1.tar.bz2#bb2b9077a2f93b909ae952cc204e10c0 -https://conda.anaconda.org/conda-forge/osx-64/aiohttp-3.7.3-py37h7585375_2.tar.bz2#2b4a584f687da1e93e02721d038df516 +https://conda.anaconda.org/conda-forge/osx-64/aiohttp-3.7.4-py37h271585c_0.tar.bz2#b096618b3de76f115b64aa4c7a489e86 https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.1-py_0.tar.bz2#d36df15eaef96549ce6231e3088fba54 https://conda.anaconda.org/conda-forge/noarch/bleach-3.3.0-pyh44b312d_0.tar.bz2#abf6b76c39358ca36ca706c46f054f2a https://conda.anaconda.org/conda-forge/osx-64/cftime-1.4.1-py37h183f225_0.tar.bz2#d9897f2fbbd0efc48f792b2e13669e02 https://conda.anaconda.org/conda-forge/osx-64/distributed-2.30.1-py37hf985489_0.tar.bz2#1aebe1e3d8da584ed0de5e2181c9633b https://conda.anaconda.org/conda-forge/osx-64/flake8-3.7.9-py37hc8dfbb8_1.tar.bz2#476f05498d494dcd69db49353b868d17 https://conda.anaconda.org/conda-forge/osx-64/h5py-3.1.0-nompi_py37hcd7841c_100.tar.bz2#df675fbb070df1c9585821fa77dfb692 -https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.3.0-pyhd8ed1ab_0.tar.bz2#a3fca24e8915ada4945962d5a4abe8c7 -https://conda.anaconda.org/conda-forge/osx-64/imagecodecs-2021.1.11-py37h37c44b6_1.tar.bz2#8366a313b51929eae356e4f6f6a68b27 -https://conda.anaconda.org/conda-forge/noarch/imageio-2.9.0-py_0.tar.bz2#62ad9e579278e777d4abaa8c9312b6a7 -https://conda.anaconda.org/conda-forge/osx-64/importlib_resources-5.1.0-py37hf985489_0.tar.bz2#b2ed5ff6d9795f6ac9b46cde9b289ce0 +https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.8.1-pyhd8ed1ab_0.tar.bz2#b6900f6500a083e2819020e19db7d21f https://conda.anaconda.org/conda-forge/noarch/isort-5.7.0-pyhd8ed1ab_0.tar.bz2#073e46728e0d9a8722457cbf1c335c14 https://conda.anaconda.org/conda-forge/noarch/jinja2-2.11.3-pyh44b312d_0.tar.bz2#1d4c3605d85a3655b1595e0694138eb6 https://conda.anaconda.org/conda-forge/noarch/joblib-1.0.1-pyhd8ed1ab_0.tar.bz2#27d5ed1aaf2bbb5a0cc307a12d8e032f -https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-py_2.tar.bz2#a17aa962de6145d08e1008cb37c20161 +https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-pyhd8ed1ab_3.tar.bz2#66125e28711d8ffc04a207a2b170316d https://conda.anaconda.org/conda-forge/noarch/jupyter-packaging-0.7.12-pyhd8ed1ab_0.tar.bz2#ab2fd67d07b63afe5ea6db6c5f32b5fd -https://conda.anaconda.org/conda-forge/noarch/jupyter_client-6.1.11-pyhd8ed1ab_1.tar.bz2#0fcd80df6d4e0558754c39453ffa3110 +https://conda.anaconda.org/conda-forge/noarch/jupyter_client-6.1.12-pyhd8ed1ab_0.tar.bz2#f58b38ddb9f94fa3cafea4ba2b17f93b https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.2.2-py37hddda452_1.tar.bz2#d70824ef43fbd72ddcd2eaeec60dfeb4 -https://conda.anaconda.org/conda-forge/noarch/networkx-2.5-py_0.tar.bz2#d836ad8453c22192357707026ca21653 -https://conda.anaconda.org/conda-forge/osx-64/numba-0.52.0-py37h010c265_0.tar.bz2#88ba2ed898e2fc71f08d344734e802da +https://conda.anaconda.org/conda-forge/osx-64/numba-0.53.0-py37h16fc07f_0.tar.bz2#dcad71a7e45c7f0abb043ce8ef1c4410 https://conda.anaconda.org/conda-forge/osx-64/numcodecs-0.7.3-py37h54c7649_0.tar.bz2#08f020d76d8734e3cc7aa030005730ad https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.0.1-py_0.tar.bz2#faaf2a8fd1cddecbf1818fcf0ed3a3b6 https://conda.anaconda.org/conda-forge/osx-64/pandas-1.0.1-py37h4f17bb1_0.tar.bz2#be25f1829a469cab9a877287a72fa393 https://conda.anaconda.org/conda-forge/noarch/pip-20.2.4-py_0.tar.bz2#d2c0e7b7ca15440dc445e725f1e79ccf https://conda.anaconda.org/conda-forge/osx-64/pluggy-0.13.1-py37hf985489_4.tar.bz2#c06bd6917e033778e6c2f1a66dd7e159 -https://conda.anaconda.org/conda-forge/noarch/pygments-2.8.0-pyhd8ed1ab_0.tar.bz2#226cd14ba0554ca2648fecd11090f473 +https://conda.anaconda.org/conda-forge/noarch/pygments-2.8.1-pyhd8ed1ab_0.tar.bz2#196e0cff141677f430fc06eb0d0ad94d https://conda.anaconda.org/conda-forge/noarch/pyopenssl-20.0.1-pyhd8ed1ab_0.tar.bz2#92371c25994d0f5d28a01c1fb75ebf86 -https://conda.anaconda.org/conda-forge/osx-64/pywavelets-1.1.1-py37h37391d0_3.tar.bz2#1432c6ff1237725121ad82373480648c -https://conda.anaconda.org/conda-forge/osx-64/scipy-1.6.0-py37hc22aa43_0.tar.bz2#72c393f99c5752543abb1395121675c2 -https://conda.anaconda.org/conda-forge/osx-64/shapely-1.7.1-py37h8da34d6_4.tar.bz2#f2d869f3779bdb029b11d291a08183b9 -https://conda.anaconda.org/conda-forge/osx-64/bokeh-2.2.3-py37hf985489_0.tar.bz2#6e96c1c721f06414a3151a8701f537ad -https://conda.anaconda.org/conda-forge/osx-64/cartopy-0.18.0-py37h0d8b546_12.tar.bz2#2609f9394390f1d3d0b44145de179042 +https://conda.anaconda.org/conda-forge/osx-64/scipy-1.6.1-py37h0211240_0.tar.bz2#8dcb17dc27913430cdc4e15da4276bcb +https://conda.anaconda.org/conda-forge/osx-64/shapely-1.7.1-py37h2c4361b_4.tar.bz2#379bf71cce33dd05fffb0affd8162ce3 +https://conda.anaconda.org/conda-forge/osx-64/bokeh-2.3.0-py37hf985489_0.tar.bz2#ff5c49aedce3abfe763106abac8fcd8c +https://conda.anaconda.org/conda-forge/osx-64/cartopy-0.18.0-py37h0dfa92a_13.tar.bz2#24e85396d62cc27aa14f7750ce7e93e5 https://conda.anaconda.org/conda-forge/noarch/google-auth-1.24.0-pyhd3deb0d_0.tar.bz2#98d64bae24359f0872abc24368691582 https://conda.anaconda.org/conda-forge/noarch/h5netcdf-0.10.0-pyhd8ed1ab_0.tar.bz2#b5c92155f9e1c3c7c18b95453f90145a https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.1.2-pyh9f0ad1d_0.tar.bz2#2cbd910890bb328e8959246a1e16fac7 https://conda.anaconda.org/conda-forge/osx-64/matplotlib-3.2.2-1.tar.bz2#e647d761393c7b65c8e0d77833716fad https://conda.anaconda.org/conda-forge/noarch/nbformat-5.1.2-pyhd8ed1ab_1.tar.bz2#9633dbb668ac1f9266427672816899dc https://conda.anaconda.org/conda-forge/osx-64/netcdf4-1.5.6-nompi_py37hf02b566_100.tar.bz2#15717182c85e1585b6b29ea06a740ec8 -https://conda.anaconda.org/conda-forge/noarch/pint-0.16.1-py_0.tar.bz2#3a147e648229168687fa22d309faa6fb https://conda.anaconda.org/conda-forge/osx-64/pytest-6.2.2-py37hf985489_0.tar.bz2#bb8fd77c28bf999b9003cbdc89660007 https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-0.24.1-py37hbcf18d0_0.tar.bz2#12bd334618ca85f59af8b496c8d0a703 -https://conda.anaconda.org/conda-forge/noarch/tifffile-2021.2.1-pyhd8ed1ab_0.tar.bz2#b7d06b595056cfe6fae98488e1f9239d -https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.3-pyhd8ed1ab_0.tar.bz2#25573e57774dd54cfa848e5dd44503ed +https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.4-pyhd8ed1ab_0.tar.bz2#d7b20b328e23d993994ea02077c009c0 https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.5-pyh9f0ad1d_2.tar.bz2#5266fcd697043c59621fda522b3d78ee -https://conda.anaconda.org/conda-forge/noarch/xarray-0.16.2-pyhd8ed1ab_0.tar.bz2#45057a982fbac8e5c5ba5167358d4bbb +https://conda.anaconda.org/conda-forge/noarch/xarray-0.17.0-pyhd8ed1ab_0.tar.bz2#972b41b5afded8acbfed8ea18d016765 https://conda.anaconda.org/conda-forge/noarch/zarr-2.6.1-pyhd8ed1ab_0.tar.bz2#cde929aee3ed7ceb99169b2b254735eb https://conda.anaconda.org/conda-forge/noarch/dask-2.22.0-py_0.tar.bz2#a018fdec534461186d22bd812ece72b3 -https://conda.anaconda.org/conda-forge/noarch/nbclient-0.5.2-pyhd8ed1ab_0.tar.bz2#06970c2047dd29a7d320b0a765f9b1e4 -https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.16-pyha770c72_0.tar.bz2#1a7cec3da4a94cd23d3de4155bff4941 +https://conda.anaconda.org/conda-forge/noarch/nbclient-0.5.3-pyhd8ed1ab_0.tar.bz2#67f12831640fde52fe9be1bbc6b699e7 +https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.17-pyha770c72_0.tar.bz2#d3ff1dc51da26f2757c8d95c3522138e https://conda.anaconda.org/conda-forge/noarch/pytest-mpl-0.12-pyhd3deb0d_0.tar.bz2#aa4920fbebc7d1338e59928bf5189644 https://conda.anaconda.org/conda-forge/noarch/requests-2.25.1-pyhd3deb0d_0.tar.bz2#ae687aba31a1c400192a86a2e993ffdc -https://conda.anaconda.org/conda-forge/osx-64/scikit-image-0.17.2-py37h010c265_4.tar.bz2#a955da886bfcda064f323c188a519c4e https://conda.anaconda.org/conda-forge/noarch/adal-1.2.6-pyh44b312d_0.tar.bz2#df655c77a2dc5e0afa4beb0101bb261d https://conda.anaconda.org/conda-forge/osx-64/conda-4.9.2-py37hf985489_0.tar.bz2#8ccd5a89558c8f7ffb5f077c79da3a36 -https://conda.anaconda.org/conda-forge/noarch/intake-0.6.1-pyhd8ed1ab_0.tar.bz2#208abfece70ea3558b9fbb215e4a8cb2 -https://conda.anaconda.org/conda-forge/osx-64/ipython-7.20.0-py37he01cfaa_2.tar.bz2#93e488723bca21c35bf5573f43f18b01 +https://conda.anaconda.org/conda-forge/noarch/intake-0.6.2-pyhd8ed1ab_0.tar.bz2#159c093fadd067d8e1d6e559fae44288 +https://conda.anaconda.org/conda-forge/osx-64/ipython-7.21.0-py37he01cfaa_0.tar.bz2#96627dad2914a0e3232587bacc1d5ad7 https://conda.anaconda.org/conda-forge/osx-64/nbconvert-6.0.7-py37hf985489_3.tar.bz2#cbf915c9d112392238f5ecc98555e132 -https://conda.anaconda.org/conda-forge/noarch/pooch-1.1.1-py_0.tar.bz2#8f03395636c174d5e85c2c37fec932d8 https://conda.anaconda.org/conda-forge/noarch/pyct-0.4.6-py_0.tar.bz2#42d91c89bc3993ec88681cffd3c0e326 https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.0-pyh9f0ad1d_0.tar.bz2#acdcfb3267ef1a8e576e84480a5e259d https://conda.anaconda.org/conda-forge/noarch/xgcm-0.5.1-py_0.tar.bz2#935f4608a93c5bf80d9c33810ef40aa0 @@ -271,11 +249,10 @@ https://conda.anaconda.org/conda-forge/osx-64/conda-build-3.21.4-py37hf985489_0. https://conda.anaconda.org/conda-forge/noarch/intake-xarray-0.4.1-pyhd8ed1ab_0.tar.bz2#a3204c2105c162fb1c3087ee43513fdd https://conda.anaconda.org/conda-forge/osx-64/ipykernel-5.5.0-py37he01cfaa_1.tar.bz2#b10a8e1325fd68f9f436dcd7b18fc1bc https://conda.anaconda.org/conda-forge/osx-64/jupyter_server-1.4.1-py37hf985489_0.tar.bz2#81c5effcb713aeccaef477ac936d1ec1 -https://conda.anaconda.org/conda-forge/noarch/metpy-1.0-pyhd8ed1ab_0.tar.bz2#b7da8602ec108ea1e056598f8d861909 -https://conda.anaconda.org/conda-forge/noarch/panel-0.10.3-pyhd8ed1ab_0.tar.bz2#728cb40d5b9b8b1b12232c05135b5709 +https://conda.anaconda.org/conda-forge/noarch/panel-0.11.0-pyhd8ed1ab_0.tar.bz2#4708a89fcfa9d608828b4a99a8387220 https://conda.anaconda.org/conda-forge/noarch/python-kubernetes-12.0.1-pyhd3deb0d_0.tar.bz2#ea05dfb791055ec8f6c0bf696bfe92d0 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.3.0-pyhd8ed1ab_0.tar.bz2#e1ab43655ba7ede6917e2daa37c7b217 https://conda.anaconda.org/conda-forge/osx-64/notebook-6.2.0-py37hf985489_0.tar.bz2#ea3b665188257fff426848e7d8e5b28b -https://conda.anaconda.org/conda-forge/noarch/holoviews-1.14.1-pyhd3deb0d_0.tar.bz2#6eb38f813c06691658f9cb00235191a0 +https://conda.anaconda.org/conda-forge/noarch/holoviews-1.14.2-pyhd8ed1ab_0.tar.bz2#58586aaed3d6e1313796a3feda90ac34 https://conda.anaconda.org/conda-forge/noarch/nbclassic-0.2.6-pyhd8ed1ab_0.tar.bz2#49be35e31b49012ea91fcd667ebdf4ad -https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.0.9-pyhd8ed1ab_0.tar.bz2#083a50575417a6148ce09133f6d4d63d +https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.0.11-pyhd8ed1ab_0.tar.bz2#af8e216cd0b7f5e4f9adc17b68857d41 diff --git a/conda-win-64.lock b/conda-win-64.lock index dd65eb172e..71eaec97b7 100644 --- a/conda-win-64.lock +++ b/conda-win-64.lock @@ -1,60 +1,48 @@ # platform: win-64 -# env_hash: 09699c0286e853af337f51038f54f92611eddd049d1195dc2a2a9add8e09cd65 +# env_hash: dc17236a40c622aed7d09e7526e7caffa23c753d7de654574430a03c14169a7f @EXPLICIT https://conda.anaconda.org/conda-forge/win-64/ca-certificates-2020.12.5-h5b45459_0.tar.bz2#f36a2988a9f57cffdc43929ba67a3a2a https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2020.3-h57928b3_311.tar.bz2#361a51c98a0cb06415bd3f9d3bbb5778 https://conda.anaconda.org/conda-forge/win-64/msys2-conda-epoch-20160418-1.tar.bz2#b0309b72560df66f71a9d5e34a5efdfa -https://conda.anaconda.org/conda-forge/win-64/pandoc-2.11.4-h8ffe710_0.tar.bz2#8b0446e8cc07c9d41ded3e05fa215bb7 -https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.28.29325-h5e1d092_3.tar.bz2#23678152b829fcf69cdf5e7c5510120d +https://conda.anaconda.org/conda-forge/win-64/pandoc-2.12-h8ffe710_0.tar.bz2#4218a3ddeba9264ce30477f409363101 +https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.28.29325-h5e1d092_4.tar.bz2#e89bf06003c46c09ee8628eb76aa9520 https://conda.anaconda.org/conda-forge/win-64/winpty-0.4.3-4.tar.bz2#1cee351bf20b830d991dbe0bc8cd7dfe https://conda.anaconda.org/conda-forge/win-64/m2-msys2-runtime-2.5.0.17080.65c939c-3.tar.bz2#ce25c58bc90071bf71f3d472cb8dfbce https://conda.anaconda.org/conda-forge/win-64/m2w64-gmp-6.1.0-2.tar.bz2#53a1c73e1e3d185516d7e3af177596d9 https://conda.anaconda.org/conda-forge/win-64/m2w64-libwinpthread-git-5.0.0.4634.697f757-2.tar.bz2#774130a326dee16f1ceb05cc687ee4f0 https://conda.anaconda.org/conda-forge/win-64/mkl-2020.4-hb70f87d_311.tar.bz2#eb823c8b41ecf9cd5f08baea1b32e4ef -https://conda.anaconda.org/conda-forge/win-64/vc-14.2-hb210afc_3.tar.bz2#0c6a9fb1b4de5694ab5d7e41c84fb596 -https://conda.anaconda.org/conda-forge/win-64/blosc-1.21.0-h0e60522_0.tar.bz2#19b82b554c46598cc5cc01a58f30f547 -https://conda.anaconda.org/conda-forge/win-64/brotli-1.0.9-h0e60522_4.tar.bz2#8f75a12ab373e205afd7569fcf556d08 +https://conda.anaconda.org/conda-forge/win-64/vc-14.2-hb210afc_4.tar.bz2#45ddc2c65ad6c200120db1a682803462 https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-h8ffe710_4.tar.bz2#7c03c66026944073040cb19a4f3ec3c9 -https://conda.anaconda.org/conda-forge/win-64/charls-2.2.0-h39d44d4_0.tar.bz2#7b4af3de4c91113430f2cafec2221764 https://conda.anaconda.org/conda-forge/win-64/ffmpeg-4.3.1-ha925a31_0.tar.bz2#858eb8e0630eab350939a189963051e8 -https://conda.anaconda.org/conda-forge/win-64/geos-3.9.1-h39d44d4_0.tar.bz2#b6e792fb27e0363b727f8208a64e11e7 -https://conda.anaconda.org/conda-forge/win-64/giflib-5.2.1-h8d14728_2.tar.bz2#c577cd3be126d95e9a05ee5aa9d2875b +https://conda.anaconda.org/conda-forge/win-64/geos-3.9.1-h39d44d4_2.tar.bz2#e3917eed32c31c341ac9ac4e229f131f https://conda.anaconda.org/conda-forge/win-64/icu-68.1-h0e60522_0.tar.bz2#5ca3de83c29382b94a575926b1d9a743 https://conda.anaconda.org/conda-forge/win-64/jpeg-9d-h8ffe710_0.tar.bz2#9335a1b24eefef6075f4c02a03baf27a -https://conda.anaconda.org/conda-forge/win-64/jxrlib-1.1-h8ffe710_2.tar.bz2#69f82948e102dc14928619140c29468d -https://conda.anaconda.org/conda-forge/win-64/lerc-2.2.1-h0e60522_0.tar.bz2#5ea14f204e4caaea47598f719adbf80b -https://conda.anaconda.org/conda-forge/win-64/libaec-1.0.4-h39d44d4_1.tar.bz2#6a35bd17a3db8f3a12a2a30ef0dc60d4 https://conda.anaconda.org/conda-forge/win-64/libblas-3.9.0-8_mkl.tar.bz2#6de24bc80d8a3dcd5e2f06641a5d1da3 -https://conda.anaconda.org/conda-forge/win-64/libclang-11.0.1-default_h5c34c98_1.tar.bz2#51d7c5a6238ab43aba107964cd32f599 -https://conda.anaconda.org/conda-forge/win-64/libdeflate-1.7-h8ffe710_5.tar.bz2#a745d8a24a297de721c60cd8e45be031 +https://conda.anaconda.org/conda-forge/win-64/libclang-11.1.0-default_h5c34c98_0.tar.bz2#7278a87c03a09158b49bcaf972beb7ed https://conda.anaconda.org/conda-forge/win-64/libiconv-1.16-he774522_0.tar.bz2#bdfeadc9348e4d9fbe4821e81bf8f221 https://conda.anaconda.org/conda-forge/win-64/liblief-0.10.1-ha925a31_2.tar.bz2#722fe9d130f4504d4048a9c397f9d3ea https://conda.anaconda.org/conda-forge/win-64/libsodium-1.0.18-h8d14728_1.tar.bz2#5c1fb45b5e2912c19098750ae8a32604 -https://conda.anaconda.org/conda-forge/win-64/libwebp-base-1.2.0-h8ffe710_0.tar.bz2#00525396457ebab552866f33e6d18775 -https://conda.anaconda.org/conda-forge/win-64/libzopfli-1.0.3-h0e60522_0.tar.bz2#b4b0cbc0abc9f26b730231ffdabf3881 https://conda.anaconda.org/conda-forge/win-64/lz4-c-1.9.3-h8ffe710_0.tar.bz2#5c9a617ed4fbd41f8c564fab236dda60 https://conda.anaconda.org/conda-forge/win-64/lzo-2.10-he774522_1000.tar.bz2#d5cf4b7eaa52316f135eed9e8548ad57 https://conda.anaconda.org/conda-forge/win-64/m2-patch-2.7.5-2.tar.bz2#f5159110837c3e221146e623f3c44f1c https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-core-5.3.0-7.tar.bz2#4289d80fb4d272f1f3b56cfe87ac90bd https://conda.anaconda.org/conda-forge/win-64/openssl-1.1.1j-h8ffe710_0.tar.bz2#3f98c6e8d40701b975943feda6fd2cfc -https://conda.anaconda.org/conda-forge/win-64/snappy-1.1.8-ha925a31_3.tar.bz2#e227e973dec9f437b28b24f9f0e5f7fe https://conda.anaconda.org/conda-forge/win-64/sqlite-3.34.0-h8ffe710_0.tar.bz2#0887d420b945a5342cd03429d475658c https://conda.anaconda.org/conda-forge/win-64/tk-8.6.10-h8ffe710_1.tar.bz2#0796b4624ee7797fca7819459a79c6e6 https://conda.anaconda.org/conda-forge/win-64/xz-5.2.5-h62dcd97_1.tar.bz2#eabcbfedd14d7c18a514afca09ea0ebb https://conda.anaconda.org/conda-forge/win-64/yaml-0.2.5-he774522_0.tar.bz2#d41c34441d8bbb6d141e691ae7bccf35 -https://conda.anaconda.org/conda-forge/win-64/zfp-0.5.5-h0e60522_4.tar.bz2#65f2b475fd45417ce2c116e43add3fb2 https://conda.anaconda.org/conda-forge/win-64/zlib-1.2.11-h62dcd97_1010.tar.bz2#a4cdf389c5f73e60a0ca121ff77c22a9 https://conda.anaconda.org/conda-forge/win-64/hdf4-4.2.13-h0e5069d_1004.tar.bz2#560b7afe9baf32865dbf51b775e79b4b https://conda.anaconda.org/conda-forge/win-64/krb5-1.17.2-hbae68bd_0.tar.bz2#36781bd85367e21cda881c9a5212ea9c https://conda.anaconda.org/conda-forge/win-64/libcblas-3.9.0-8_mkl.tar.bz2#3bac56af014b2ef22ebd87d4f5ee2774 https://conda.anaconda.org/conda-forge/win-64/liblapack-3.9.0-8_mkl.tar.bz2#f3c618bd796a71eede50ffe29d25ad8c https://conda.anaconda.org/conda-forge/win-64/libpng-1.6.37-h1d00b33_2.tar.bz2#005ddb14b8f876ed6a85b76dfc9892db -https://conda.anaconda.org/conda-forge/win-64/libssh2-1.9.0-hb06d900_5.tar.bz2#d98a41c806a42bffd8b05a2e6f1132f1 +https://conda.anaconda.org/conda-forge/win-64/libssh2-1.9.0-h680486a_6.tar.bz2#4633dc7f3ab2692be68952ded790dd16 https://conda.anaconda.org/conda-forge/win-64/libxml2-2.9.10-hf5bbc77_3.tar.bz2#4d2f9377b960b9f1425e91e13a30126c https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libgfortran-5.3.0-6.tar.bz2#066552ac6b907ec6d72c0ddab29050dc https://conda.anaconda.org/conda-forge/win-64/python-3.7.10-h7840368_100_cpython.tar.bz2#d1cd351219ab70e421897281ab05fecd -https://conda.anaconda.org/conda-forge/win-64/zeromq-4.3.3-h0e60522_3.tar.bz2#3f14354fbaa50a70595d6d1a54292996 -https://conda.anaconda.org/conda-forge/win-64/zstd-1.4.8-h4e2f164_1.tar.bz2#f8a86a17cb984eb3a5051e29dfb4168b +https://conda.anaconda.org/conda-forge/win-64/zeromq-4.3.4-h0e60522_0.tar.bz2#e9004ac5d24937850e9edff978c7e515 +https://conda.anaconda.org/conda-forge/win-64/zstd-1.4.9-h6255e5f_0.tar.bz2#f90b3cf10fd4528f52a681f0337b4889 https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b https://conda.anaconda.org/conda-forge/noarch/asciitree-0.3.3-py_2.tar.bz2#c0481c9de49f040272556e2cedf42816 https://conda.anaconda.org/conda-forge/noarch/async-timeout-3.0.1-py_1000.tar.bz2#8b11024b2762a07aaa07d2743231a41b @@ -65,7 +53,7 @@ https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz https://conda.anaconda.org/conda-forge/noarch/backoff-1.10.0-py_0.tar.bz2#e59e9185ec7c2937a46c1aa1b17642b7 https://conda.anaconda.org/conda-forge/noarch/backports-1.0-py_2.tar.bz2#0da16b293affa6ac31812376f8eb79dd https://conda.anaconda.org/conda-forge/noarch/blinker-1.4-py_1.tar.bz2#fa509a09190583f869ae442bf4d17f5f -https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.1-py_0.tar.bz2#a5773589b22d6d4f6201fb7c261bf77f +https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a https://conda.anaconda.org/conda-forge/noarch/cachetools-4.2.1-pyhd8ed1ab_0.tar.bz2#c48f5ea63f27d8ede4117b6d99c6142b 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 @@ -73,12 +61,12 @@ https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.4-pyh9f0ad1d_0.tar.bz https://conda.anaconda.org/conda-forge/noarch/crcmod-1.7-pyhd8ed1ab_1005.tar.bz2#9158f567c19ae53083b7207a086d8347 https://conda.anaconda.org/conda-forge/noarch/cssselect-1.1.0-py_0.tar.bz2#c2b0104cc7d2ef771a40281a26524b87 https://conda.anaconda.org/conda-forge/noarch/decorator-4.4.2-py_0.tar.bz2#d2eabb9cabd212e1ec6a9463bd846243 -https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.6.0-py_0.tar.bz2#37e1033daee0e2edaa5ff42584c52b21 +https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2 https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.3-pyhd8ed1ab_1003.tar.bz2#bbf9a201f6ce99a506f4955374d9a9f4 https://conda.anaconda.org/conda-forge/noarch/f90nml-1.2-pyh9f0ad1d_0.tar.bz2#1969f3ac0952e50b2ba35a05c11129de https://conda.anaconda.org/conda-forge/noarch/filelock-3.0.12-pyh9f0ad1d_0.tar.bz2#7544ed05bbbe9bb687bc9bcbe4d6cb46 https://conda.anaconda.org/conda-forge/win-64/freetype-2.10.4-h546665d_1.tar.bz2#1215a2e49d23da91c28d97cff8de35ea -https://conda.anaconda.org/conda-forge/noarch/fsspec-0.8.5-pyhd8ed1ab_0.tar.bz2#6f86dae0901b373f96b7e92768ef6ebe +https://conda.anaconda.org/conda-forge/noarch/fsspec-0.8.7-pyhd8ed1ab_0.tar.bz2#b93ab5a4692ba685b455f0e8e5dc93e4 https://conda.anaconda.org/conda-forge/noarch/glob2-0.7-py_0.tar.bz2#1f3a88e65e61216e1d475135922dbf6a 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 @@ -86,7 +74,7 @@ https://conda.anaconda.org/conda-forge/noarch/iniconfig-1.1.1-pyh9f0ad1d_0.tar.b https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287 https://conda.anaconda.org/conda-forge/noarch/json5-0.9.5-pyh9f0ad1d_0.tar.bz2#10759827a94e6b14996e81fb002c0bda https://conda.anaconda.org/conda-forge/win-64/libarchive-3.5.1-h8686738_1.tar.bz2#cb856f968eeeb572d90a557f9afedad9 -https://conda.anaconda.org/conda-forge/win-64/libcurl-7.71.1-h4b64cdc_8.tar.bz2#47468949c81228d0f8a492a124688221 +https://conda.anaconda.org/conda-forge/win-64/libcurl-7.75.0-hf1763fc_0.tar.bz2#edc942519e4689a2ad384ca7e2d017fe https://conda.anaconda.org/conda-forge/win-64/libtiff-4.2.0-hc10be44_0.tar.bz2#7f2eeddf7e5a137f488377fc4aeec849 https://conda.anaconda.org/conda-forge/win-64/libxslt-1.1.33-h65864e5_2.tar.bz2#129a6bde176b51eaa52541e28fa52d5c https://conda.anaconda.org/conda-forge/noarch/locket-0.2.0-py_2.tar.bz2#709e8671651c7ec3d1ad07800339ff1d @@ -123,30 +111,31 @@ https://conda.anaconda.org/conda-forge/noarch/testpath-0.4.4-py_0.tar.bz2#3b98ff https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-2.1.0-pyh5ca1d4c_0.tar.bz2#9eb32b63458380aa3804de519b6e5749 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/tqdm-4.57.0-pyhd8ed1ab_0.tar.bz2#d9b5df7cfaf4d7ac83d1cf3aba52cfd1 +https://conda.anaconda.org/conda-forge/noarch/tqdm-4.59.0-pyhd8ed1ab_0.tar.bz2#9ae6fb908a7f989e59a02fef85a5fd6f 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/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136 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.0-py_0.tar.bz2#0df927d2e46244cef8fd75d7ec2ba51c +https://conda.anaconda.org/conda-forge/noarch/zipp-3.4.1-pyhd8ed1ab_0.tar.bz2#a4fa30eb74a326092b3d8078b1f1aae1 https://conda.anaconda.org/conda-forge/noarch/babel-2.9.0-pyhd3deb0d_0.tar.bz2#1cb532c9a6fd4e56a9f0906b87c17b76 https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.9.3-pyhb0f4dca_0.tar.bz2#d243a293d7303ab6195d96ce8c16b1cb +https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551 https://conda.anaconda.org/conda-forge/win-64/certifi-2020.12.5-py37h03978a9_1.tar.bz2#1051015def01978c43d8bcbb3f6dc143 https://conda.anaconda.org/conda-forge/win-64/cffi-1.14.5-py37hd8e9650_0.tar.bz2#5686156c1bcc7039cb3e41438380d0d5 -https://conda.anaconda.org/conda-forge/win-64/chardet-3.0.4-py37hf50a25e_1008.tar.bz2#5f08c251d2878ff6b182162cfdb6b545 +https://conda.anaconda.org/conda-forge/win-64/chardet-4.0.0-py37h03978a9_1.tar.bz2#566dbd28c78bb886e678e61893d249ba https://conda.anaconda.org/conda-forge/win-64/conda-package-handling-1.7.2-py37h6dbccfb_0.tar.bz2#34ec2ca194aacdae7b8b43682a4e898d -https://conda.anaconda.org/conda-forge/win-64/coverage-5.4-py37hcc03f2d_0.tar.bz2#f809a344b1c78c5b3ffa486588b12d49 -https://conda.anaconda.org/conda-forge/win-64/curl-7.71.1-h4b64cdc_8.tar.bz2#267ca21178cb1f36ee871ed1a630322b +https://conda.anaconda.org/conda-forge/win-64/coverage-5.5-py37hcc03f2d_0.tar.bz2#344d780ae5f04a25ff4b80e1fc140818 +https://conda.anaconda.org/conda-forge/win-64/curl-7.75.0-hf1763fc_0.tar.bz2#f185f062ab302cc6b0124877e59a1849 https://conda.anaconda.org/conda-forge/noarch/cycler-0.10.0-py_2.tar.bz2#f6d7c7e6d8f42cbbec7e07a8d879f91c https://conda.anaconda.org/conda-forge/win-64/cytoolz-0.11.0-py37hcc03f2d_3.tar.bz2#693d4c94762b3b87bd34471dd01ed40b https://conda.anaconda.org/conda-forge/noarch/docrep-0.2.7-py_0.tar.bz2#7a8411a58c16dffe32424251e62e3149 https://conda.anaconda.org/conda-forge/noarch/fasteners-0.14.1-py_3.tar.bz2#8af0bf3cfe806fb001d9923b4fe1594b https://conda.anaconda.org/conda-forge/win-64/future-0.18.2-py37h03978a9_3.tar.bz2#9fa40ffbabba0300a303a5bb72b04a85 https://conda.anaconda.org/conda-forge/win-64/hdf5-1.10.6-nompi_h5268f04_1114.tar.bz2#31de6a434e8cfef843303d123c1158ff -https://conda.anaconda.org/conda-forge/win-64/importlib-metadata-3.4.0-py37h03978a9_0.tar.bz2#5ec11562e0d03ec5de82d47c1cc3d8b0 +https://conda.anaconda.org/conda-forge/win-64/importlib-metadata-3.7.3-py37h03978a9_0.tar.bz2#b6a51c6d26478f2b90127f069f711c16 https://conda.anaconda.org/conda-forge/win-64/jedi-0.18.0-py37h03978a9_2.tar.bz2#071560e0cb1e1cad66ec740ef69eb541 https://conda.anaconda.org/conda-forge/win-64/kiwisolver-1.3.1-py37h8c56517_1.tar.bz2#ce90a3041640620d27bdc2e87d5768ae https://conda.anaconda.org/conda-forge/win-64/lcms2-2.12-h2a16943_0.tar.bz2#fee639c27301c4165b4d1f7e442de8a5 -https://conda.anaconda.org/conda-forge/win-64/llvmlite-0.35.0-py37habb0c8c_1.tar.bz2#99ea47d5a5e1f0f43bb4641d5468d2b3 +https://conda.anaconda.org/conda-forge/win-64/llvmlite-0.36.0-py37habb0c8c_0.tar.bz2#a8648c0457f250349984001e24a313c2 https://conda.anaconda.org/conda-forge/win-64/lxml-4.6.2-py37hd07aab1_1.tar.bz2#87fe4674f959941eb88956360f17930c https://conda.anaconda.org/conda-forge/win-64/markupsafe-1.1.1-py37hcc03f2d_3.tar.bz2#9d7dcdff8c2cee50345867aed8916813 https://conda.anaconda.org/conda-forge/win-64/mistune-0.8.4-py37hcc03f2d_1003.tar.bz2#ecca7e30da66725c27800307347c85fa @@ -154,7 +143,6 @@ https://conda.anaconda.org/conda-forge/win-64/msgpack-python-1.0.2-py37h8c56517_ https://conda.anaconda.org/conda-forge/win-64/multidict-5.1.0-py37hcc03f2d_1.tar.bz2#a2ea77916542dd682a075e4e4fa40c00 https://conda.anaconda.org/conda-forge/win-64/mypy_extensions-0.4.3-py37h03978a9_3.tar.bz2#95b17307b05ac9eb21a8a5fa6bc393d7 https://conda.anaconda.org/conda-forge/win-64/numpy-1.20.1-py37hd20adf4_0.tar.bz2#db6b5e76d6db984128458b1e39153cf5 -https://conda.anaconda.org/conda-forge/win-64/openjpeg-2.4.0-h48faf41_0.tar.bz2#b0538426e700affa288feef6069be0c7 https://conda.anaconda.org/conda-forge/noarch/packaging-20.9-pyh44b312d_0.tar.bz2#be69a38e912054a62dc82cc3c7711a64 https://conda.anaconda.org/conda-forge/noarch/partd-1.1.0-py_0.tar.bz2#4afbf2cdf4e6ad279080d3adb5cefaae https://conda.anaconda.org/conda-forge/win-64/proj-7.2.0-h1cfcee9_2.tar.bz2#7e1c54143879ff2b875b1664831548b8 @@ -172,10 +160,10 @@ https://conda.anaconda.org/conda-forge/noarch/pyviz_comms-2.0.1-pyhd3deb0d_0.tar https://conda.anaconda.org/conda-forge/win-64/pywin32-300-py37hcc03f2d_0.tar.bz2#332665e8d4a64b4901c014bc09e63d64 https://conda.anaconda.org/conda-forge/win-64/pywinpty-0.5.7-py37hc8dfbb8_1.tar.bz2#444e46826f687355650f235b64e6a9a4 https://conda.anaconda.org/conda-forge/win-64/pyyaml-5.3-py37h8055547_1.tar.bz2#f55467e93b133670048c650cb5293e3f -https://conda.anaconda.org/conda-forge/win-64/pyzmq-22.0.3-py37h0d95fc2_0.tar.bz2#876b8525c53a7fb659f0acb9d526092c +https://conda.anaconda.org/conda-forge/win-64/pyzmq-22.0.3-py37hcce574b_1.tar.bz2#814ae1e0dcc1139520566fd070b61f94 https://conda.anaconda.org/conda-forge/win-64/regex-2020.11.13-py37hcc03f2d_1.tar.bz2#b894113bde1136f67ce52b4fa3c0a166 https://conda.anaconda.org/conda-forge/win-64/ripgrep-12.1.1-h301d43c_1.tar.bz2#becca280ed37a9ffa9fe12f827ada988 -https://conda.anaconda.org/conda-forge/noarch/rsa-4.7.1-pyh44b312d_0.tar.bz2#ff8e0c6a909a84c9496762fa5d438c8c +https://conda.anaconda.org/conda-forge/noarch/rsa-4.7.2-pyh44b312d_0.tar.bz2#3452ab3790dbb1df9508b3fa4ea2f806 https://conda.anaconda.org/conda-forge/win-64/ruamel_yaml-0.15.80-py37hcc03f2d_1004.tar.bz2#475705a2c2b9d62edba42705650b9d13 https://conda.anaconda.org/conda-forge/win-64/sniffio-1.2.0-py37h03978a9_1.tar.bz2#2a4aee03e0cf8c94426e5d78c429e7a6 https://conda.anaconda.org/conda-forge/win-64/tornado-6.1-py37hcc03f2d_1.tar.bz2#20d238a5f4b51be48f0b171628ee873b @@ -186,87 +174,77 @@ https://conda.anaconda.org/conda-forge/win-64/websocket-client-0.57.0-py37h03978 https://conda.anaconda.org/conda-forge/win-64/win_inet_pton-1.1.0-py37h03978a9_2.tar.bz2#3be8e856f5b7726960041ff2fbeee4dd https://conda.anaconda.org/conda-forge/win-64/wincertstore-0.2-py37h03978a9_1006.tar.bz2#d05992e21bc7622dd0dce0b087452250 https://conda.anaconda.org/conda-forge/noarch/zict-2.0.0-py_0.tar.bz2#4750152be22f24d695b3004c5e1712d3 -https://conda.anaconda.org/conda-forge/win-64/anyio-2.1.0-py37h03978a9_0.tar.bz2#5192c25560f83056af199e21911fc508 +https://conda.anaconda.org/conda-forge/win-64/anyio-2.2.0-py37h03978a9_0.tar.bz2#e56f72f0bf5aeedb324ee3f8394c68b2 https://conda.anaconda.org/conda-forge/win-64/argon2-cffi-20.1.0-py37hcc03f2d_2.tar.bz2#2defb4e736e12c589d517af111b4177e https://conda.anaconda.org/conda-forge/noarch/black-19.10b0-py_4.tar.bz2#ae8375ed2a4c1c67966ab08dc44d96a3 https://conda.anaconda.org/conda-forge/win-64/brotlipy-0.7.0-py37hcc03f2d_1001.tar.bz2#5ae82a09056fc8eebd74222f3851c544 https://conda.anaconda.org/conda-forge/win-64/cftime-1.4.1-py37hda49f71_0.tar.bz2#1b3bc1311753149d36ab5203b6a01165 -https://conda.anaconda.org/conda-forge/win-64/cryptography-3.4.4-py37h65266a2_0.tar.bz2#49adbceec272997f3b8d5180820a7774 +https://conda.anaconda.org/conda-forge/win-64/cryptography-3.4.6-py37h20c650d_0.tar.bz2#0dadd2d9961c3ba3dca75c704245b5d1 https://conda.anaconda.org/conda-forge/noarch/dask-core-2.22.0-py_0.tar.bz2#56a42c164454e6f2187c02803bb0440d https://conda.anaconda.org/conda-forge/win-64/h5py-3.1.0-nompi_py37h19fda09_100.tar.bz2#169697f426014c94069c5e422a8ad30b -https://conda.anaconda.org/conda-forge/win-64/imagecodecs-2021.1.11-py37hfc4c502_1.tar.bz2#f46392408b1910a0d0b24c7f0bafeb18 -https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-3.4.0-hd8ed1ab_0.tar.bz2#6d962cade0658bb1040a3e994add14e0 +https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-3.7.3-hd8ed1ab_0.tar.bz2#ad08b40b6f4550b6fad9806d16df8050 https://conda.anaconda.org/conda-forge/win-64/jupyter_core-4.7.1-py37h03978a9_0.tar.bz2#a260fc63f2edd2225780917c732fe32f https://conda.anaconda.org/conda-forge/win-64/libnetcdf-4.7.4-nompi_h3a9aa94_107.tar.bz2#bdb113a8a711c5bc86e6b18b6b852c8f -https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.3-pyh9f0ad1d_0.tar.bz2#59bb2a2c29091c3a243701e26f6f1f5e +https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.4-pyhd8ed1ab_0.tar.bz2#b8054f74fbed2b282f032219f114421a https://conda.anaconda.org/conda-forge/win-64/menuinst-1.4.16-py37hc8dfbb8_1.tar.bz2#25864d0f620ec6d540dd43aa49b95d43 https://conda.anaconda.org/conda-forge/noarch/mypy-0.770-py_0.tar.bz2#6f6066180325653cb41bd4bab930dc4c https://conda.anaconda.org/conda-forge/win-64/numcodecs-0.7.3-py37hf2a7229_0.tar.bz2#4e9cf206e87f9964ce5e2583e2c70edd https://conda.anaconda.org/conda-forge/win-64/pandas-1.0.1-py37he350917_0.tar.bz2#9e876157e4c081e121d1dfc205fd19ec -https://conda.anaconda.org/conda-forge/win-64/pillow-8.1.0-py37h96663a1_2.tar.bz2#5b4884af3ac554ffa6383eed79f7fd1d -https://conda.anaconda.org/conda-forge/win-64/pyproj-3.0.0.post1-py37hce81e75_0.tar.bz2#a63150a3ab02fbac45e62e955e22380d +https://conda.anaconda.org/conda-forge/win-64/pillow-8.1.2-py37h96663a1_0.tar.bz2#fc07fafd126f585685912924c52ff744 https://conda.anaconda.org/conda-forge/win-64/pyqt-impl-5.12.3-py37hf2a7229_7.tar.bz2#8f962f9f8aace2f9288c7e72414b5fab https://conda.anaconda.org/conda-forge/noarch/pyquery-1.4.3-pyhd8ed1ab_0.tar.bz2#a375af7e878ae426a297e98ee98c6a9a https://conda.anaconda.org/conda-forge/win-64/pysocks-1.7.1-py37h03978a9_3.tar.bz2#57ff67171877b6aa4575b3e9a183b92a -https://conda.anaconda.org/conda-forge/win-64/pywavelets-1.1.1-py37hda49f71_3.tar.bz2#171556c135a2ef4bcdf6dd8157415a78 -https://conda.anaconda.org/conda-forge/win-64/scipy-1.6.0-py37h6db1a17_0.tar.bz2#c0756ebee43c601856ee09d972027b5f +https://conda.anaconda.org/conda-forge/win-64/scipy-1.6.1-py37h6db1a17_0.tar.bz2#5f595d7abd16750a9ebf27d0ef4ffba3 https://conda.anaconda.org/conda-forge/win-64/setuptools-49.6.0-py37h03978a9_3.tar.bz2#1b72c1d232d3bb820f9c129448a5f7ae https://conda.anaconda.org/conda-forge/win-64/shapely-1.7.1-py37hdcc0ea0_4.tar.bz2#2af684101a7a276b84f3d3b4a90496d2 https://conda.anaconda.org/conda-forge/win-64/terminado-0.9.2-py37h03978a9_0.tar.bz2#f47b67d50f075d51b8175077c7539227 https://conda.anaconda.org/conda-forge/win-64/yarl-1.6.3-py37hcc03f2d_1.tar.bz2#fcd33d95978d0c2457a72bdf3db41436 -https://conda.anaconda.org/conda-forge/win-64/aiohttp-3.7.3-py37hcc03f2d_2.tar.bz2#2f1a3a3d2ad4cdc007eac1829b876912 +https://conda.anaconda.org/conda-forge/win-64/aiohttp-3.7.4-py37hcc03f2d_0.tar.bz2#cfdb21900fd0452b46fedc9af15bc334 https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.1-py_0.tar.bz2#d36df15eaef96549ce6231e3088fba54 https://conda.anaconda.org/conda-forge/noarch/bleach-3.3.0-pyh44b312d_0.tar.bz2#abf6b76c39358ca36ca706c46f054f2a https://conda.anaconda.org/conda-forge/win-64/distributed-2.30.1-py37h03978a9_0.tar.bz2#6a2abc792ee458e1b9deee21d8d1fe5a https://conda.anaconda.org/conda-forge/win-64/flake8-3.7.9-py37hc8dfbb8_1.tar.bz2#0c75dd0819f8d9e84006a09d3cbe2607 https://conda.anaconda.org/conda-forge/noarch/h5netcdf-0.10.0-pyhd8ed1ab_0.tar.bz2#b5c92155f9e1c3c7c18b95453f90145a -https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.3.0-pyhd8ed1ab_0.tar.bz2#a3fca24e8915ada4945962d5a4abe8c7 -https://conda.anaconda.org/conda-forge/noarch/imageio-2.9.0-py_0.tar.bz2#62ad9e579278e777d4abaa8c9312b6a7 -https://conda.anaconda.org/conda-forge/win-64/importlib_resources-5.1.0-py37h03978a9_0.tar.bz2#643d8477ad78a3acec28a2079cb15e6c +https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.8.1-pyhd8ed1ab_0.tar.bz2#b6900f6500a083e2819020e19db7d21f https://conda.anaconda.org/conda-forge/noarch/isort-5.7.0-pyhd8ed1ab_0.tar.bz2#073e46728e0d9a8722457cbf1c335c14 https://conda.anaconda.org/conda-forge/noarch/jinja2-2.11.3-pyh44b312d_0.tar.bz2#1d4c3605d85a3655b1595e0694138eb6 https://conda.anaconda.org/conda-forge/noarch/joblib-1.0.1-pyhd8ed1ab_0.tar.bz2#27d5ed1aaf2bbb5a0cc307a12d8e032f -https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-py_2.tar.bz2#a17aa962de6145d08e1008cb37c20161 +https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-pyhd8ed1ab_3.tar.bz2#66125e28711d8ffc04a207a2b170316d https://conda.anaconda.org/conda-forge/noarch/jupyter-packaging-0.7.12-pyhd8ed1ab_0.tar.bz2#ab2fd67d07b63afe5ea6db6c5f32b5fd -https://conda.anaconda.org/conda-forge/noarch/jupyter_client-6.1.11-pyhd8ed1ab_1.tar.bz2#0fcd80df6d4e0558754c39453ffa3110 +https://conda.anaconda.org/conda-forge/noarch/jupyter_client-6.1.12-pyhd8ed1ab_0.tar.bz2#f58b38ddb9f94fa3cafea4ba2b17f93b https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.2.2-py37hab8957c_1.tar.bz2#38c3c017e63605790286108f1fe8bd92 https://conda.anaconda.org/conda-forge/win-64/netcdf4-1.5.6-nompi_py37h4965ef1_100.tar.bz2#7198f442d46a77afc9c5162dd820eb0b -https://conda.anaconda.org/conda-forge/noarch/networkx-2.5-py_0.tar.bz2#d836ad8453c22192357707026ca21653 -https://conda.anaconda.org/conda-forge/win-64/numba-0.52.0-py37h08fd248_0.tar.bz2#edccdfb7ceb445f94e197ead537a8839 +https://conda.anaconda.org/conda-forge/win-64/numba-0.53.0-py37h49d82ab_0.tar.bz2#e1438b39b5ed1a1b30e603fa9f4bafb5 https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.0.1-py_0.tar.bz2#faaf2a8fd1cddecbf1818fcf0ed3a3b6 https://conda.anaconda.org/conda-forge/noarch/pip-20.2.4-py_0.tar.bz2#d2c0e7b7ca15440dc445e725f1e79ccf https://conda.anaconda.org/conda-forge/win-64/pluggy-0.13.1-py37h03978a9_4.tar.bz2#5f4cfa7e8c6b5cb40cf71cb1730e62d4 -https://conda.anaconda.org/conda-forge/noarch/pygments-2.8.0-pyhd8ed1ab_0.tar.bz2#226cd14ba0554ca2648fecd11090f473 +https://conda.anaconda.org/conda-forge/noarch/pygments-2.8.1-pyhd8ed1ab_0.tar.bz2#196e0cff141677f430fc06eb0d0ad94d https://conda.anaconda.org/conda-forge/noarch/pyopenssl-20.0.1-pyhd8ed1ab_0.tar.bz2#92371c25994d0f5d28a01c1fb75ebf86 https://conda.anaconda.org/conda-forge/win-64/pyqtchart-5.12-py37hf2a7229_7.tar.bz2#93e0129a5ae9edd920137f26742fcff3 https://conda.anaconda.org/conda-forge/win-64/pyqtwebengine-5.12.1-py37hf2a7229_7.tar.bz2#fdf2c3d9ba162f675f19208cfe0799b7 -https://conda.anaconda.org/conda-forge/noarch/tifffile-2021.2.1-pyhd8ed1ab_0.tar.bz2#b7d06b595056cfe6fae98488e1f9239d -https://conda.anaconda.org/conda-forge/noarch/xarray-0.16.2-pyhd8ed1ab_0.tar.bz2#45057a982fbac8e5c5ba5167358d4bbb +https://conda.anaconda.org/conda-forge/noarch/xarray-0.17.0-pyhd8ed1ab_0.tar.bz2#972b41b5afded8acbfed8ea18d016765 https://conda.anaconda.org/conda-forge/noarch/zarr-2.6.1-pyhd8ed1ab_0.tar.bz2#cde929aee3ed7ceb99169b2b254735eb -https://conda.anaconda.org/conda-forge/win-64/bokeh-2.2.3-py37h03978a9_0.tar.bz2#a67b82a898d85fcbf0eac4edb24b6f71 -https://conda.anaconda.org/conda-forge/win-64/cartopy-0.18.0-py37hdc8d950_12.tar.bz2#ec0f6f80df7789ed8810350e5ee8e317 +https://conda.anaconda.org/conda-forge/win-64/bokeh-2.3.0-py37h03978a9_0.tar.bz2#136e0fd93c17f13087adf3c21c37db94 +https://conda.anaconda.org/conda-forge/win-64/cartopy-0.18.0-py37hdc8d950_13.tar.bz2#2b18a0c4e7b95ba79a076e8bdd2da97f https://conda.anaconda.org/conda-forge/noarch/google-auth-1.24.0-pyhd3deb0d_0.tar.bz2#98d64bae24359f0872abc24368691582 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.1.2-pyh9f0ad1d_0.tar.bz2#2cbd910890bb328e8959246a1e16fac7 https://conda.anaconda.org/conda-forge/noarch/nbformat-5.1.2-pyhd8ed1ab_1.tar.bz2#9633dbb668ac1f9266427672816899dc -https://conda.anaconda.org/conda-forge/noarch/pint-0.16.1-py_0.tar.bz2#3a147e648229168687fa22d309faa6fb https://conda.anaconda.org/conda-forge/win-64/pyqt-5.12.3-py37h03978a9_7.tar.bz2#146197193dbe4bc1fc04b03933d8f74b https://conda.anaconda.org/conda-forge/win-64/pytest-6.2.2-py37h03978a9_0.tar.bz2#51c54d02783c856e668fae7a4ed0d9c1 -https://conda.anaconda.org/conda-forge/win-64/scikit-image-0.17.2-py37h08fd248_4.tar.bz2#27bd8653e6e69d6396809c9f78740cca https://conda.anaconda.org/conda-forge/win-64/scikit-learn-0.24.1-py37heb15398_0.tar.bz2#7c7a769a1b33eed2c81556bc02426932 -https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.3-pyhd8ed1ab_0.tar.bz2#25573e57774dd54cfa848e5dd44503ed +https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.4-pyhd8ed1ab_0.tar.bz2#d7b20b328e23d993994ea02077c009c0 https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.5-pyh9f0ad1d_2.tar.bz2#5266fcd697043c59621fda522b3d78ee https://conda.anaconda.org/conda-forge/noarch/dask-2.22.0-py_0.tar.bz2#a018fdec534461186d22bd812ece72b3 https://conda.anaconda.org/conda-forge/win-64/matplotlib-3.2.2-1.tar.bz2#4afbb1215fb046b444625bb6b8b4ddd9 -https://conda.anaconda.org/conda-forge/noarch/nbclient-0.5.2-pyhd8ed1ab_0.tar.bz2#06970c2047dd29a7d320b0a765f9b1e4 -https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.16-pyha770c72_0.tar.bz2#1a7cec3da4a94cd23d3de4155bff4941 +https://conda.anaconda.org/conda-forge/noarch/nbclient-0.5.3-pyhd8ed1ab_0.tar.bz2#67f12831640fde52fe9be1bbc6b699e7 +https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.17-pyha770c72_0.tar.bz2#d3ff1dc51da26f2757c8d95c3522138e https://conda.anaconda.org/conda-forge/noarch/pytest-mpl-0.12-pyhd3deb0d_0.tar.bz2#aa4920fbebc7d1338e59928bf5189644 https://conda.anaconda.org/conda-forge/noarch/requests-2.25.1-pyhd3deb0d_0.tar.bz2#ae687aba31a1c400192a86a2e993ffdc https://conda.anaconda.org/conda-forge/noarch/adal-1.2.6-pyh44b312d_0.tar.bz2#df655c77a2dc5e0afa4beb0101bb261d https://conda.anaconda.org/conda-forge/win-64/conda-4.9.2-py37h03978a9_0.tar.bz2#63fb83bb05e5c646e538626aadd168c1 -https://conda.anaconda.org/conda-forge/noarch/intake-0.6.1-pyhd8ed1ab_0.tar.bz2#208abfece70ea3558b9fbb215e4a8cb2 -https://conda.anaconda.org/conda-forge/win-64/ipython-7.20.0-py37heaed05f_2.tar.bz2#cef66c2587b5b8ba639ae801d05ca156 +https://conda.anaconda.org/conda-forge/noarch/intake-0.6.2-pyhd8ed1ab_0.tar.bz2#159c093fadd067d8e1d6e559fae44288 +https://conda.anaconda.org/conda-forge/win-64/ipython-7.21.0-py37heaed05f_0.tar.bz2#8fa5e1c9cdc64410e5d2ddf6d8d9a715 https://conda.anaconda.org/conda-forge/win-64/nbconvert-6.0.7-py37h03978a9_3.tar.bz2#1bbb1ea7e63926ea34e33f35d39b8540 -https://conda.anaconda.org/conda-forge/noarch/pooch-1.1.1-py_0.tar.bz2#8f03395636c174d5e85c2c37fec932d8 https://conda.anaconda.org/conda-forge/noarch/pyct-0.4.6-py_0.tar.bz2#42d91c89bc3993ec88681cffd3c0e326 https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.0-pyh9f0ad1d_0.tar.bz2#acdcfb3267ef1a8e576e84480a5e259d https://conda.anaconda.org/conda-forge/noarch/xgcm-0.5.1-py_0.tar.bz2#935f4608a93c5bf80d9c33810ef40aa0 @@ -275,11 +253,10 @@ https://conda.anaconda.org/conda-forge/win-64/conda-build-3.21.4-py37h03978a9_0. https://conda.anaconda.org/conda-forge/noarch/intake-xarray-0.4.1-pyhd8ed1ab_0.tar.bz2#a3204c2105c162fb1c3087ee43513fdd https://conda.anaconda.org/conda-forge/win-64/ipykernel-5.5.0-py37heaed05f_1.tar.bz2#612357f63e06678da379059570ae6b28 https://conda.anaconda.org/conda-forge/win-64/jupyter_server-1.4.1-py37h03978a9_0.tar.bz2#525dd8bae19fdf5b67ce77ba040c9f55 -https://conda.anaconda.org/conda-forge/noarch/metpy-1.0-pyhd8ed1ab_0.tar.bz2#b7da8602ec108ea1e056598f8d861909 -https://conda.anaconda.org/conda-forge/noarch/panel-0.10.3-pyhd8ed1ab_0.tar.bz2#728cb40d5b9b8b1b12232c05135b5709 +https://conda.anaconda.org/conda-forge/noarch/panel-0.11.0-pyhd8ed1ab_0.tar.bz2#4708a89fcfa9d608828b4a99a8387220 https://conda.anaconda.org/conda-forge/noarch/python-kubernetes-12.0.1-pyhd3deb0d_0.tar.bz2#ea05dfb791055ec8f6c0bf696bfe92d0 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.3.0-pyhd8ed1ab_0.tar.bz2#e1ab43655ba7ede6917e2daa37c7b217 https://conda.anaconda.org/conda-forge/win-64/notebook-6.2.0-py37h03978a9_0.tar.bz2#e8dcf1ffa7819ac113f2a5fd6a0a1b0e -https://conda.anaconda.org/conda-forge/noarch/holoviews-1.14.1-pyhd3deb0d_0.tar.bz2#6eb38f813c06691658f9cb00235191a0 +https://conda.anaconda.org/conda-forge/noarch/holoviews-1.14.2-pyhd8ed1ab_0.tar.bz2#58586aaed3d6e1313796a3feda90ac34 https://conda.anaconda.org/conda-forge/noarch/nbclassic-0.2.6-pyhd8ed1ab_0.tar.bz2#49be35e31b49012ea91fcd667ebdf4ad -https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.0.9-pyhd8ed1ab_0.tar.bz2#083a50575417a6148ce09133f6d4d63d +https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.0.11-pyhd8ed1ab_0.tar.bz2#af8e216cd0b7f5e4f9adc17b68857d41 diff --git a/environment.yml b/environment.yml index 031c6b0dfe..21cddf7af7 100644 --- a/environment.yml +++ b/environment.yml @@ -22,7 +22,6 @@ dependencies: - pandas=1.0.1 - intake - intake-xarray - - metpy - netcdf4>=1.4 - numba - numpy diff --git a/external/vcm/setup.py b/external/vcm/setup.py index 8bcef9d140..260f4ba0d3 100644 --- a/external/vcm/setup.py +++ b/external/vcm/setup.py @@ -18,6 +18,7 @@ "toolz", "scipy", "metpy", + "joblib", "intake", "gcsfs", "zarr", diff --git a/workflows/fine_res_budget/poetry.lock b/workflows/fine_res_budget/poetry.lock index a56f0b6e61..fc3bdb5a65 100644 --- a/workflows/fine_res_budget/poetry.lock +++ b/workflows/fine_res_budget/poetry.lock @@ -843,6 +843,7 @@ matplotlib = ">=2.1.0" numpy = ">=1.16.0" pandas = ">=0.22.0" pint = ">=0.10.1" +pooch = ">=0.1" scipy = ">=1.0" traitlets = ">=4.3.0" xarray = ">=0.13.0" From 60300a402eb2ff28e2c8954b4d3f5a69999ba247 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Thu, 18 Mar 2021 09:40:35 -0700 Subject: [PATCH 6/6] Add regression data for attrs and coordinate info --- ...ray_block_reduce_dataarray[False-mean].out | 12 +++++++ ...y_block_reduce_dataarray[False-median].out | 12 +++++++ ...rray_block_reduce_dataarray[True-mean].out | 12 +++++++ ...ay_block_reduce_dataarray[True-median].out | 12 +++++++ ...testing.test_regression_data_unchanged.out | 15 ++++++++ external/vcm/tests/test_cubedsphere.py | 4 +++ external/vcm/tests/test_testing.py | 36 +++++++++++++++++++ external/vcm/vcm/testing.py | 19 ++++++++++ 8 files changed, 122 insertions(+) create mode 100644 external/vcm/tests/_regtest_outputs/test_testing.test_regression_data_unchanged.out diff --git a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-mean].out b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-mean].out index 4827d90644..8330a15a71 100644 --- a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-mean].out +++ b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-mean].out @@ -1 +1,13 @@ 919ca49721b5b0a8628f273067a8fb4f +xarray.Dataset { +dimensions: + x = 2 ; + y = 2 ; + z = 2 ; + +variables: + float32 a(x, y, z) ; + a:units = m ; + +// global attributes: +} \ No newline at end of file diff --git a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-median].out b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-median].out index 4827d90644..8330a15a71 100644 --- a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-median].out +++ b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[False-median].out @@ -1 +1,13 @@ 919ca49721b5b0a8628f273067a8fb4f +xarray.Dataset { +dimensions: + x = 2 ; + y = 2 ; + z = 2 ; + +variables: + float32 a(x, y, z) ; + a:units = m ; + +// global attributes: +} \ No newline at end of file diff --git a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-mean].out b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-mean].out index 4827d90644..8330a15a71 100644 --- a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-mean].out +++ b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-mean].out @@ -1 +1,13 @@ 919ca49721b5b0a8628f273067a8fb4f +xarray.Dataset { +dimensions: + x = 2 ; + y = 2 ; + z = 2 ; + +variables: + float32 a(x, y, z) ; + a:units = m ; + +// global attributes: +} \ No newline at end of file diff --git a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-median].out b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-median].out index 4827d90644..8330a15a71 100644 --- a/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-median].out +++ b/external/vcm/tests/_regtest_outputs/test_cubedsphere.test_xarray_block_reduce_dataarray[True-median].out @@ -1 +1,13 @@ 919ca49721b5b0a8628f273067a8fb4f +xarray.Dataset { +dimensions: + x = 2 ; + y = 2 ; + z = 2 ; + +variables: + float32 a(x, y, z) ; + a:units = m ; + +// global attributes: +} \ No newline at end of file diff --git a/external/vcm/tests/_regtest_outputs/test_testing.test_regression_data_unchanged.out b/external/vcm/tests/_regtest_outputs/test_testing.test_regression_data_unchanged.out new file mode 100644 index 0000000000..3624c78961 --- /dev/null +++ b/external/vcm/tests/_regtest_outputs/test_testing.test_regression_data_unchanged.out @@ -0,0 +1,15 @@ +Array hash: +a9aa230ec5c5bf71f92e77753b13023d +Coordinate info: +Coordinate x : [1] +xarray.Dataset { +dimensions: + x = 1 ; + +variables: + int64 x(x) ; + int64 a(x) ; + a:hello = world ; + +// global attributes: +} diff --git a/external/vcm/tests/test_cubedsphere.py b/external/vcm/tests/test_cubedsphere.py index bc4608f792..aac6ebd210 100644 --- a/external/vcm/tests/test_cubedsphere.py +++ b/external/vcm/tests/test_cubedsphere.py @@ -270,6 +270,10 @@ def test_xarray_block_reduce_dataarray( input_dataarray, block_sizes, reduction_function ) print(vcm.testing.checksum_dataarray(result), file=regtest) + for coord in result.coords: + print(np.asarray(result[coord]), file=regtest) + # This ensures the metadata is correct + result.to_dataset(name="a").info(regtest) def test_xarray_block_reduce_dataarray_bad_chunk_size(input_dataarray): diff --git a/external/vcm/tests/test_testing.py b/external/vcm/tests/test_testing.py index f8807e4402..4813c7251f 100644 --- a/external/vcm/tests/test_testing.py +++ b/external/vcm/tests/test_testing.py @@ -1,3 +1,4 @@ +from external.vcm.vcm.testing import regression_data import warnings import pytest @@ -25,3 +26,38 @@ def test_checksum_dataarray_mapping(regtest): """ ds = xarray.Dataset({"one": ("x", [1]), "two": ("x", [2])}) print(testing.checksum_dataarray_mapping(ds), file=regtest) + + +def test_regression_data_unchanged(regtest): + """This checks that the integration with regtests works and that the + checksum report hasn't change + """ + a = xarray.DataArray([1], dims=["x"], coords={"x": [1]}, attrs={"hello": "world"}) + print(regression_data(a), file=regtest) + + +def test_regression_data_different_attrs(): + a = xarray.DataArray([1], dims=["x"], attrs={"some": "attr"}) + b = xarray.DataArray([1], dims=["x"], attrs={"another": "attr"}) + + assert testing.regression_data(a) != testing.regression_data(b) + assert testing.regression_data(a, attrs=False) == testing.regression_data( + b, attrs=False + ) + + +def test_regression_data_different_coords(): + a = xarray.DataArray([1], dims=["x"], coords={"x": [1]}) + b = xarray.DataArray([1], dims=["x"], coords={"x": [2]}) + + assert testing.regression_data(a) != testing.regression_data(b) + assert testing.regression_data(a, coords=False) == testing.regression_data( + b, coords=False + ) + + +def test_regression_data_different_array(): + a = xarray.DataArray([2], dims=["x"]) + b = xarray.DataArray([1], dims=["x"]) + + assert testing.regression_data(a) != testing.regression_data(b) diff --git a/external/vcm/vcm/testing.py b/external/vcm/vcm/testing.py index 68c52fc071..05e19649cf 100644 --- a/external/vcm/vcm/testing.py +++ b/external/vcm/vcm/testing.py @@ -5,6 +5,8 @@ import joblib import xarray +import io + @contextlib.contextmanager def no_warning(*args): @@ -50,3 +52,20 @@ def checksum_dataarray_mapping( """ sorted_keys = sorted(d.keys()) return [(key, checksum_dataarray(d[key])) for key in sorted_keys] + + +def regression_data( + array: xarray.DataArray, attrs: bool = True, coords: bool = True +) -> str: + f = io.StringIO() + print("Array hash:", file=f) + print(checksum_dataarray(array), file=f) + if coords: + print("Coordinate info:", file=f) + for coord in array.coords: + print("Coordinate ", coord, ":", np.asarray(array[coord]), file=f) + if attrs: + print("CDL Description of Data:") + # This ensures the metadata is correct + array.to_dataset(name="a").info(f) + return f.getvalue()