From e4aff7c69e0203463b60a762f671b1b4a4203787 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 31 Aug 2023 15:34:02 -0700 Subject: [PATCH 1/7] Add warning message if version differ. Add unittest --- geoapps/driver_base/driver.py | 10 ++++++++++ tests/version_test.py | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/geoapps/driver_base/driver.py b/geoapps/driver_base/driver.py index f69759424..3d34f9374 100644 --- a/geoapps/driver_base/driver.py +++ b/geoapps/driver_base/driver.py @@ -9,6 +9,7 @@ from abc import ABC, abstractmethod from pathlib import Path +from warnings import warn from geoh5py import Workspace from geoh5py.objects import ObjectBase @@ -16,6 +17,7 @@ from param_sweeps.driver import SweepParams from param_sweeps.generate import generate +from geoapps import __version__ from geoapps.driver_base.params import BaseParams @@ -97,6 +99,14 @@ def start(cls, filepath: str | Path, driver_class=None): filepath, validations=driver_class._validations # pylint: disable=W0212 ) + version = ifile.data.get("version", None) + if version is not None and version != __version__: + warn( + f"Input file version '{version}' does not match the " + f"installed 'geoapps v{__version__}'. " + "Proceed with caution." + ) + generate_sweep = ifile.data.get("generate_sweep", None) if generate_sweep: ifile.data["generate_sweep"] = False diff --git a/tests/version_test.py b/tests/version_test.py index 6a95a391f..364804867 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -8,7 +8,13 @@ import re +import pytest + import geoapps +from geoapps import assets_path +from geoapps.octree_creation.constants import app_initializer as oct_init +from geoapps.octree_creation.driver import OctreeDriver +from geoapps.octree_creation.params import OctreeParams def test_version_is_consistent(pyproject: dict[str]): @@ -23,3 +29,15 @@ def test_version_is_semver(): r"(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$" ) assert re.search(semver_re, geoapps.__version__) is not None + + +def test_input_file_version(tmp_path): + oct_init["geoh5"] = str(assets_path() / "FlinFlon.geoh5") + params = OctreeParams(**oct_init) + params.version = "0.0.0" + params.write_input_file("test.ui.json", tmp_path) + + with pytest.warns( + UserWarning, match="Input file version '0.0.0' does not match the." + ): + OctreeDriver.start(tmp_path / "test.ui.json") From d030e4270ab84b299b25d3aad11a044cab3a8c22 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Fri, 1 Sep 2023 08:11:54 -0700 Subject: [PATCH 2/7] Use getattr instead of private attribute --- geoapps/driver_base/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geoapps/driver_base/driver.py b/geoapps/driver_base/driver.py index 3d34f9374..d17ae1a99 100644 --- a/geoapps/driver_base/driver.py +++ b/geoapps/driver_base/driver.py @@ -96,7 +96,7 @@ def start(cls, filepath: str | Path, driver_class=None): print("Loading input file . . .") filepath = Path(filepath).resolve() ifile = InputFile.read_ui_json( - filepath, validations=driver_class._validations # pylint: disable=W0212 + filepath, validations=getattr(driver_class, "_validations", None) ) version = ifile.data.get("version", None) From df2bdb98389efeab852f42044d47cd33ff0bd898 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Fri, 1 Sep 2023 09:11:04 -0700 Subject: [PATCH 3/7] Revert to pylint disable --- geoapps/driver_base/driver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/geoapps/driver_base/driver.py b/geoapps/driver_base/driver.py index d17ae1a99..015a77e13 100644 --- a/geoapps/driver_base/driver.py +++ b/geoapps/driver_base/driver.py @@ -96,7 +96,8 @@ def start(cls, filepath: str | Path, driver_class=None): print("Loading input file . . .") filepath = Path(filepath).resolve() ifile = InputFile.read_ui_json( - filepath, validations=getattr(driver_class, "_validations", None) + filepath, + validations=driver_class._validations, # pylint: disable=protected-access ) version = ifile.data.get("version", None) From b1ee54d11326cc2253096f82f8f97d253eb2226a Mon Sep 17 00:00:00 2001 From: dominiquef Date: Fri, 1 Sep 2023 10:01:31 -0700 Subject: [PATCH 4/7] Maker use of semver to check for version ahead --- conda-py-3.10-lock.yml | 462 +++++++++-------- conda-py-3.9-lock.yml | 474 ++++++++++-------- .../conda-py-3.10-linux-64-dev.lock.yml | 31 +- environments/conda-py-3.10-linux-64.lock.yml | 29 +- .../conda-py-3.10-osx-64-dev.lock.yml | 31 +- environments/conda-py-3.10-osx-64.lock.yml | 29 +- .../conda-py-3.10-win-64-dev.lock.yml | 35 +- environments/conda-py-3.10-win-64.lock.yml | 33 +- .../conda-py-3.9-linux-64-dev.lock.yml | 33 +- environments/conda-py-3.9-linux-64.lock.yml | 31 +- environments/conda-py-3.9-osx-64-dev.lock.yml | 33 +- environments/conda-py-3.9-osx-64.lock.yml | 31 +- environments/conda-py-3.9-win-64-dev.lock.yml | 37 +- environments/conda-py-3.9-win-64.lock.yml | 35 +- geoapps/driver_base/driver.py | 5 +- pyproject.toml | 3 +- tests/version_test.py | 6 +- 17 files changed, 704 insertions(+), 634 deletions(-) diff --git a/conda-py-3.10-lock.yml b/conda-py-3.10-lock.yml index ceb8bf9c0..dd832c9cb 100644 --- a/conda-py-3.10-lock.yml +++ b/conda-py-3.10-lock.yml @@ -17,9 +17,9 @@ version: 1 metadata: content_hash: - win-64: 2466afc89705a459689ce0504fefcc99bec3f7fff7ec8d12b5b6ca2baa04d5f1 - osx-64: ba6af01ffd978722c8c3135be44cbba906cf46f111705b10c2a9bc7b8c635cd6 - linux-64: e6841dd09f1da8810c1e8db48b551f5c7d9a5d05e43a85d9815d78d28e8f9fe6 + win-64: 7a1fea23d6e69a46582555e2cee10f6adbada733e9587fc588f881fd888ceac7 + osx-64: 74168cc4265e4391d45adf0f25bcb849299d8aeb16f05e9b2a47426538e29ae8 + linux-64: 24bd176cc1ff0d530d5b17b5cbeb0e069e500ebcfb8406d21a1c51cf10cb3ad2 channels: - url: conda-forge used_env_vars: [] @@ -1196,16 +1196,16 @@ package: category: apps optional: true - name: libsqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: linux-64 dependencies: libgcc-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.42.0-h2797004_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.43.0-h2797004_0.conda hash: - md5: fdaae20a1cf7cd62130a0973190a31b7 - sha256: 72e958870f49174ebc0ddcd4129e9a9f48de815f20aa3b553f136b514f29bb3a + md5: 903fa782a9067d5934210df6d79220f6 + sha256: e715fab7ec6b3f3df2a5962ef372ff0f871d215fe819482dcd80357999513652 category: main optional: false - name: libssh2 @@ -1391,17 +1391,17 @@ package: category: main optional: false - name: zstd - version: 1.5.2 + version: 1.5.5 manager: conda platform: linux-64 dependencies: libgcc-ng: '>=12' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-hfc55251_7.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.5-hfc55251_0.conda hash: - md5: 32ae18eb2a687912fc9e92a501c0a11b - sha256: a7f7e765dfb7af5265a38080e46f18cb07cfeecf81fe28fad23c4538e7d521c3 + md5: 04b88013080254850d6c01ed54810589 + sha256: 607cbeb1a533be98ba96cf5cdf0ddbb101c78019f1fda063261871dad6248609 category: main optional: false - name: blosc @@ -1589,14 +1589,14 @@ package: libgcc-ng: '>=12' libjpeg-turbo: '>=2.1.5.1,<3.0a0' libstdcxx-ng: '>=12' - libwebp-base: '>=1.3.0,<2.0a0' + libwebp-base: '>=1.3.1,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' xz: '>=5.2.6,<6.0a0' zstd: '>=1.5.2,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.1-h8b53f26_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.1-h8b53f26_1.conda hash: - md5: 8ad377fb60abab446a9f02c62b3c2190 - sha256: 920943ad46869938bd070ccd4c0117594e07538bc6b27b75462594c67b6f215d + md5: 5b09e13d732dda1a2bc9adc711164f4d + sha256: 631ccfdd460eda9661b6371aa459fe5ce174816365873deb5af955c9e10bf8c2 category: main optional: false - name: libxkbcommon @@ -1716,19 +1716,19 @@ package: category: main optional: false - name: sqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: linux-64 dependencies: libgcc-ng: '>=12' - libsqlite: 3.42.0 + libsqlite: 3.43.0 libzlib: '>=1.2.13,<1.3.0a0' - ncurses: '>=6.3,<7.0a0' + ncurses: '>=6.4,<7.0a0' readline: '>=8.2,<9.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.42.0-h2c6b66d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.43.0-h2c6b66d_0.conda hash: - md5: 1192f6ec654a5bc4ee1d64bdc4a3e5cc - sha256: 9cf59fa9891248e0e3a86a41041156cec367653d423e5d8a09b4c8ab98441a27 + md5: 713f9eac95d051abe14c3774376854fe + sha256: b3db86c1ae67bca79328a5d517330e1c95cf4e1f666e46ac9a90e64caf86449d category: apps optional: true - name: xcb-util @@ -2554,15 +2554,15 @@ package: category: apps optional: true - name: pluggy - version: 1.2.0 + version: 1.3.0 manager: conda platform: linux-64 dependencies: python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.2.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 7263924c642d22e311d9e59b839f1b33 - sha256: ff1f70e0bd50693be7e2bad0efb2539f5dcc5ec4d638e787e703f28098e72de4 + md5: 2390bd10bed1f3fdc7a537fb5a447d8d + sha256: 7bf2ad9d747e71f1e93d0863c2c8061dd0f2fe1e582f28d292abfb40264a2eb5 category: dev optional: true - name: ply @@ -2745,17 +2745,17 @@ package: category: apps optional: true - name: rpds-py - version: 0.9.2 + version: 0.10.0 manager: conda platform: linux-64 dependencies: libgcc-ng: '>=12' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.9.2-py310hcb5633a_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.10.0-py310hcb5633a_0.conda hash: - md5: 1b50882b249a6ae5db7131fb627a0213 - sha256: 18e60ef16d019eae8ef98f4ac1adf7dd457e59b7827ba9581dfcba88e331acf6 + md5: ed41ae00ddccd3c18d8776a75898c705 + sha256: 321490b8028740fd2d7fabd40db805d9ad6e95355181572b2f48ec8c85bca783 category: apps optional: true - name: send2trash @@ -3139,19 +3139,18 @@ package: category: apps optional: true - name: anyio - version: 3.7.1 + version: 4.0.0 manager: conda platform: linux-64 dependencies: exceptiongroup: '' idna: '>=2.8' - python: '>=3.7' + python: '>=3.8' sniffio: '>=1.1' - typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-3.7.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.0.0-pyhd8ed1ab_0.conda hash: - md5: 7b517e7a6f0790337906c055aa97ca49 - sha256: 62637ac498bcf47783cbf4f48e9b09e4e2f5a6ad42f43ca8f632c353827b94f4 + md5: 3c4e99d3ae4ec033d4dd99fb5220e540 + sha256: 64125775b2e724db5c72e431dd180495d5d509d0a2d1228a122e6af9f1b60e33 category: apps optional: true - name: asttokens @@ -4318,7 +4317,7 @@ package: category: apps optional: true - name: dash - version: 2.12.1 + version: 2.13.0 manager: conda platform: linux-64 dependencies: @@ -4332,10 +4331,10 @@ package: setuptools: '' typing-extensions: '>=4.1.1' werkzeug: '' - url: https://conda.anaconda.org/conda-forge/noarch/dash-2.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dash-2.13.0-pyhd8ed1ab_0.conda hash: - md5: ef8cbf64af2a8f94ab967b6f16fa7f82 - sha256: c4be071de643d7ae26a0c129570d4a0521aa8278a04a4b9f58cc9cd75019b743 + md5: 00a1a6a5100a22750e65ef25bb965c19 + sha256: c04d35702ad2842c433076bf1d34b9a70051a474854792a542ef7fedf3ee71ea category: apps optional: true - name: distributed @@ -4790,13 +4789,14 @@ package: category: apps optional: true - name: ipython - version: 8.14.0 + version: 8.15.0 manager: conda platform: linux-64 dependencies: __linux: '' backcall: '' decorator: '' + exceptiongroup: '' jedi: '>=0.16' matplotlib-inline: '' pexpect: '>4.3' @@ -4807,10 +4807,10 @@ package: stack_data: '' traitlets: '>=5' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.14.0-pyh41d4057_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.15.0-pyh0d859eb_0.conda hash: - md5: 0a0b0d8177c4a209017b356439292db8 - sha256: 25f1e5d78f7f063b3e32b939fed1e4d797df12f384c949902a325e6539315f96 + md5: 6392e665cbdaa780ca2b7a01ac34bb4b + sha256: dcfe245edbd23cebea71adf328a05d1bad9828d7c2ed3835696fad25bcf369c8 category: apps optional: true - name: nbclient @@ -5146,7 +5146,7 @@ package: category: core optional: true - name: nbconvert-core - version: 7.7.4 + version: 7.8.0 manager: conda platform: linux-64 dependencies: @@ -5167,10 +5167,10 @@ package: python: '>=3.8' tinycss2: '' traitlets: '>=5.0' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 44890ae4b0c7ca721b701febb0081401 - sha256: c869001896bdf57fc32ae67954e0694ae61133ffaf63d0991432f5b9d3262bf4 + md5: 62345c9e24f898bf492979be84a6eb0a + sha256: 7ecab4832e9d5ef2afdddba965dc32b2016fc9850c4deb6b7f8d6dce1526468a category: apps optional: true - name: pydiso @@ -5230,17 +5230,17 @@ package: category: core optional: true - name: tifffile - version: 2023.8.12 + version: 2023.8.30 manager: conda platform: linux-64 dependencies: imagecodecs: '>=2023.8.12' numpy: '>=1.19.2' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.12-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.30-pyhd8ed1ab_0.conda hash: - md5: ef24b983632e6acdaf424dec8e16bb55 - sha256: 1b6bfc407d464ce0f83d2d1728abd62baad4a9709914307c33af4d335eea18e6 + md5: 529b803c040449392bc480614f41d522 + sha256: 951627154c02364bcdcd012d877074a188947d85b1e09ea6ae2f6e18c1a37619 category: apps optional: true - name: zarr @@ -5307,17 +5307,17 @@ package: category: apps optional: true - name: nbconvert-pandoc - version: 7.7.4 + version: 7.8.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.7.4 + nbconvert-core: 7.8.0 pandoc: '' python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.8.0-pyhd8ed1ab_0.conda hash: - md5: d1ac60298f75db83b5a7016c775e77db - sha256: d0fac92681e5c00691e606327bf6f490798216f1e4e450b635991444f57f243c + md5: 1dba1a577df2625a24667612a069e91c + sha256: 76b8bd6c8cae56dd3495fe6083a2b6317f6f8c42f61ea36d18b75add31c87173 category: apps optional: true - name: pymatsolver @@ -5363,17 +5363,17 @@ package: category: apps optional: true - name: nbconvert - version: 7.7.4 + version: 7.8.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.7.4 - nbconvert-pandoc: 7.7.4 + nbconvert-core: 7.8.0 + nbconvert-pandoc: 7.8.0 python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 2c341d4a10927be7a9a0b9f264039782 - sha256: 27eaa8e12d68deec5b04786841d6a1aa4134cb71a82d5a7a4aee5ab51b4fab8e + md5: 43bce95e8c474dd21d7ed5de8b4806f7 + sha256: 544405bbc5cd8e2a03bfddd0f1dca4a41da106d89706fe9ae2680ad077c49b04 category: apps optional: true - name: notebook-shim @@ -5490,6 +5490,16 @@ package: sha256: eab4aba337b8f41a98bbe123ffa9c6f6408c0a8928c29fdc778c6e293d8d2e94 category: apps optional: true +- name: semver + version: 3.0.1 + manager: pip + platform: linux-64 + dependencies: {} + url: https://files.pythonhosted.org/packages/d4/5d/f2b4fe45886238c405ad177ca43911cb1459d08003004da5c27495eb4216/semver-3.0.1-py3-none-any.whl + hash: + sha256: 2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf + category: main + optional: false - name: geoh5py version: 0.8.0a3 manager: pip @@ -5520,7 +5530,7 @@ package: category: main optional: false - name: mira-omf - version: 3.0.0 + version: 3.0.1 manager: pip platform: linux-64 dependencies: @@ -5530,9 +5540,9 @@ package: pypng: '>=0.20220715,<0.20220716' six: '>=1.16,<2.0' vectormath: '>=0.2.0,<0.3.0' - url: https://files.pythonhosted.org/packages/03/23/166c149187e3192218c47d1c5618e4e880a0ccdf635eac2aaa58ed52e986/mira_omf-3.0.0-py3-none-any.whl + url: https://files.pythonhosted.org/packages/e2/ba/da67766f51565f73bdf7599a29b44fd99878a36d6a411a57382a4abc25a9/mira_omf-3.0.1-py3-none-any.whl hash: - sha256: c0bf6ba425aeb3e05bc954cd7bbb6d73fc0234f5cead276aa1d18d0fa3dbab3d + sha256: 7e1b003bbfae4d3eedb6b41f242d3dc9e9e1d86050cacb0ddbf460aedab048d6 category: main optional: false - name: mira-simpeg @@ -5540,14 +5550,14 @@ package: manager: pip platform: linux-64 dependencies: - empymod: '>=2.0.0' - numpy: '>=1.20' + pandas: '*' pymatsolver: '>=0.2' - discretize: '>=0.8.0' scikit-learn: '>=1.2' - scipy: '>=1.8.0' geoh5py: '*' - pandas: '*' + discretize: '>=0.8.0' + empymod: '>=2.0.0' + numpy: '>=1.20' + scipy: '>=1.8.0' url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip hash: sha256: '' @@ -6202,15 +6212,15 @@ package: category: main optional: false - name: libsqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: osx-64 dependencies: libzlib: '>=1.2.13,<1.3.0a0' - url: https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.42.0-h58db7d2_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.43.0-h58db7d2_0.conda hash: - md5: a7d3b44b7b0c9901ac7813b7a0462893 - sha256: 182689f4b1a5ed638cd615c7774e1a9974842bc127c59173f1d25e31a8795eef + md5: e2195038e85e49e26fbeb7efc0ad38c4 + sha256: 3c3e06284c3426126901891675d09e181c651b2db01df9884da2613015e3fbac category: main optional: false - name: libvorbis @@ -6415,15 +6425,15 @@ package: category: apps optional: true - name: zstd - version: 1.5.2 + version: 1.5.5 manager: conda platform: osx-64 dependencies: libzlib: '>=1.2.13,<1.3.0a0' - url: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.2-h829000d_7.conda + url: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.5-h829000d_0.conda hash: - md5: b274ec4dbf15a6e20900e397610567a0 - sha256: 8d6768da7c3170693c0649188e7575474046f8610d8074903cf84e403e3411e8 + md5: 80abc41d0c48b82fe0f04e7f42f5cb7e + sha256: d54e31d3d8de5e254c0804abd984807b8ae5cd3708d758a8bf1adff1f5df166c category: main optional: false - name: blosc @@ -6647,14 +6657,14 @@ package: libcxx: '>=15.0.7' libdeflate: '>=1.18,<1.19.0a0' libjpeg-turbo: '>=2.1.5.1,<3.0a0' - libwebp-base: '>=1.3.0,<2.0a0' + libwebp-base: '>=1.3.1,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' xz: '>=5.2.6,<6.0a0' zstd: '>=1.5.2,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.5.1-hf955e92_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.5.1-hf955e92_1.conda hash: - md5: 56523ed556e3a44c0fd55bcf17045892 - sha256: 0526690c890b53419e6bbbe17dfc456789897ce9d7d79db3c4ea6568848bf6d0 + md5: 3436c5763732687918ce258b0184c7c9 + sha256: 1302146bcfa3905b106543e9c7e7419a3b386767a2dd0b42dbdc36f267a6a0e7 category: main optional: false - name: libxslt @@ -6747,18 +6757,18 @@ package: category: main optional: false - name: sqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: osx-64 dependencies: - libsqlite: 3.42.0 + libsqlite: 3.43.0 libzlib: '>=1.2.13,<1.3.0a0' - ncurses: '>=6.3,<7.0a0' + ncurses: '>=6.4,<7.0a0' readline: '>=8.2,<9.0a0' - url: https://conda.anaconda.org/conda-forge/osx-64/sqlite-3.42.0-h2b0dec6_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/sqlite-3.43.0-h2b0dec6_0.conda hash: - md5: 6c22b83608a6e3bd324ab29d3092592f - sha256: ff811793c293cf861746c95fe97ad5384e917bf473337d05283afdadb3b50bc9 + md5: 6cbfc91cd87a1008771962b5e794e54e + sha256: 9850332ff4f14ce99be612217a6f6ed378f9989aebdb30d47d3a48955bd98d99 category: apps optional: true - name: appnope @@ -7491,15 +7501,15 @@ package: category: apps optional: true - name: pluggy - version: 1.2.0 + version: 1.3.0 manager: conda platform: osx-64 dependencies: python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.2.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 7263924c642d22e311d9e59b839f1b33 - sha256: ff1f70e0bd50693be7e2bad0efb2539f5dcc5ec4d638e787e703f28098e72de4 + md5: 2390bd10bed1f3fdc7a537fb5a447d8d + sha256: 7bf2ad9d747e71f1e93d0863c2c8061dd0f2fe1e582f28d292abfb40264a2eb5 category: dev optional: true - name: ply @@ -7679,16 +7689,16 @@ package: category: apps optional: true - name: rpds-py - version: 0.9.2 + version: 0.10.0 manager: conda platform: osx-64 dependencies: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://conda.anaconda.org/conda-forge/osx-64/rpds-py-0.9.2-py310h3461e44_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/rpds-py-0.10.0-py310h3461e44_0.conda hash: - md5: cd0138dd694bc98a3e0ae5f5b0967025 - sha256: 2f72be60cb764d3f3d2435fe8c88a40c6bb73fe96c2f4aad658dd788b188e6f5 + md5: d0bf3a67c2a1bad53911f89a1a1f03c1 + sha256: d530a232f9ea7850dda912af384840eedb35c770439e5fc5cb747e04a1f7f7b4 category: apps optional: true - name: setuptools @@ -7986,19 +7996,18 @@ package: category: apps optional: true - name: anyio - version: 3.7.1 + version: 4.0.0 manager: conda platform: osx-64 dependencies: - typing_extensions: '' exceptiongroup: '' - python: '>=3.7' + python: '>=3.8' sniffio: '>=1.1' idna: '>=2.8' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-3.7.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.0.0-pyhd8ed1ab_0.conda hash: - md5: 7b517e7a6f0790337906c055aa97ca49 - sha256: 62637ac498bcf47783cbf4f48e9b09e4e2f5a6ad42f43ca8f632c353827b94f4 + md5: 3c4e99d3ae4ec033d4dd99fb5220e540 + sha256: 64125775b2e724db5c72e431dd180495d5d509d0a2d1228a122e6af9f1b60e33 category: apps optional: true - name: asttokens @@ -9075,7 +9084,7 @@ package: category: core optional: true - name: dash - version: 2.12.1 + version: 2.13.0 manager: conda platform: osx-64 dependencies: @@ -9089,10 +9098,10 @@ package: plotly: '>=5.0.0' typing-extensions: '>=4.1.1' flask: '>=1.0.4' - url: https://conda.anaconda.org/conda-forge/noarch/dash-2.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dash-2.13.0-pyhd8ed1ab_0.conda hash: - md5: ef8cbf64af2a8f94ab967b6f16fa7f82 - sha256: c4be071de643d7ae26a0c129570d4a0521aa8278a04a4b9f58cc9cd75019b743 + md5: 00a1a6a5100a22750e65ef25bb965c19 + sha256: c04d35702ad2842c433076bf1d34b9a70051a474854792a542ef7fedf3ee71ea category: apps optional: true - name: distributed @@ -9221,8 +9230,8 @@ package: platform: osx-64 dependencies: python: '>=3.8' - attrs: '>=22.2.0' importlib_resources: '>=1.4.0' + attrs: '>=22.2.0' pkgutil-resolve-name: '>=1.3.10' jsonschema-specifications: '>=2023.03.6' referencing: '>=0.28.4' @@ -9496,8 +9505,8 @@ package: python-dateutil: '>=2.8.2' tornado: '>=6.0' jupyter_core: '>=4.9.2' - nest-asyncio: '>=1.5.4' pyzmq: '>=23.0' + nest-asyncio: '>=1.5.4' url: https://conda.anaconda.org/conda-forge/noarch/jupyter_client-7.3.4-pyhd8ed1ab_0.tar.bz2 hash: md5: dad80938cdccc5c274e954dda56b6eb5 @@ -9608,17 +9617,17 @@ package: category: core optional: true - name: tifffile - version: 2023.8.12 + version: 2023.8.30 manager: conda platform: osx-64 dependencies: python: '>=3.9' numpy: '>=1.19.2' imagecodecs: '>=2023.8.12' - url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.12-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.30-pyhd8ed1ab_0.conda hash: - md5: ef24b983632e6acdaf424dec8e16bb55 - sha256: 1b6bfc407d464ce0f83d2d1728abd62baad4a9709914307c33af4d335eea18e6 + md5: 529b803c040449392bc480614f41d522 + sha256: 951627154c02364bcdcd012d877074a188947d85b1e09ea6ae2f6e18c1a37619 category: apps optional: true - name: zarr @@ -9694,13 +9703,14 @@ package: category: apps optional: true - name: ipython - version: 8.14.0 + version: 8.15.0 manager: conda platform: osx-64 dependencies: typing_extensions: '' decorator: '' __osx: '' + exceptiongroup: '' stack_data: '' matplotlib-inline: '' backcall: '' @@ -9712,10 +9722,10 @@ package: jedi: '>=0.16' pexpect: '>4.3' prompt_toolkit: '>=3.0.30,<3.1.0,!=3.0.37' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.14.0-pyhd1c38e8_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.15.0-pyh31c8845_0.conda hash: - md5: f56fab4cea853c2248105b6cd7d79bf0 - sha256: ea7524cd33c18c5c0d01e48e0089f339e7e8f1c3a6a8d2416c46b3d50d509894 + md5: 24e68bbee62de3c9c6d051d59e9ea87b + sha256: a8833f310e6f32bfc8612e9e9ded09b1c53c2d06b35ed5d704222de10a51d4d3 category: apps optional: true - name: nbclient @@ -9900,7 +9910,7 @@ package: category: apps optional: true - name: nbconvert-core - version: 7.7.4 + version: 7.8.0 manager: conda platform: osx-64 dependencies: @@ -9921,10 +9931,10 @@ package: pygments: '>=2.4.1' nbclient: '>=0.5.0' mistune: '>=2.0.3,<4' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 44890ae4b0c7ca721b701febb0081401 - sha256: c869001896bdf57fc32ae67954e0694ae61133ffaf63d0991432f5b9d3262bf4 + md5: 62345c9e24f898bf492979be84a6eb0a + sha256: 7ecab4832e9d5ef2afdddba965dc32b2016fc9850c4deb6b7f8d6dce1526468a category: apps optional: true - name: pymatsolver @@ -9979,8 +9989,8 @@ package: traitlets: '>=5.1.0' jupyter_core: '>=4.12,!=5.0.*' nbconvert-core: '>=6.4.4' - nbformat: '>=5.2.0' anyio: '>=3.1.0' + nbformat: '>=5.2.0' url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-1.23.6-pyhd8ed1ab_0.conda hash: md5: 5016f7c6845a6efd270fcee63af9a2a0 @@ -9988,31 +9998,31 @@ package: category: apps optional: true - name: nbconvert-pandoc - version: 7.7.4 + version: 7.8.0 manager: conda platform: osx-64 dependencies: pandoc: '' python: '>=3.8' - nbconvert-core: 7.7.4 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.7.4-pyhd8ed1ab_0.conda + nbconvert-core: 7.8.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.8.0-pyhd8ed1ab_0.conda hash: - md5: d1ac60298f75db83b5a7016c775e77db - sha256: d0fac92681e5c00691e606327bf6f490798216f1e4e450b635991444f57f243c + md5: 1dba1a577df2625a24667612a069e91c + sha256: 76b8bd6c8cae56dd3495fe6083a2b6317f6f8c42f61ea36d18b75add31c87173 category: apps optional: true - name: nbconvert - version: 7.7.4 + version: 7.8.0 manager: conda platform: osx-64 dependencies: python: '>=3.8' - nbconvert-core: 7.7.4 - nbconvert-pandoc: 7.7.4 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.7.4-pyhd8ed1ab_0.conda + nbconvert-core: 7.8.0 + nbconvert-pandoc: 7.8.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 2c341d4a10927be7a9a0b9f264039782 - sha256: 27eaa8e12d68deec5b04786841d6a1aa4134cb71a82d5a7a4aee5ab51b4fab8e + md5: 43bce95e8c474dd21d7ed5de8b4806f7 + sha256: 544405bbc5cd8e2a03bfddd0f1dca4a41da106d89706fe9ae2680ad077c49b04 category: apps optional: true - name: notebook-shim @@ -10129,6 +10139,16 @@ package: sha256: eab4aba337b8f41a98bbe123ffa9c6f6408c0a8928c29fdc778c6e293d8d2e94 category: apps optional: true +- name: semver + version: 3.0.1 + manager: pip + platform: osx-64 + dependencies: {} + url: https://files.pythonhosted.org/packages/d4/5d/f2b4fe45886238c405ad177ca43911cb1459d08003004da5c27495eb4216/semver-3.0.1-py3-none-any.whl + hash: + sha256: 2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf + category: main + optional: false - name: geoh5py version: 0.8.0a3 manager: pip @@ -10159,7 +10179,7 @@ package: category: main optional: false - name: mira-omf - version: 3.0.0 + version: 3.0.1 manager: pip platform: osx-64 dependencies: @@ -10169,9 +10189,9 @@ package: pypng: '>=0.20220715,<0.20220716' six: '>=1.16,<2.0' vectormath: '>=0.2.0,<0.3.0' - url: https://files.pythonhosted.org/packages/03/23/166c149187e3192218c47d1c5618e4e880a0ccdf635eac2aaa58ed52e986/mira_omf-3.0.0-py3-none-any.whl + url: https://files.pythonhosted.org/packages/e2/ba/da67766f51565f73bdf7599a29b44fd99878a36d6a411a57382a4abc25a9/mira_omf-3.0.1-py3-none-any.whl hash: - sha256: c0bf6ba425aeb3e05bc954cd7bbb6d73fc0234f5cead276aa1d18d0fa3dbab3d + sha256: 7e1b003bbfae4d3eedb6b41f242d3dc9e9e1d86050cacb0ddbf460aedab048d6 category: main optional: false - name: mira-simpeg @@ -10179,14 +10199,14 @@ package: manager: pip platform: osx-64 dependencies: - empymod: '>=2.0.0' - numpy: '>=1.20' + pandas: '*' pymatsolver: '>=0.2' - discretize: '>=0.8.0' scikit-learn: '>=1.2' - scipy: '>=1.8.0' geoh5py: '*' - pandas: '*' + discretize: '>=0.8.0' + empymod: '>=2.0.0' + numpy: '>=1.20' + scipy: '>=1.8.0' url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip hash: sha256: '' @@ -10723,17 +10743,17 @@ package: category: apps optional: true - name: libsqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.42.0-hcfcfb64_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.43.0-hcfcfb64_0.conda hash: - md5: 9a71d93deb99cc09d8939d5235b5909a - sha256: 70bc1fdb72de847807355c13144666d4f151894f9b141ee559f5d243bdf577e2 + md5: 16c6f482e70cb3da41d0bee5d49c6bf3 + sha256: d79128a279c8e8b4afeef5cfe9d4302a2fd65b1af3973732d92a7cc396d5332f category: main optional: false - name: libwebp-base @@ -10878,11 +10898,11 @@ package: dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' - vs2015_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_2.conda + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_3.conda hash: - md5: 8ba57760b15d0c2493192908317bdf5e - sha256: ac27817d829c1f0d2dcf4622c49807fc1c2974cde8a779b2adc7699bcdca68c1 + md5: 28c6b90f40c9c37d3334ba8225143690 + sha256: 76e5ba07c06947ff7dcee6e9fe47e436e7a5ec5d94ad23102186769459af1403 category: apps optional: true - name: xz @@ -11220,18 +11240,18 @@ package: category: main optional: false - name: sqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: win-64 dependencies: - libsqlite: 3.42.0 + libsqlite: 3.43.0 ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlite-3.42.0-hcfcfb64_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlite-3.43.0-hcfcfb64_0.conda hash: - md5: c505cc64dba674d4c419c0de772c8579 - sha256: 8f24c8c96716a57a570d9b31d69307223a3b8592ade0283e3e7a1b5c2f0fa513 + md5: 0203e216052a1feceefe7894a69b97cf + sha256: 36a5111ee044bfbaa16c7e9f25fc510dc4a5c5767e795a587b36109c08c8f048 category: apps optional: true - name: zeromq @@ -11264,7 +11284,7 @@ package: category: apps optional: true - name: zstd - version: 1.5.2 + version: 1.5.5 manager: conda platform: win-64 dependencies: @@ -11272,10 +11292,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.2-h12be248_7.conda + url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.5-h12be248_0.conda hash: - md5: f3c3879d8cda1c5a6885435dd48a470e - sha256: 33e8fb73dee10740f00d4a450ad2d7f6d90692ca781480fa18fa70fd417d53ad + md5: 792bb5da68bf0a6cac6a6072ecb8dbeb + sha256: d540dd56c5ec772b60e4ce7d45f67f01c6614942225885911964ea1e70bb99e3 category: main optional: false - name: asciitree @@ -11364,12 +11384,12 @@ package: bzip2: '>=1.0.8,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' vc: '>=14.1,<15' - vs2015_runtime: '>=14.16.27033' + vc14_runtime: '>=14.16.27033' zstd: '>=1.5.2,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/boost-cpp-1.78.0-h9f4b32c_3.conda + url: https://conda.anaconda.org/conda-forge/win-64/boost-cpp-1.78.0-h9f4b32c_4.conda hash: - md5: 09805934b78b0cd1a28d9e72a2a4778b - sha256: bf4d718e17cb115ea27d52bc84b3dff963b7ade2dda01ddb7088372833092517 + md5: 991b639e1178f29d8e7681dc75f36acb + sha256: 7e039bfa99e9aca12d1f98426c571850dae12b48e8cd0aa0ef449ea6d9604dac category: apps optional: true - name: brotli-bin @@ -11811,10 +11831,10 @@ package: vc14_runtime: '>=14.29.30139' xz: '>=5.2.6,<6.0a0' zstd: '>=1.5.2,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/libtiff-4.5.1-h6c8260b_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libtiff-4.5.1-h6c8260b_1.conda hash: - md5: cc46fe88f82f9c98bd6858b3f6efb4e0 - sha256: 688e813d61e0d5dff284ef95c53b5c0acf950bbc1df97def4a4a33bbf1bb2fab + md5: 5faa8734cee2590b6d3615e06bfce4f8 + sha256: 46cd425318c5318c9c78c985776fa64746d1812c19f14284876f1aad4f9ee044 category: main optional: false - name: libxslt @@ -12027,15 +12047,15 @@ package: category: apps optional: true - name: pluggy - version: 1.2.0 + version: 1.3.0 manager: conda platform: win-64 dependencies: python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.2.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 7263924c642d22e311d9e59b839f1b33 - sha256: ff1f70e0bd50693be7e2bad0efb2539f5dcc5ec4d638e787e703f28098e72de4 + md5: 2390bd10bed1f3fdc7a537fb5a447d8d + sha256: 7bf2ad9d747e71f1e93d0863c2c8061dd0f2fe1e582f28d292abfb40264a2eb5 category: dev optional: true - name: ply @@ -12243,7 +12263,7 @@ package: category: apps optional: true - name: rpds-py - version: 0.9.2 + version: 0.10.0 manager: conda platform: win-64 dependencies: @@ -12252,10 +12272,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/rpds-py-0.9.2-py310h87d50f1_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/rpds-py-0.10.0-py310h87d50f1_0.conda hash: - md5: 56b7012b763fb86e63ed41718a5b9bf2 - sha256: c94bc4123ff81e1594968dee1b49666de33c9c0abf49ece21e0b2ccc11786914 + md5: e713f5544d7f61e0a1a0ecdb4153bb84 + sha256: 4eec074f075e85a27b3e28fdf9c0658bec55da41979ff495c2772e6758929814 category: apps optional: true - name: setuptools @@ -12599,19 +12619,18 @@ package: category: apps optional: true - name: anyio - version: 3.7.1 + version: 4.0.0 manager: conda platform: win-64 dependencies: - typing_extensions: '' exceptiongroup: '' - python: '>=3.7' + python: '>=3.8' sniffio: '>=1.1' idna: '>=2.8' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-3.7.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.0.0-pyhd8ed1ab_0.conda hash: - md5: 7b517e7a6f0790337906c055aa97ca49 - sha256: 62637ac498bcf47783cbf4f48e9b09e4e2f5a6ad42f43ca8f632c353827b94f4 + md5: 3c4e99d3ae4ec033d4dd99fb5220e540 + sha256: 64125775b2e724db5c72e431dd180495d5d509d0a2d1228a122e6af9f1b60e33 category: apps optional: true - name: asttokens @@ -13762,8 +13781,8 @@ package: platform: win-64 dependencies: python: '>=3.8' - attrs: '>=22.2.0' importlib_resources: '>=1.4.0' + attrs: '>=22.2.0' pkgutil-resolve-name: '>=1.3.10' jsonschema-specifications: '>=2023.03.6' referencing: '>=0.28.4' @@ -13883,7 +13902,7 @@ package: category: core optional: true - name: dash - version: 2.12.1 + version: 2.13.0 manager: conda platform: win-64 dependencies: @@ -13897,10 +13916,10 @@ package: plotly: '>=5.0.0' typing-extensions: '>=4.1.1' flask: '>=1.0.4' - url: https://conda.anaconda.org/conda-forge/noarch/dash-2.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dash-2.13.0-pyhd8ed1ab_0.conda hash: - md5: ef8cbf64af2a8f94ab967b6f16fa7f82 - sha256: c4be071de643d7ae26a0c129570d4a0521aa8278a04a4b9f58cc9cd75019b743 + md5: 00a1a6a5100a22750e65ef25bb965c19 + sha256: c04d35702ad2842c433076bf1d34b9a70051a474854792a542ef7fedf3ee71ea category: apps optional: true - name: gst-plugins-base @@ -13934,8 +13953,8 @@ package: python-dateutil: '>=2.8.2' tornado: '>=6.0' jupyter_core: '>=4.9.2' - nest-asyncio: '>=1.5.4' pyzmq: '>=23.0' + nest-asyncio: '>=1.5.4' url: https://conda.anaconda.org/conda-forge/noarch/jupyter_client-7.3.4-pyhd8ed1ab_0.tar.bz2 hash: md5: dad80938cdccc5c274e954dda56b6eb5 @@ -14073,7 +14092,7 @@ package: category: apps optional: true - name: ipython - version: 8.14.0 + version: 8.15.0 manager: conda platform: win-64 dependencies: @@ -14081,6 +14100,7 @@ package: colorama: '' decorator: '' __win: '' + exceptiongroup: '' stack_data: '' matplotlib-inline: '' backcall: '' @@ -14090,10 +14110,10 @@ package: pygments: '>=2.4.0' jedi: '>=0.16' prompt_toolkit: '>=3.0.30,<3.1.0,!=3.0.37' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.14.0-pyh08f2357_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.15.0-pyh5737063_0.conda hash: - md5: 1fc684c1de5475383790ada5627c5430 - sha256: 16a409828a1efc95b2d74f6080782ab8f7fdae2c33dde8d2f795e172d9c379a3 + md5: 1def12bdc65c8f7e27db22a8cc586adc + sha256: 594387bed59feb970084e21c26be1c5ad26adda144c6ffc893011384d1725d34 category: apps optional: true - name: nbclient @@ -14297,7 +14317,7 @@ package: category: apps optional: true - name: nbconvert-core - version: 7.7.4 + version: 7.8.0 manager: conda platform: win-64 dependencies: @@ -14318,10 +14338,10 @@ package: pygments: '>=2.4.1' nbclient: '>=0.5.0' mistune: '>=2.0.3,<4' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 44890ae4b0c7ca721b701febb0081401 - sha256: c869001896bdf57fc32ae67954e0694ae61133ffaf63d0991432f5b9d3262bf4 + md5: 62345c9e24f898bf492979be84a6eb0a + sha256: 7ecab4832e9d5ef2afdddba965dc32b2016fc9850c4deb6b7f8d6dce1526468a category: apps optional: true - name: numba @@ -14592,8 +14612,8 @@ package: traitlets: '>=5.1.0' jupyter_core: '>=4.12,!=5.0.*' nbconvert-core: '>=6.4.4' - nbformat: '>=5.2.0' anyio: '>=3.1.0' + nbformat: '>=5.2.0' url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-1.23.6-pyhd8ed1ab_0.conda hash: md5: 5016f7c6845a6efd270fcee63af9a2a0 @@ -14628,17 +14648,17 @@ package: category: core optional: true - name: nbconvert-pandoc - version: 7.7.4 + version: 7.8.0 manager: conda platform: win-64 dependencies: pandoc: '' python: '>=3.8' - nbconvert-core: 7.7.4 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.7.4-pyhd8ed1ab_0.conda + nbconvert-core: 7.8.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.8.0-pyhd8ed1ab_0.conda hash: - md5: d1ac60298f75db83b5a7016c775e77db - sha256: d0fac92681e5c00691e606327bf6f490798216f1e4e450b635991444f57f243c + md5: 1dba1a577df2625a24667612a069e91c + sha256: 76b8bd6c8cae56dd3495fe6083a2b6317f6f8c42f61ea36d18b75add31c87173 category: apps optional: true - name: pydiso @@ -14701,17 +14721,17 @@ package: category: core optional: true - name: tifffile - version: 2023.8.12 + version: 2023.8.30 manager: conda platform: win-64 dependencies: python: '>=3.9' numpy: '>=1.19.2' imagecodecs: '>=2023.8.12' - url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.12-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.30-pyhd8ed1ab_0.conda hash: - md5: ef24b983632e6acdaf424dec8e16bb55 - sha256: 1b6bfc407d464ce0f83d2d1728abd62baad4a9709914307c33af4d335eea18e6 + md5: 529b803c040449392bc480614f41d522 + sha256: 951627154c02364bcdcd012d877074a188947d85b1e09ea6ae2f6e18c1a37619 category: apps optional: true - name: zarr @@ -14752,17 +14772,17 @@ package: category: core optional: true - name: nbconvert - version: 7.7.4 + version: 7.8.0 manager: conda platform: win-64 dependencies: python: '>=3.8' - nbconvert-core: 7.7.4 - nbconvert-pandoc: 7.7.4 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.7.4-pyhd8ed1ab_0.conda + nbconvert-core: 7.8.0 + nbconvert-pandoc: 7.8.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 2c341d4a10927be7a9a0b9f264039782 - sha256: 27eaa8e12d68deec5b04786841d6a1aa4134cb71a82d5a7a4aee5ab51b4fab8e + md5: 43bce95e8c474dd21d7ed5de8b4806f7 + sha256: 544405bbc5cd8e2a03bfddd0f1dca4a41da106d89706fe9ae2680ad077c49b04 category: apps optional: true - name: notebook-shim @@ -14922,6 +14942,16 @@ package: sha256: eab4aba337b8f41a98bbe123ffa9c6f6408c0a8928c29fdc778c6e293d8d2e94 category: apps optional: true +- name: semver + version: 3.0.1 + manager: pip + platform: win-64 + dependencies: {} + url: https://files.pythonhosted.org/packages/d4/5d/f2b4fe45886238c405ad177ca43911cb1459d08003004da5c27495eb4216/semver-3.0.1-py3-none-any.whl + hash: + sha256: 2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf + category: main + optional: false - name: geoh5py version: 0.8.0a3 manager: pip @@ -14952,7 +14982,7 @@ package: category: main optional: false - name: mira-omf - version: 3.0.0 + version: 3.0.1 manager: pip platform: win-64 dependencies: @@ -14962,9 +14992,9 @@ package: pypng: '>=0.20220715,<0.20220716' six: '>=1.16,<2.0' vectormath: '>=0.2.0,<0.3.0' - url: https://files.pythonhosted.org/packages/03/23/166c149187e3192218c47d1c5618e4e880a0ccdf635eac2aaa58ed52e986/mira_omf-3.0.0-py3-none-any.whl + url: https://files.pythonhosted.org/packages/e2/ba/da67766f51565f73bdf7599a29b44fd99878a36d6a411a57382a4abc25a9/mira_omf-3.0.1-py3-none-any.whl hash: - sha256: c0bf6ba425aeb3e05bc954cd7bbb6d73fc0234f5cead276aa1d18d0fa3dbab3d + sha256: 7e1b003bbfae4d3eedb6b41f242d3dc9e9e1d86050cacb0ddbf460aedab048d6 category: main optional: false - name: mira-simpeg @@ -14972,14 +15002,14 @@ package: manager: pip platform: win-64 dependencies: - empymod: '>=2.0.0' - numpy: '>=1.20' + pandas: '*' pymatsolver: '>=0.2' - discretize: '>=0.8.0' scikit-learn: '>=1.2' - scipy: '>=1.8.0' geoh5py: '*' - pandas: '*' + discretize: '>=0.8.0' + empymod: '>=2.0.0' + numpy: '>=1.20' + scipy: '>=1.8.0' url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip hash: sha256: '' diff --git a/conda-py-3.9-lock.yml b/conda-py-3.9-lock.yml index 5864f5116..2501aabb5 100644 --- a/conda-py-3.9-lock.yml +++ b/conda-py-3.9-lock.yml @@ -17,9 +17,9 @@ version: 1 metadata: content_hash: - win-64: 99f7f98ebc3dded107c42ab5dd22fb313b8992c54e685cd31ed827bc2832a9fb - osx-64: 8f3e57e6845fd412e7e900329f1e580a3d8f744075e44816ce76644bf8677ba6 - linux-64: b5c1863f3c85ba4405d588e4f58b557ab8aa83d83bff55d899b02d07dc2bc2f6 + win-64: 610077cd4be3642daa5616a9f6df3bd7b48db66463496e36877a27e4303793c3 + osx-64: 86a498f1203213af78b4e702353fa73d38a26bc5eb5e43c96944a6cf6e5e641b + linux-64: b55e8a7bc8f8f23be1cce7b96faf349eb3f407e27d9e2cb9be03bcf468265511 channels: - url: conda-forge used_env_vars: [] @@ -1196,16 +1196,16 @@ package: category: apps optional: true - name: libsqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: linux-64 dependencies: libgcc-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.42.0-h2797004_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.43.0-h2797004_0.conda hash: - md5: fdaae20a1cf7cd62130a0973190a31b7 - sha256: 72e958870f49174ebc0ddcd4129e9a9f48de815f20aa3b553f136b514f29bb3a + md5: 903fa782a9067d5934210df6d79220f6 + sha256: e715fab7ec6b3f3df2a5962ef372ff0f871d215fe819482dcd80357999513652 category: main optional: false - name: libssh2 @@ -1391,17 +1391,17 @@ package: category: main optional: false - name: zstd - version: 1.5.2 + version: 1.5.5 manager: conda platform: linux-64 dependencies: libgcc-ng: '>=12' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-hfc55251_7.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.5-hfc55251_0.conda hash: - md5: 32ae18eb2a687912fc9e92a501c0a11b - sha256: a7f7e765dfb7af5265a38080e46f18cb07cfeecf81fe28fad23c4538e7d521c3 + md5: 04b88013080254850d6c01ed54810589 + sha256: 607cbeb1a533be98ba96cf5cdf0ddbb101c78019f1fda063261871dad6248609 category: main optional: false - name: blosc @@ -1589,14 +1589,14 @@ package: libgcc-ng: '>=12' libjpeg-turbo: '>=2.1.5.1,<3.0a0' libstdcxx-ng: '>=12' - libwebp-base: '>=1.3.0,<2.0a0' + libwebp-base: '>=1.3.1,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' xz: '>=5.2.6,<6.0a0' zstd: '>=1.5.2,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.1-h8b53f26_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.1-h8b53f26_1.conda hash: - md5: 8ad377fb60abab446a9f02c62b3c2190 - sha256: 920943ad46869938bd070ccd4c0117594e07538bc6b27b75462594c67b6f215d + md5: 5b09e13d732dda1a2bc9adc711164f4d + sha256: 631ccfdd460eda9661b6371aa459fe5ce174816365873deb5af955c9e10bf8c2 category: main optional: false - name: libxkbcommon @@ -1690,7 +1690,7 @@ package: category: apps optional: true - name: python - version: 3.9.17 + version: 3.9.18 manager: conda platform: linux-64 dependencies: @@ -1699,7 +1699,7 @@ package: libffi: '>=3.4,<4.0a0' libgcc-ng: '>=12' libnsl: '>=2.0.0,<2.1.0a0' - libsqlite: '>=3.42.0,<4.0a0' + libsqlite: '>=3.43.0,<4.0a0' libuuid: '>=2.38.1,<3.0a0' libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.4,<7.0a0' @@ -1709,26 +1709,26 @@ package: tzdata: '' xz: '>=5.2.6,<6.0a0' pip: '' - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.9.17-h0755675_0_cpython.conda + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.9.18-h0755675_0_cpython.conda hash: - md5: 384886ac3580bba3541ce65c992eb192 - sha256: 8bfdf391effd32714f160382507c9209f13ea4f7b404a8dea8cfd44a4d478170 + md5: 3ede353bc605068d9677e700b1847382 + sha256: 18db2220328abee8eb19f51c8df88bcfdf3a557b8181e7f5bda291deb067e40f category: main optional: false - name: sqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: linux-64 dependencies: libgcc-ng: '>=12' - libsqlite: 3.42.0 + libsqlite: 3.43.0 libzlib: '>=1.2.13,<1.3.0a0' - ncurses: '>=6.3,<7.0a0' + ncurses: '>=6.4,<7.0a0' readline: '>=8.2,<9.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.42.0-h2c6b66d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.43.0-h2c6b66d_0.conda hash: - md5: 1192f6ec654a5bc4ee1d64bdc4a3e5cc - sha256: 9cf59fa9891248e0e3a86a41041156cec367653d423e5d8a09b4c8ab98441a27 + md5: 713f9eac95d051abe14c3774376854fe + sha256: b3db86c1ae67bca79328a5d517330e1c95cf4e1f666e46ac9a90e64caf86449d category: apps optional: true - name: xcb-util @@ -2554,15 +2554,15 @@ package: category: apps optional: true - name: pluggy - version: 1.2.0 + version: 1.3.0 manager: conda platform: linux-64 dependencies: python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.2.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 7263924c642d22e311d9e59b839f1b33 - sha256: ff1f70e0bd50693be7e2bad0efb2539f5dcc5ec4d638e787e703f28098e72de4 + md5: 2390bd10bed1f3fdc7a537fb5a447d8d + sha256: 7bf2ad9d747e71f1e93d0863c2c8061dd0f2fe1e582f28d292abfb40264a2eb5 category: dev optional: true - name: ply @@ -2745,17 +2745,17 @@ package: category: apps optional: true - name: rpds-py - version: 0.9.2 + version: 0.10.0 manager: conda platform: linux-64 dependencies: libgcc-ng: '>=12' python: '>=3.9,<3.10.0a0' python_abi: 3.9.* - url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.9.2-py39h9fdd4d6_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.10.0-py39h9fdd4d6_0.conda hash: - md5: ea0471ecfbc0aaba3c006608d38e2868 - sha256: 5c180eff50defbdbe34de8b3623db46fd153ad2ce859ad993a950602b6e7fcc0 + md5: 67f52fd34963c53cbd257df3d2e42523 + sha256: 1308b8f99464c00ae0ac891beea5ddf48c3b09041a71c575b172481ca33e4f3c category: apps optional: true - name: send2trash @@ -3139,19 +3139,18 @@ package: category: apps optional: true - name: anyio - version: 3.7.1 + version: 4.0.0 manager: conda platform: linux-64 dependencies: exceptiongroup: '' idna: '>=2.8' - python: '>=3.7' + python: '>=3.8' sniffio: '>=1.1' - typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-3.7.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.0.0-pyhd8ed1ab_0.conda hash: - md5: 7b517e7a6f0790337906c055aa97ca49 - sha256: 62637ac498bcf47783cbf4f48e9b09e4e2f5a6ad42f43ca8f632c353827b94f4 + md5: 3c4e99d3ae4ec033d4dd99fb5220e540 + sha256: 64125775b2e724db5c72e431dd180495d5d509d0a2d1228a122e6af9f1b60e33 category: apps optional: true - name: asttokens @@ -4331,7 +4330,7 @@ package: category: apps optional: true - name: dash - version: 2.12.1 + version: 2.13.0 manager: conda platform: linux-64 dependencies: @@ -4345,10 +4344,10 @@ package: setuptools: '' typing-extensions: '>=4.1.1' werkzeug: '' - url: https://conda.anaconda.org/conda-forge/noarch/dash-2.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dash-2.13.0-pyhd8ed1ab_0.conda hash: - md5: ef8cbf64af2a8f94ab967b6f16fa7f82 - sha256: c4be071de643d7ae26a0c129570d4a0521aa8278a04a4b9f58cc9cd75019b743 + md5: 00a1a6a5100a22750e65ef25bb965c19 + sha256: c04d35702ad2842c433076bf1d34b9a70051a474854792a542ef7fedf3ee71ea category: apps optional: true - name: distributed @@ -4803,13 +4802,14 @@ package: category: apps optional: true - name: ipython - version: 8.14.0 + version: 8.15.0 manager: conda platform: linux-64 dependencies: __linux: '' backcall: '' decorator: '' + exceptiongroup: '' jedi: '>=0.16' matplotlib-inline: '' pexpect: '>4.3' @@ -4820,10 +4820,10 @@ package: stack_data: '' traitlets: '>=5' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.14.0-pyh41d4057_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.15.0-pyh0d859eb_0.conda hash: - md5: 0a0b0d8177c4a209017b356439292db8 - sha256: 25f1e5d78f7f063b3e32b939fed1e4d797df12f384c949902a325e6539315f96 + md5: 6392e665cbdaa780ca2b7a01ac34bb4b + sha256: dcfe245edbd23cebea71adf328a05d1bad9828d7c2ed3835696fad25bcf369c8 category: apps optional: true - name: nbclient @@ -5160,7 +5160,7 @@ package: category: core optional: true - name: nbconvert-core - version: 7.7.4 + version: 7.8.0 manager: conda platform: linux-64 dependencies: @@ -5181,10 +5181,10 @@ package: python: '>=3.8' tinycss2: '' traitlets: '>=5.0' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 44890ae4b0c7ca721b701febb0081401 - sha256: c869001896bdf57fc32ae67954e0694ae61133ffaf63d0991432f5b9d3262bf4 + md5: 62345c9e24f898bf492979be84a6eb0a + sha256: 7ecab4832e9d5ef2afdddba965dc32b2016fc9850c4deb6b7f8d6dce1526468a category: apps optional: true - name: pydiso @@ -5244,17 +5244,17 @@ package: category: core optional: true - name: tifffile - version: 2023.8.12 + version: 2023.8.30 manager: conda platform: linux-64 dependencies: imagecodecs: '>=2023.8.12' numpy: '>=1.19.2' python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.12-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.30-pyhd8ed1ab_0.conda hash: - md5: ef24b983632e6acdaf424dec8e16bb55 - sha256: 1b6bfc407d464ce0f83d2d1728abd62baad4a9709914307c33af4d335eea18e6 + md5: 529b803c040449392bc480614f41d522 + sha256: 951627154c02364bcdcd012d877074a188947d85b1e09ea6ae2f6e18c1a37619 category: apps optional: true - name: zarr @@ -5321,17 +5321,17 @@ package: category: apps optional: true - name: nbconvert-pandoc - version: 7.7.4 + version: 7.8.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.7.4 + nbconvert-core: 7.8.0 pandoc: '' python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.8.0-pyhd8ed1ab_0.conda hash: - md5: d1ac60298f75db83b5a7016c775e77db - sha256: d0fac92681e5c00691e606327bf6f490798216f1e4e450b635991444f57f243c + md5: 1dba1a577df2625a24667612a069e91c + sha256: 76b8bd6c8cae56dd3495fe6083a2b6317f6f8c42f61ea36d18b75add31c87173 category: apps optional: true - name: pymatsolver @@ -5377,17 +5377,17 @@ package: category: apps optional: true - name: nbconvert - version: 7.7.4 + version: 7.8.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.7.4 - nbconvert-pandoc: 7.7.4 + nbconvert-core: 7.8.0 + nbconvert-pandoc: 7.8.0 python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 2c341d4a10927be7a9a0b9f264039782 - sha256: 27eaa8e12d68deec5b04786841d6a1aa4134cb71a82d5a7a4aee5ab51b4fab8e + md5: 43bce95e8c474dd21d7ed5de8b4806f7 + sha256: 544405bbc5cd8e2a03bfddd0f1dca4a41da106d89706fe9ae2680ad077c49b04 category: apps optional: true - name: notebook-shim @@ -5504,6 +5504,16 @@ package: sha256: eab4aba337b8f41a98bbe123ffa9c6f6408c0a8928c29fdc778c6e293d8d2e94 category: apps optional: true +- name: semver + version: 3.0.1 + manager: pip + platform: linux-64 + dependencies: {} + url: https://files.pythonhosted.org/packages/d4/5d/f2b4fe45886238c405ad177ca43911cb1459d08003004da5c27495eb4216/semver-3.0.1-py3-none-any.whl + hash: + sha256: 2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf + category: main + optional: false - name: geoh5py version: 0.8.0a3 manager: pip @@ -5534,7 +5544,7 @@ package: category: main optional: false - name: mira-omf - version: 3.0.0 + version: 3.0.1 manager: pip platform: linux-64 dependencies: @@ -5544,9 +5554,9 @@ package: pypng: '>=0.20220715,<0.20220716' six: '>=1.16,<2.0' vectormath: '>=0.2.0,<0.3.0' - url: https://files.pythonhosted.org/packages/03/23/166c149187e3192218c47d1c5618e4e880a0ccdf635eac2aaa58ed52e986/mira_omf-3.0.0-py3-none-any.whl + url: https://files.pythonhosted.org/packages/e2/ba/da67766f51565f73bdf7599a29b44fd99878a36d6a411a57382a4abc25a9/mira_omf-3.0.1-py3-none-any.whl hash: - sha256: c0bf6ba425aeb3e05bc954cd7bbb6d73fc0234f5cead276aa1d18d0fa3dbab3d + sha256: 7e1b003bbfae4d3eedb6b41f242d3dc9e9e1d86050cacb0ddbf460aedab048d6 category: main optional: false - name: mira-simpeg @@ -5554,13 +5564,13 @@ package: manager: pip platform: linux-64 dependencies: + discretize: '>=0.8.0' pandas: '*' pymatsolver: '>=0.2' + geoh5py: '*' empymod: '>=2.0.0' scikit-learn: '>=1.2' - discretize: '>=0.8.0' numpy: '>=1.20' - geoh5py: '*' scipy: '>=1.8.0' url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip hash: @@ -6216,15 +6226,15 @@ package: category: main optional: false - name: libsqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: osx-64 dependencies: libzlib: '>=1.2.13,<1.3.0a0' - url: https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.42.0-h58db7d2_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.43.0-h58db7d2_0.conda hash: - md5: a7d3b44b7b0c9901ac7813b7a0462893 - sha256: 182689f4b1a5ed638cd615c7774e1a9974842bc127c59173f1d25e31a8795eef + md5: e2195038e85e49e26fbeb7efc0ad38c4 + sha256: 3c3e06284c3426126901891675d09e181c651b2db01df9884da2613015e3fbac category: main optional: false - name: libvorbis @@ -6429,15 +6439,15 @@ package: category: apps optional: true - name: zstd - version: 1.5.2 + version: 1.5.5 manager: conda platform: osx-64 dependencies: libzlib: '>=1.2.13,<1.3.0a0' - url: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.2-h829000d_7.conda + url: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.5-h829000d_0.conda hash: - md5: b274ec4dbf15a6e20900e397610567a0 - sha256: 8d6768da7c3170693c0649188e7575474046f8610d8074903cf84e403e3411e8 + md5: 80abc41d0c48b82fe0f04e7f42f5cb7e + sha256: d54e31d3d8de5e254c0804abd984807b8ae5cd3708d758a8bf1adff1f5df166c category: main optional: false - name: blosc @@ -6661,14 +6671,14 @@ package: libcxx: '>=15.0.7' libdeflate: '>=1.18,<1.19.0a0' libjpeg-turbo: '>=2.1.5.1,<3.0a0' - libwebp-base: '>=1.3.0,<2.0a0' + libwebp-base: '>=1.3.1,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' xz: '>=5.2.6,<6.0a0' zstd: '>=1.5.2,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.5.1-hf955e92_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.5.1-hf955e92_1.conda hash: - md5: 56523ed556e3a44c0fd55bcf17045892 - sha256: 0526690c890b53419e6bbbe17dfc456789897ce9d7d79db3c4ea6568848bf6d0 + md5: 3436c5763732687918ce258b0184c7c9 + sha256: 1302146bcfa3905b106543e9c7e7419a3b386767a2dd0b42dbdc36f267a6a0e7 category: main optional: false - name: libxslt @@ -6739,13 +6749,13 @@ package: category: main optional: false - name: python - version: 3.9.17 + version: 3.9.18 manager: conda platform: osx-64 dependencies: bzip2: '>=1.0.8,<2.0a0' libffi: '>=3.4,<4.0a0' - libsqlite: '>=3.42.0,<4.0a0' + libsqlite: '>=3.43.0,<4.0a0' libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.4,<7.0a0' openssl: '>=3.1.2,<4.0a0' @@ -6754,25 +6764,25 @@ package: tzdata: '' xz: '>=5.2.6,<6.0a0' pip: '' - url: https://conda.anaconda.org/conda-forge/osx-64/python-3.9.17-h07e1443_0_cpython.conda + url: https://conda.anaconda.org/conda-forge/osx-64/python-3.9.18-h07e1443_0_cpython.conda hash: - md5: 2ffe6421661b6dcfe0db2d459b58f039 - sha256: 009f32e1671d587a3e993f8c207ab190bf68af5d2d9c6a2d1e4d7c51ec0766f5 + md5: 1af69899195339616e59728495e2b5c2 + sha256: a210336803889854161d768aedf442b9b331b6ec5b8efe02937eab5c49e885ae category: main optional: false - name: sqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: osx-64 dependencies: - libsqlite: 3.42.0 + libsqlite: 3.43.0 libzlib: '>=1.2.13,<1.3.0a0' - ncurses: '>=6.3,<7.0a0' + ncurses: '>=6.4,<7.0a0' readline: '>=8.2,<9.0a0' - url: https://conda.anaconda.org/conda-forge/osx-64/sqlite-3.42.0-h2b0dec6_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/sqlite-3.43.0-h2b0dec6_0.conda hash: - md5: 6c22b83608a6e3bd324ab29d3092592f - sha256: ff811793c293cf861746c95fe97ad5384e917bf473337d05283afdadb3b50bc9 + md5: 6cbfc91cd87a1008771962b5e794e54e + sha256: 9850332ff4f14ce99be612217a6f6ed378f9989aebdb30d47d3a48955bd98d99 category: apps optional: true - name: appnope @@ -7505,15 +7515,15 @@ package: category: apps optional: true - name: pluggy - version: 1.2.0 + version: 1.3.0 manager: conda platform: osx-64 dependencies: python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.2.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 7263924c642d22e311d9e59b839f1b33 - sha256: ff1f70e0bd50693be7e2bad0efb2539f5dcc5ec4d638e787e703f28098e72de4 + md5: 2390bd10bed1f3fdc7a537fb5a447d8d + sha256: 7bf2ad9d747e71f1e93d0863c2c8061dd0f2fe1e582f28d292abfb40264a2eb5 category: dev optional: true - name: ply @@ -7693,16 +7703,16 @@ package: category: apps optional: true - name: rpds-py - version: 0.9.2 + version: 0.10.0 manager: conda platform: osx-64 dependencies: python: '>=3.9,<3.10.0a0' python_abi: 3.9.* - url: https://conda.anaconda.org/conda-forge/osx-64/rpds-py-0.9.2-py39hf33989b_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/rpds-py-0.10.0-py39hf33989b_0.conda hash: - md5: 937eb84c0225df51a83d78e7b84e76fb - sha256: 02b74ea5bc9c3ed3c3c31ec76f3173ed07e391c0c3e0f379c19a4681cee1bc9c + md5: 0df3e5389c6779fc4818d0c5c5a27746 + sha256: e1a7a6d7c053c23a7b327caf454f21ddf698dd20ae0a86124b73b8c165ddddba category: apps optional: true - name: setuptools @@ -8000,19 +8010,18 @@ package: category: apps optional: true - name: anyio - version: 3.7.1 + version: 4.0.0 manager: conda platform: osx-64 dependencies: - typing_extensions: '' exceptiongroup: '' - python: '>=3.7' + python: '>=3.8' sniffio: '>=1.1' idna: '>=2.8' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-3.7.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.0.0-pyhd8ed1ab_0.conda hash: - md5: 7b517e7a6f0790337906c055aa97ca49 - sha256: 62637ac498bcf47783cbf4f48e9b09e4e2f5a6ad42f43ca8f632c353827b94f4 + md5: 3c4e99d3ae4ec033d4dd99fb5220e540 + sha256: 64125775b2e724db5c72e431dd180495d5d509d0a2d1228a122e6af9f1b60e33 category: apps optional: true - name: asttokens @@ -9102,7 +9111,7 @@ package: category: core optional: true - name: dash - version: 2.12.1 + version: 2.13.0 manager: conda platform: osx-64 dependencies: @@ -9116,10 +9125,10 @@ package: plotly: '>=5.0.0' typing-extensions: '>=4.1.1' flask: '>=1.0.4' - url: https://conda.anaconda.org/conda-forge/noarch/dash-2.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dash-2.13.0-pyhd8ed1ab_0.conda hash: - md5: ef8cbf64af2a8f94ab967b6f16fa7f82 - sha256: c4be071de643d7ae26a0c129570d4a0521aa8278a04a4b9f58cc9cd75019b743 + md5: 00a1a6a5100a22750e65ef25bb965c19 + sha256: c04d35702ad2842c433076bf1d34b9a70051a474854792a542ef7fedf3ee71ea category: apps optional: true - name: distributed @@ -9248,8 +9257,8 @@ package: platform: osx-64 dependencies: python: '>=3.8' - attrs: '>=22.2.0' importlib_resources: '>=1.4.0' + attrs: '>=22.2.0' pkgutil-resolve-name: '>=1.3.10' jsonschema-specifications: '>=2023.03.6' referencing: '>=0.28.4' @@ -9523,8 +9532,8 @@ package: python-dateutil: '>=2.8.2' tornado: '>=6.0' jupyter_core: '>=4.9.2' - nest-asyncio: '>=1.5.4' pyzmq: '>=23.0' + nest-asyncio: '>=1.5.4' url: https://conda.anaconda.org/conda-forge/noarch/jupyter_client-7.3.4-pyhd8ed1ab_0.tar.bz2 hash: md5: dad80938cdccc5c274e954dda56b6eb5 @@ -9636,17 +9645,17 @@ package: category: core optional: true - name: tifffile - version: 2023.8.12 + version: 2023.8.30 manager: conda platform: osx-64 dependencies: python: '>=3.9' numpy: '>=1.19.2' imagecodecs: '>=2023.8.12' - url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.12-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.30-pyhd8ed1ab_0.conda hash: - md5: ef24b983632e6acdaf424dec8e16bb55 - sha256: 1b6bfc407d464ce0f83d2d1728abd62baad4a9709914307c33af4d335eea18e6 + md5: 529b803c040449392bc480614f41d522 + sha256: 951627154c02364bcdcd012d877074a188947d85b1e09ea6ae2f6e18c1a37619 category: apps optional: true - name: zarr @@ -9722,13 +9731,14 @@ package: category: apps optional: true - name: ipython - version: 8.14.0 + version: 8.15.0 manager: conda platform: osx-64 dependencies: typing_extensions: '' decorator: '' __osx: '' + exceptiongroup: '' stack_data: '' matplotlib-inline: '' backcall: '' @@ -9740,10 +9750,10 @@ package: jedi: '>=0.16' pexpect: '>4.3' prompt_toolkit: '>=3.0.30,<3.1.0,!=3.0.37' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.14.0-pyhd1c38e8_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.15.0-pyh31c8845_0.conda hash: - md5: f56fab4cea853c2248105b6cd7d79bf0 - sha256: ea7524cd33c18c5c0d01e48e0089f339e7e8f1c3a6a8d2416c46b3d50d509894 + md5: 24e68bbee62de3c9c6d051d59e9ea87b + sha256: a8833f310e6f32bfc8612e9e9ded09b1c53c2d06b35ed5d704222de10a51d4d3 category: apps optional: true - name: nbclient @@ -9928,7 +9938,7 @@ package: category: apps optional: true - name: nbconvert-core - version: 7.7.4 + version: 7.8.0 manager: conda platform: osx-64 dependencies: @@ -9949,10 +9959,10 @@ package: pygments: '>=2.4.1' nbclient: '>=0.5.0' mistune: '>=2.0.3,<4' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 44890ae4b0c7ca721b701febb0081401 - sha256: c869001896bdf57fc32ae67954e0694ae61133ffaf63d0991432f5b9d3262bf4 + md5: 62345c9e24f898bf492979be84a6eb0a + sha256: 7ecab4832e9d5ef2afdddba965dc32b2016fc9850c4deb6b7f8d6dce1526468a category: apps optional: true - name: pymatsolver @@ -10007,8 +10017,8 @@ package: traitlets: '>=5.1.0' jupyter_core: '>=4.12,!=5.0.*' nbconvert-core: '>=6.4.4' - nbformat: '>=5.2.0' anyio: '>=3.1.0' + nbformat: '>=5.2.0' url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-1.23.6-pyhd8ed1ab_0.conda hash: md5: 5016f7c6845a6efd270fcee63af9a2a0 @@ -10016,31 +10026,31 @@ package: category: apps optional: true - name: nbconvert-pandoc - version: 7.7.4 + version: 7.8.0 manager: conda platform: osx-64 dependencies: pandoc: '' python: '>=3.8' - nbconvert-core: 7.7.4 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.7.4-pyhd8ed1ab_0.conda + nbconvert-core: 7.8.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.8.0-pyhd8ed1ab_0.conda hash: - md5: d1ac60298f75db83b5a7016c775e77db - sha256: d0fac92681e5c00691e606327bf6f490798216f1e4e450b635991444f57f243c + md5: 1dba1a577df2625a24667612a069e91c + sha256: 76b8bd6c8cae56dd3495fe6083a2b6317f6f8c42f61ea36d18b75add31c87173 category: apps optional: true - name: nbconvert - version: 7.7.4 + version: 7.8.0 manager: conda platform: osx-64 dependencies: python: '>=3.8' - nbconvert-core: 7.7.4 - nbconvert-pandoc: 7.7.4 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.7.4-pyhd8ed1ab_0.conda + nbconvert-core: 7.8.0 + nbconvert-pandoc: 7.8.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 2c341d4a10927be7a9a0b9f264039782 - sha256: 27eaa8e12d68deec5b04786841d6a1aa4134cb71a82d5a7a4aee5ab51b4fab8e + md5: 43bce95e8c474dd21d7ed5de8b4806f7 + sha256: 544405bbc5cd8e2a03bfddd0f1dca4a41da106d89706fe9ae2680ad077c49b04 category: apps optional: true - name: notebook-shim @@ -10157,6 +10167,16 @@ package: sha256: eab4aba337b8f41a98bbe123ffa9c6f6408c0a8928c29fdc778c6e293d8d2e94 category: apps optional: true +- name: semver + version: 3.0.1 + manager: pip + platform: osx-64 + dependencies: {} + url: https://files.pythonhosted.org/packages/d4/5d/f2b4fe45886238c405ad177ca43911cb1459d08003004da5c27495eb4216/semver-3.0.1-py3-none-any.whl + hash: + sha256: 2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf + category: main + optional: false - name: geoh5py version: 0.8.0a3 manager: pip @@ -10187,7 +10207,7 @@ package: category: main optional: false - name: mira-omf - version: 3.0.0 + version: 3.0.1 manager: pip platform: osx-64 dependencies: @@ -10197,9 +10217,9 @@ package: pypng: '>=0.20220715,<0.20220716' six: '>=1.16,<2.0' vectormath: '>=0.2.0,<0.3.0' - url: https://files.pythonhosted.org/packages/03/23/166c149187e3192218c47d1c5618e4e880a0ccdf635eac2aaa58ed52e986/mira_omf-3.0.0-py3-none-any.whl + url: https://files.pythonhosted.org/packages/e2/ba/da67766f51565f73bdf7599a29b44fd99878a36d6a411a57382a4abc25a9/mira_omf-3.0.1-py3-none-any.whl hash: - sha256: c0bf6ba425aeb3e05bc954cd7bbb6d73fc0234f5cead276aa1d18d0fa3dbab3d + sha256: 7e1b003bbfae4d3eedb6b41f242d3dc9e9e1d86050cacb0ddbf460aedab048d6 category: main optional: false - name: mira-simpeg @@ -10207,13 +10227,13 @@ package: manager: pip platform: osx-64 dependencies: + discretize: '>=0.8.0' pandas: '*' pymatsolver: '>=0.2' + geoh5py: '*' empymod: '>=2.0.0' scikit-learn: '>=1.2' - discretize: '>=0.8.0' numpy: '>=1.20' - geoh5py: '*' scipy: '>=1.8.0' url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip hash: @@ -10751,17 +10771,17 @@ package: category: apps optional: true - name: libsqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.42.0-hcfcfb64_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.43.0-hcfcfb64_0.conda hash: - md5: 9a71d93deb99cc09d8939d5235b5909a - sha256: 70bc1fdb72de847807355c13144666d4f151894f9b141ee559f5d243bdf577e2 + md5: 16c6f482e70cb3da41d0bee5d49c6bf3 + sha256: d79128a279c8e8b4afeef5cfe9d4302a2fd65b1af3973732d92a7cc396d5332f category: main optional: false - name: libwebp-base @@ -10906,11 +10926,11 @@ package: dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' - vs2015_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_2.conda + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_3.conda hash: - md5: 8ba57760b15d0c2493192908317bdf5e - sha256: ac27817d829c1f0d2dcf4622c49807fc1c2974cde8a779b2adc7699bcdca68c1 + md5: 28c6b90f40c9c37d3334ba8225143690 + sha256: 76e5ba07c06947ff7dcee6e9fe47e436e7a5ec5d94ad23102186769459af1403 category: apps optional: true - name: xz @@ -11226,13 +11246,13 @@ package: category: main optional: false - name: python - version: 3.9.17 + version: 3.9.18 manager: conda platform: win-64 dependencies: bzip2: '>=1.0.8,<2.0a0' libffi: '>=3.4,<4.0a0' - libsqlite: '>=3.42.0,<4.0a0' + libsqlite: '>=3.43.0,<4.0a0' libzlib: '>=1.2.13,<1.3.0a0' openssl: '>=3.1.2,<4.0a0' tk: '>=8.6.12,<8.7.0a0' @@ -11241,25 +11261,25 @@ package: vc14_runtime: '>=14.16.27033' xz: '>=5.2.6,<6.0a0' pip: '' - url: https://conda.anaconda.org/conda-forge/win-64/python-3.9.17-h4de0772_0_cpython.conda + url: https://conda.anaconda.org/conda-forge/win-64/python-3.9.18-h4de0772_0_cpython.conda hash: - md5: cb72abd48011d0437f0b9bcad475c640 - sha256: 79f8e436f41d722f1ad06a626c6de8f14f76327731223be2ad3ce4e31d221ec2 + md5: ab83d6883a06de9c783c9aba765226c9 + sha256: ccf60d841d768887f43f3904c2a25bc24ec52aa54478ed942dcc9ad14581eb85 category: main optional: false - name: sqlite - version: 3.42.0 + version: 3.43.0 manager: conda platform: win-64 dependencies: - libsqlite: 3.42.0 + libsqlite: 3.43.0 ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlite-3.42.0-hcfcfb64_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlite-3.43.0-hcfcfb64_0.conda hash: - md5: c505cc64dba674d4c419c0de772c8579 - sha256: 8f24c8c96716a57a570d9b31d69307223a3b8592ade0283e3e7a1b5c2f0fa513 + md5: 0203e216052a1feceefe7894a69b97cf + sha256: 36a5111ee044bfbaa16c7e9f25fc510dc4a5c5767e795a587b36109c08c8f048 category: apps optional: true - name: zeromq @@ -11292,7 +11312,7 @@ package: category: apps optional: true - name: zstd - version: 1.5.2 + version: 1.5.5 manager: conda platform: win-64 dependencies: @@ -11300,10 +11320,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.2-h12be248_7.conda + url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.5-h12be248_0.conda hash: - md5: f3c3879d8cda1c5a6885435dd48a470e - sha256: 33e8fb73dee10740f00d4a450ad2d7f6d90692ca781480fa18fa70fd417d53ad + md5: 792bb5da68bf0a6cac6a6072ecb8dbeb + sha256: d540dd56c5ec772b60e4ce7d45f67f01c6614942225885911964ea1e70bb99e3 category: main optional: false - name: asciitree @@ -11392,12 +11412,12 @@ package: bzip2: '>=1.0.8,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' vc: '>=14.1,<15' - vs2015_runtime: '>=14.16.27033' + vc14_runtime: '>=14.16.27033' zstd: '>=1.5.2,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/boost-cpp-1.78.0-h9f4b32c_3.conda + url: https://conda.anaconda.org/conda-forge/win-64/boost-cpp-1.78.0-h9f4b32c_4.conda hash: - md5: 09805934b78b0cd1a28d9e72a2a4778b - sha256: bf4d718e17cb115ea27d52bc84b3dff963b7ade2dda01ddb7088372833092517 + md5: 991b639e1178f29d8e7681dc75f36acb + sha256: 7e039bfa99e9aca12d1f98426c571850dae12b48e8cd0aa0ef449ea6d9604dac category: apps optional: true - name: brotli-bin @@ -11839,10 +11859,10 @@ package: vc14_runtime: '>=14.29.30139' xz: '>=5.2.6,<6.0a0' zstd: '>=1.5.2,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/libtiff-4.5.1-h6c8260b_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libtiff-4.5.1-h6c8260b_1.conda hash: - md5: cc46fe88f82f9c98bd6858b3f6efb4e0 - sha256: 688e813d61e0d5dff284ef95c53b5c0acf950bbc1df97def4a4a33bbf1bb2fab + md5: 5faa8734cee2590b6d3615e06bfce4f8 + sha256: 46cd425318c5318c9c78c985776fa64746d1812c19f14284876f1aad4f9ee044 category: main optional: false - name: libxslt @@ -12055,15 +12075,15 @@ package: category: apps optional: true - name: pluggy - version: 1.2.0 + version: 1.3.0 manager: conda platform: win-64 dependencies: python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.2.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.3.0-pyhd8ed1ab_0.conda hash: - md5: 7263924c642d22e311d9e59b839f1b33 - sha256: ff1f70e0bd50693be7e2bad0efb2539f5dcc5ec4d638e787e703f28098e72de4 + md5: 2390bd10bed1f3fdc7a537fb5a447d8d + sha256: 7bf2ad9d747e71f1e93d0863c2c8061dd0f2fe1e582f28d292abfb40264a2eb5 category: dev optional: true - name: ply @@ -12271,7 +12291,7 @@ package: category: apps optional: true - name: rpds-py - version: 0.9.2 + version: 0.10.0 manager: conda platform: win-64 dependencies: @@ -12280,10 +12300,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/rpds-py-0.9.2-py39hf21820d_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/rpds-py-0.10.0-py39hf21820d_0.conda hash: - md5: 000b663ad07476629e123ba220a99a87 - sha256: 49d6e5f31119a2c62c145600dd269725f424276215138fd83878f3f5065e88ee + md5: a49d4ec35e5c28802f03737e999ca080 + sha256: 9802025b3b64b22a4918f939b2afdbf9c58b01144e57e7442653b752b5cf8be1 category: apps optional: true - name: setuptools @@ -12627,19 +12647,18 @@ package: category: apps optional: true - name: anyio - version: 3.7.1 + version: 4.0.0 manager: conda platform: win-64 dependencies: - typing_extensions: '' exceptiongroup: '' - python: '>=3.7' + python: '>=3.8' sniffio: '>=1.1' idna: '>=2.8' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-3.7.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.0.0-pyhd8ed1ab_0.conda hash: - md5: 7b517e7a6f0790337906c055aa97ca49 - sha256: 62637ac498bcf47783cbf4f48e9b09e4e2f5a6ad42f43ca8f632c353827b94f4 + md5: 3c4e99d3ae4ec033d4dd99fb5220e540 + sha256: 64125775b2e724db5c72e431dd180495d5d509d0a2d1228a122e6af9f1b60e33 category: apps optional: true - name: asttokens @@ -13803,8 +13822,8 @@ package: platform: win-64 dependencies: python: '>=3.8' - attrs: '>=22.2.0' importlib_resources: '>=1.4.0' + attrs: '>=22.2.0' pkgutil-resolve-name: '>=1.3.10' jsonschema-specifications: '>=2023.03.6' referencing: '>=0.28.4' @@ -13924,7 +13943,7 @@ package: category: core optional: true - name: dash - version: 2.12.1 + version: 2.13.0 manager: conda platform: win-64 dependencies: @@ -13938,10 +13957,10 @@ package: plotly: '>=5.0.0' typing-extensions: '>=4.1.1' flask: '>=1.0.4' - url: https://conda.anaconda.org/conda-forge/noarch/dash-2.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dash-2.13.0-pyhd8ed1ab_0.conda hash: - md5: ef8cbf64af2a8f94ab967b6f16fa7f82 - sha256: c4be071de643d7ae26a0c129570d4a0521aa8278a04a4b9f58cc9cd75019b743 + md5: 00a1a6a5100a22750e65ef25bb965c19 + sha256: c04d35702ad2842c433076bf1d34b9a70051a474854792a542ef7fedf3ee71ea category: apps optional: true - name: gst-plugins-base @@ -13975,8 +13994,8 @@ package: python-dateutil: '>=2.8.2' tornado: '>=6.0' jupyter_core: '>=4.9.2' - nest-asyncio: '>=1.5.4' pyzmq: '>=23.0' + nest-asyncio: '>=1.5.4' url: https://conda.anaconda.org/conda-forge/noarch/jupyter_client-7.3.4-pyhd8ed1ab_0.tar.bz2 hash: md5: dad80938cdccc5c274e954dda56b6eb5 @@ -14114,7 +14133,7 @@ package: category: apps optional: true - name: ipython - version: 8.14.0 + version: 8.15.0 manager: conda platform: win-64 dependencies: @@ -14122,6 +14141,7 @@ package: colorama: '' decorator: '' __win: '' + exceptiongroup: '' stack_data: '' matplotlib-inline: '' backcall: '' @@ -14131,10 +14151,10 @@ package: pygments: '>=2.4.0' jedi: '>=0.16' prompt_toolkit: '>=3.0.30,<3.1.0,!=3.0.37' - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.14.0-pyh08f2357_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.15.0-pyh5737063_0.conda hash: - md5: 1fc684c1de5475383790ada5627c5430 - sha256: 16a409828a1efc95b2d74f6080782ab8f7fdae2c33dde8d2f795e172d9c379a3 + md5: 1def12bdc65c8f7e27db22a8cc586adc + sha256: 594387bed59feb970084e21c26be1c5ad26adda144c6ffc893011384d1725d34 category: apps optional: true - name: nbclient @@ -14338,7 +14358,7 @@ package: category: apps optional: true - name: nbconvert-core - version: 7.7.4 + version: 7.8.0 manager: conda platform: win-64 dependencies: @@ -14359,10 +14379,10 @@ package: pygments: '>=2.4.1' nbclient: '>=0.5.0' mistune: '>=2.0.3,<4' - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.7.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 44890ae4b0c7ca721b701febb0081401 - sha256: c869001896bdf57fc32ae67954e0694ae61133ffaf63d0991432f5b9d3262bf4 + md5: 62345c9e24f898bf492979be84a6eb0a + sha256: 7ecab4832e9d5ef2afdddba965dc32b2016fc9850c4deb6b7f8d6dce1526468a category: apps optional: true - name: numba @@ -14633,8 +14653,8 @@ package: traitlets: '>=5.1.0' jupyter_core: '>=4.12,!=5.0.*' nbconvert-core: '>=6.4.4' - nbformat: '>=5.2.0' anyio: '>=3.1.0' + nbformat: '>=5.2.0' url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-1.23.6-pyhd8ed1ab_0.conda hash: md5: 5016f7c6845a6efd270fcee63af9a2a0 @@ -14670,17 +14690,17 @@ package: category: core optional: true - name: nbconvert-pandoc - version: 7.7.4 + version: 7.8.0 manager: conda platform: win-64 dependencies: pandoc: '' python: '>=3.8' - nbconvert-core: 7.7.4 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.7.4-pyhd8ed1ab_0.conda + nbconvert-core: 7.8.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.8.0-pyhd8ed1ab_0.conda hash: - md5: d1ac60298f75db83b5a7016c775e77db - sha256: d0fac92681e5c00691e606327bf6f490798216f1e4e450b635991444f57f243c + md5: 1dba1a577df2625a24667612a069e91c + sha256: 76b8bd6c8cae56dd3495fe6083a2b6317f6f8c42f61ea36d18b75add31c87173 category: apps optional: true - name: pydiso @@ -14743,17 +14763,17 @@ package: category: core optional: true - name: tifffile - version: 2023.8.12 + version: 2023.8.30 manager: conda platform: win-64 dependencies: python: '>=3.9' numpy: '>=1.19.2' imagecodecs: '>=2023.8.12' - url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.12-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tifffile-2023.8.30-pyhd8ed1ab_0.conda hash: - md5: ef24b983632e6acdaf424dec8e16bb55 - sha256: 1b6bfc407d464ce0f83d2d1728abd62baad4a9709914307c33af4d335eea18e6 + md5: 529b803c040449392bc480614f41d522 + sha256: 951627154c02364bcdcd012d877074a188947d85b1e09ea6ae2f6e18c1a37619 category: apps optional: true - name: zarr @@ -14794,17 +14814,17 @@ package: category: core optional: true - name: nbconvert - version: 7.7.4 + version: 7.8.0 manager: conda platform: win-64 dependencies: python: '>=3.8' - nbconvert-core: 7.7.4 - nbconvert-pandoc: 7.7.4 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.7.4-pyhd8ed1ab_0.conda + nbconvert-core: 7.8.0 + nbconvert-pandoc: 7.8.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.8.0-pyhd8ed1ab_0.conda hash: - md5: 2c341d4a10927be7a9a0b9f264039782 - sha256: 27eaa8e12d68deec5b04786841d6a1aa4134cb71a82d5a7a4aee5ab51b4fab8e + md5: 43bce95e8c474dd21d7ed5de8b4806f7 + sha256: 544405bbc5cd8e2a03bfddd0f1dca4a41da106d89706fe9ae2680ad077c49b04 category: apps optional: true - name: notebook-shim @@ -14964,6 +14984,16 @@ package: sha256: eab4aba337b8f41a98bbe123ffa9c6f6408c0a8928c29fdc778c6e293d8d2e94 category: apps optional: true +- name: semver + version: 3.0.1 + manager: pip + platform: win-64 + dependencies: {} + url: https://files.pythonhosted.org/packages/d4/5d/f2b4fe45886238c405ad177ca43911cb1459d08003004da5c27495eb4216/semver-3.0.1-py3-none-any.whl + hash: + sha256: 2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf + category: main + optional: false - name: geoh5py version: 0.8.0a3 manager: pip @@ -14994,7 +15024,7 @@ package: category: main optional: false - name: mira-omf - version: 3.0.0 + version: 3.0.1 manager: pip platform: win-64 dependencies: @@ -15004,9 +15034,9 @@ package: pypng: '>=0.20220715,<0.20220716' six: '>=1.16,<2.0' vectormath: '>=0.2.0,<0.3.0' - url: https://files.pythonhosted.org/packages/03/23/166c149187e3192218c47d1c5618e4e880a0ccdf635eac2aaa58ed52e986/mira_omf-3.0.0-py3-none-any.whl + url: https://files.pythonhosted.org/packages/e2/ba/da67766f51565f73bdf7599a29b44fd99878a36d6a411a57382a4abc25a9/mira_omf-3.0.1-py3-none-any.whl hash: - sha256: c0bf6ba425aeb3e05bc954cd7bbb6d73fc0234f5cead276aa1d18d0fa3dbab3d + sha256: 7e1b003bbfae4d3eedb6b41f242d3dc9e9e1d86050cacb0ddbf460aedab048d6 category: main optional: false - name: mira-simpeg @@ -15014,13 +15044,13 @@ package: manager: pip platform: win-64 dependencies: + discretize: '>=0.8.0' pandas: '*' pymatsolver: '>=0.2' + geoh5py: '*' empymod: '>=2.0.0' scikit-learn: '>=1.2' - discretize: '>=0.8.0' numpy: '>=1.20' - geoh5py: '*' scipy: '>=1.8.0' url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip hash: diff --git a/environments/conda-py-3.10-linux-64-dev.lock.yml b/environments/conda-py-3.10-linux-64-dev.lock.yml index c1d82929e..767dd5f50 100644 --- a/environments/conda-py-3.10-linux-64-dev.lock.yml +++ b/environments/conda-py-3.10-linux-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: e6841dd09f1da8810c1e8db48b551f5c7d9a5d05e43a85d9815d78d28e8f9fe6 +# input_hash: 24bd176cc1ff0d530d5b17b5cbeb0e069e500ebcfb8406d21a1c51cf10cb3ad2 channels: - conda-forge @@ -99,7 +99,7 @@ dependencies: - libnghttp2=1.52.0=h61bc06f_0 - libpng=1.6.39=h753d276_0 - librttopo=1.1.0=h0d5128d_13 - - libsqlite=3.42.0=h2797004_0 + - libsqlite=3.43.0=h2797004_0 - libssh2=1.11.0=h0841786_0 - libvorbis=1.3.7=h9c3ff4c_0 - libxcb=1.13=h7f98852_1004 @@ -113,7 +113,7 @@ dependencies: - xorg-libsm=1.2.4=h7391055_0 - zeromq=4.3.4=h9c3ff4c_1 - zlib=1.2.13=hd590300_5 - - zstd=1.5.2=hfc55251_7 + - zstd=1.5.5=hfc55251_0 - blosc=1.21.4=h0f2a231_0 - boost-cpp=1.78.0=h6582d0a_3 - brotli-bin=1.0.9=h166bdaf_9 @@ -125,7 +125,7 @@ dependencies: - libhwloc=2.9.0=hd6dc26d_0 - libllvm16=16.0.3=hbf9e925_1 - libsndfile=1.2.2=hbc2eb40_0 - - libtiff=4.5.1=h8b53f26_0 + - libtiff=4.5.1=h8b53f26_1 - libxkbcommon=1.5.0=h79f4944_1 - libxslt=1.1.37=h873f0b0_0 - llvm-openmp=16.0.6=h4dfa4b3_0 @@ -133,7 +133,7 @@ dependencies: - nss=3.92=h1d7d5a4_0 - pandoc=3.1.3=h32600fe_0 - python=3.10.12=hd12c33a_0_cpython - - sqlite=3.42.0=h2c6b66d_0 + - sqlite=3.43.0=h2c6b66d_0 - xcb-util=0.4.0=h516909a_0 - xcb-util-keysyms=0.4.0=h516909a_0 - xcb-util-renderutil=0.3.9=h166bdaf_0 @@ -196,7 +196,7 @@ dependencies: - parso=0.8.3=pyhd8ed1ab_0 - pickleshare=0.7.5=py_1003 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_0 - - pluggy=1.2.0=pyhd8ed1ab_0 + - pluggy=1.3.0=pyhd8ed1ab_0 - ply=3.11=py_1 - prometheus_client=0.17.1=pyhd8ed1ab_0 - psutil=5.9.5=py310h1fa729e_0 @@ -211,7 +211,7 @@ dependencies: - pytz=2023.3=pyhd8ed1ab_0 - pyyaml=6.0.1=py310h2372a71_0 - pyzmq=24.0.1=py310h330234f_1 - - rpds-py=0.9.2=py310hcb5633a_0 + - rpds-py=0.10.0=py310hcb5633a_0 - send2trash=1.8.2=pyh41d4057_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 @@ -242,7 +242,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py310hff52083_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -317,7 +317,7 @@ dependencies: - wcwidth=0.2.6=pyhd8ed1ab_0 - xorg-libxtst=1.2.3=h7f98852_1002 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - distributed=2022.10.0=pyhd8ed1ab_2 - gst-plugins-base=1.22.0=h4243ec0_2 - jsonschema=4.19.0=pyhd8ed1ab_1 @@ -339,7 +339,7 @@ dependencies: - h5py=3.8.0=nompi_py310ha66b2ad_101 - imagecodecs=2023.8.12=py310hc929067_0 - imageio=2.31.1=pyh24c5eb1_0 - - ipython=8.14.0=pyh41d4057_0 + - ipython=8.15.0=pyh0d859eb_0 - nbclient=0.8.0=pyhd8ed1ab_0 - numba=0.57.1=py310h0f6aa51_0 - numcodecs=0.11.0=py310heca2aa9_1 @@ -356,18 +356,18 @@ dependencies: - fiona=1.9.3=py310ha325b7b_0 - ipykernel=6.25.1=pyh71e2992_0 - matplotlib-base=3.7.2=py310hf38f957_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py310h1dd1467_4 - pyqtwebengine=5.15.9=py310h704022c_4 - scikit-learn=1.2.2=py310hf7d194e_2 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - geoana=0.4.0=py310hbf28c38_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - scikit-image=0.19.3=py310h769672d_2 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - nbclassic=1.0.0=pyhb4ecaf3_1 - notebook=6.5.5=pyha770c72_0 @@ -375,9 +375,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.10-linux-64.lock.yml b/environments/conda-py-3.10-linux-64.lock.yml index 3ce6230e4..6dcd265b4 100644 --- a/environments/conda-py-3.10-linux-64.lock.yml +++ b/environments/conda-py-3.10-linux-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: e6841dd09f1da8810c1e8db48b551f5c7d9a5d05e43a85d9815d78d28e8f9fe6 +# input_hash: 24bd176cc1ff0d530d5b17b5cbeb0e069e500ebcfb8406d21a1c51cf10cb3ad2 channels: - conda-forge @@ -99,7 +99,7 @@ dependencies: - libnghttp2=1.52.0=h61bc06f_0 - libpng=1.6.39=h753d276_0 - librttopo=1.1.0=h0d5128d_13 - - libsqlite=3.42.0=h2797004_0 + - libsqlite=3.43.0=h2797004_0 - libssh2=1.11.0=h0841786_0 - libvorbis=1.3.7=h9c3ff4c_0 - libxcb=1.13=h7f98852_1004 @@ -113,7 +113,7 @@ dependencies: - xorg-libsm=1.2.4=h7391055_0 - zeromq=4.3.4=h9c3ff4c_1 - zlib=1.2.13=hd590300_5 - - zstd=1.5.2=hfc55251_7 + - zstd=1.5.5=hfc55251_0 - blosc=1.21.4=h0f2a231_0 - boost-cpp=1.78.0=h6582d0a_3 - brotli-bin=1.0.9=h166bdaf_9 @@ -125,7 +125,7 @@ dependencies: - libhwloc=2.9.0=hd6dc26d_0 - libllvm16=16.0.3=hbf9e925_1 - libsndfile=1.2.2=hbc2eb40_0 - - libtiff=4.5.1=h8b53f26_0 + - libtiff=4.5.1=h8b53f26_1 - libxkbcommon=1.5.0=h79f4944_1 - libxslt=1.1.37=h873f0b0_0 - llvm-openmp=16.0.6=h4dfa4b3_0 @@ -133,7 +133,7 @@ dependencies: - nss=3.92=h1d7d5a4_0 - pandoc=3.1.3=h32600fe_0 - python=3.10.12=hd12c33a_0_cpython - - sqlite=3.42.0=h2c6b66d_0 + - sqlite=3.43.0=h2c6b66d_0 - xcb-util=0.4.0=h516909a_0 - xcb-util-keysyms=0.4.0=h516909a_0 - xcb-util-renderutil=0.3.9=h166bdaf_0 @@ -204,7 +204,7 @@ dependencies: - pytz=2023.3=pyhd8ed1ab_0 - pyyaml=6.0.1=py310h2372a71_0 - pyzmq=24.0.1=py310h330234f_1 - - rpds-py=0.9.2=py310hcb5633a_0 + - rpds-py=0.10.0=py310hcb5633a_0 - send2trash=1.8.2=pyh41d4057_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 @@ -231,7 +231,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py310hff52083_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -299,7 +299,7 @@ dependencies: - wcwidth=0.2.6=pyhd8ed1ab_0 - xorg-libxtst=1.2.3=h7f98852_1002 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - distributed=2022.10.0=pyhd8ed1ab_2 - gst-plugins-base=1.22.0=h4243ec0_2 - jsonschema=4.19.0=pyhd8ed1ab_1 @@ -320,7 +320,7 @@ dependencies: - h5py=3.8.0=nompi_py310ha66b2ad_101 - imagecodecs=2023.8.12=py310hc929067_0 - imageio=2.31.1=pyh24c5eb1_0 - - ipython=8.14.0=pyh41d4057_0 + - ipython=8.15.0=pyh0d859eb_0 - nbclient=0.8.0=pyhd8ed1ab_0 - numba=0.57.1=py310h0f6aa51_0 - numcodecs=0.11.0=py310heca2aa9_1 @@ -337,18 +337,18 @@ dependencies: - fiona=1.9.3=py310ha325b7b_0 - ipykernel=6.25.1=pyh71e2992_0 - matplotlib-base=3.7.2=py310hf38f957_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py310h1dd1467_4 - pyqtwebengine=5.15.9=py310h704022c_4 - scikit-learn=1.2.2=py310hf7d194e_2 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - geoana=0.4.0=py310hbf28c38_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - scikit-image=0.19.3=py310h769672d_2 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - nbclassic=1.0.0=pyhb4ecaf3_1 - notebook=6.5.5=pyha770c72_0 @@ -356,9 +356,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.10-osx-64-dev.lock.yml b/environments/conda-py-3.10-osx-64-dev.lock.yml index 80de8daf9..9b904fa64 100644 --- a/environments/conda-py-3.10-osx-64-dev.lock.yml +++ b/environments/conda-py-3.10-osx-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: ba6af01ffd978722c8c3135be44cbba906cf46f111705b10c2a9bc7b8c635cd6 +# input_hash: 74168cc4265e4391d45adf0f25bcb849299d8aeb16f05e9b2a47426538e29ae8 channels: - conda-forge @@ -59,7 +59,7 @@ dependencies: - libgfortran5=12.3.0=hbd3c1fe_1 - libllvm14=14.0.6=hc8e404f_4 - libpng=1.6.39=ha978bb4_0 - - libsqlite=3.42.0=h58db7d2_0 + - libsqlite=3.43.0=h58db7d2_0 - libvorbis=1.3.7=h046ec9c_0 - libxcb=1.13=h0d85af4_1004 - libxml2=2.10.4=h554bb67_0 @@ -76,7 +76,7 @@ dependencies: - zeromq=4.3.4=he49afe7_1 - zfp=1.0.0=ha894c9a_3 - zlib=1.2.13=h8a1eda9_5 - - zstd=1.5.2=h829000d_7 + - zstd=1.5.5=h829000d_0 - blosc=1.21.4=heccf04b_0 - boost-cpp=1.78.0=hf5ba120_3 - brotli-bin=1.0.9=hb7f2c08_9 @@ -92,14 +92,14 @@ dependencies: - libnghttp2=1.52.0=he2ab024_0 - librttopo=1.1.0=h5c328d2_13 - libssh2=1.11.0=hd019ec5_0 - - libtiff=4.5.1=hf955e92_0 + - libtiff=4.5.1=hf955e92_1 - libxslt=1.1.37=h5d22bc9_0 - libzip=1.10.1=hc158999_0 - mkl=2022.2.1=h44ed08c_16952 - mysql-common=8.0.33=hc6116ba_2 - nss=3.92=hd6ac835_0 - python=3.10.12=had23ca6_0_cpython - - sqlite=3.42.0=h2b0dec6_0 + - sqlite=3.43.0=h2b0dec6_0 - appnope=0.1.3=pyhd8ed1ab_0 - asciitree=0.3.3=py_2 - attrs=23.1.0=pyh71513ae_1 @@ -157,7 +157,7 @@ dependencies: - parso=0.8.3=pyhd8ed1ab_0 - pickleshare=0.7.5=py_1003 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_0 - - pluggy=1.2.0=pyhd8ed1ab_0 + - pluggy=1.3.0=pyhd8ed1ab_0 - ply=3.11=py_1 - prometheus_client=0.17.1=pyhd8ed1ab_0 - psutil=5.9.5=py310h90acd4f_0 @@ -172,7 +172,7 @@ dependencies: - pytz=2023.3=pyhd8ed1ab_0 - pyyaml=6.0.1=py310h6729b98_0 - pyzmq=24.0.1=py310hf615a82_1 - - rpds-py=0.9.2=py310h3461e44_0 + - rpds-py=0.10.0=py310h3461e44_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 - sniffio=1.3.0=pyhd8ed1ab_0 @@ -197,7 +197,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py310h2ec42d9_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -269,7 +269,7 @@ dependencies: - wcwidth=0.2.6=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - contourpy=1.1.0=py310h88cfcbd_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - distributed=2022.10.0=pyhd8ed1ab_2 - gst-plugins-base=1.22.5=hb5d3a86_0 - h5py=3.8.0=nompi_py310h1de854f_101 @@ -296,12 +296,12 @@ dependencies: - prompt_toolkit=3.0.39=hd8ed1ab_0 - qt-main=5.15.8=h23c57ac_14 - scipy=1.10.1=py310h3900cf1_3 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - discretize=0.8.3=py310h3e792ce_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py310h3963e5c_0 - - ipython=8.14.0=pyhd1c38e8_0 + - ipython=8.15.0=pyh31c8845_0 - nbclient=0.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py310he105d0e_4 - pyqt=5.15.9=py310hecc045f_4 @@ -311,12 +311,12 @@ dependencies: - scikit-learn=1.2.2=py310hd2c063c_2 - geoana=0.4.0=py310ha23aa8a_1 - ipykernel=6.25.1=pyh5fb750a_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - pyqtwebengine=5.15.9=py310hc93c43d_4 - jupyter_server=1.23.6=pyhd8ed1ab_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - nbclassic=1.0.0=pyhb4ecaf3_1 - notebook=6.5.5=pyha770c72_0 @@ -324,9 +324,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.10-osx-64.lock.yml b/environments/conda-py-3.10-osx-64.lock.yml index 384628aae..f522afee8 100644 --- a/environments/conda-py-3.10-osx-64.lock.yml +++ b/environments/conda-py-3.10-osx-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: ba6af01ffd978722c8c3135be44cbba906cf46f111705b10c2a9bc7b8c635cd6 +# input_hash: 74168cc4265e4391d45adf0f25bcb849299d8aeb16f05e9b2a47426538e29ae8 channels: - conda-forge @@ -59,7 +59,7 @@ dependencies: - libgfortran5=12.3.0=hbd3c1fe_1 - libllvm14=14.0.6=hc8e404f_4 - libpng=1.6.39=ha978bb4_0 - - libsqlite=3.42.0=h58db7d2_0 + - libsqlite=3.43.0=h58db7d2_0 - libvorbis=1.3.7=h046ec9c_0 - libxcb=1.13=h0d85af4_1004 - libxml2=2.10.4=h554bb67_0 @@ -76,7 +76,7 @@ dependencies: - zeromq=4.3.4=he49afe7_1 - zfp=1.0.0=ha894c9a_3 - zlib=1.2.13=h8a1eda9_5 - - zstd=1.5.2=h829000d_7 + - zstd=1.5.5=h829000d_0 - blosc=1.21.4=heccf04b_0 - boost-cpp=1.78.0=hf5ba120_3 - brotli-bin=1.0.9=hb7f2c08_9 @@ -92,14 +92,14 @@ dependencies: - libnghttp2=1.52.0=he2ab024_0 - librttopo=1.1.0=h5c328d2_13 - libssh2=1.11.0=hd019ec5_0 - - libtiff=4.5.1=hf955e92_0 + - libtiff=4.5.1=hf955e92_1 - libxslt=1.1.37=h5d22bc9_0 - libzip=1.10.1=hc158999_0 - mkl=2022.2.1=h44ed08c_16952 - mysql-common=8.0.33=hc6116ba_2 - nss=3.92=hd6ac835_0 - python=3.10.12=had23ca6_0_cpython - - sqlite=3.42.0=h2b0dec6_0 + - sqlite=3.43.0=h2b0dec6_0 - appnope=0.1.3=pyhd8ed1ab_0 - asciitree=0.3.3=py_2 - attrs=23.1.0=pyh71513ae_1 @@ -165,7 +165,7 @@ dependencies: - pytz=2023.3=pyhd8ed1ab_0 - pyyaml=6.0.1=py310h6729b98_0 - pyzmq=24.0.1=py310hf615a82_1 - - rpds-py=0.9.2=py310h3461e44_0 + - rpds-py=0.10.0=py310h3461e44_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 - sniffio=1.3.0=pyhd8ed1ab_0 @@ -186,7 +186,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py310h2ec42d9_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -251,7 +251,7 @@ dependencies: - wcwidth=0.2.6=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - contourpy=1.1.0=py310h88cfcbd_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - distributed=2022.10.0=pyhd8ed1ab_2 - gst-plugins-base=1.22.5=hb5d3a86_0 - h5py=3.8.0=nompi_py310h1de854f_101 @@ -277,12 +277,12 @@ dependencies: - prompt_toolkit=3.0.39=hd8ed1ab_0 - qt-main=5.15.8=h23c57ac_14 - scipy=1.10.1=py310h3900cf1_3 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - discretize=0.8.3=py310h3e792ce_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py310h3963e5c_0 - - ipython=8.14.0=pyhd1c38e8_0 + - ipython=8.15.0=pyh31c8845_0 - nbclient=0.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py310he105d0e_4 - pyqt=5.15.9=py310hecc045f_4 @@ -292,12 +292,12 @@ dependencies: - scikit-learn=1.2.2=py310hd2c063c_2 - geoana=0.4.0=py310ha23aa8a_1 - ipykernel=6.25.1=pyh5fb750a_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - pyqtwebengine=5.15.9=py310hc93c43d_4 - jupyter_server=1.23.6=pyhd8ed1ab_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - nbclassic=1.0.0=pyhb4ecaf3_1 - notebook=6.5.5=pyha770c72_0 @@ -305,9 +305,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.10-win-64-dev.lock.yml b/environments/conda-py-3.10-win-64-dev.lock.yml index 57340958a..42fffc93f 100644 --- a/environments/conda-py-3.10-win-64-dev.lock.yml +++ b/environments/conda-py-3.10-win-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 2466afc89705a459689ce0504fefcc99bec3f7fff7ec8d12b5b6ca2baa04d5f1 +# input_hash: 7a1fea23d6e69a46582555e2cee10f6adbada733e9587fc588f881fd888ceac7 channels: - conda-forge @@ -45,7 +45,7 @@ dependencies: - libjpeg-turbo=2.1.5.1=hcfcfb64_0 - libogg=1.3.4=h8ffe710_1 - libsodium=1.0.18=h8d14728_1 - - libsqlite=3.42.0=hcfcfb64_0 + - libsqlite=3.43.0=hcfcfb64_0 - libwebp-base=1.3.1=hcfcfb64_0 - libzlib=1.2.13=hcfcfb64_5 - libzopfli=1.0.3=h0e60522_0 @@ -56,7 +56,7 @@ dependencies: - pthreads-win32=2.9.1=hfa6e2cd_3 - snappy=1.1.10=hfb803bf_0 - tk=8.6.12=h8ffe710_0 - - xerces-c=3.2.4=h63175ca_2 + - xerces-c=3.2.4=h63175ca_3 - xz=5.2.6=h8d14728_0 - yaml=0.2.5=h8ffe710_2 - zfp=1.0.0=h63175ca_3 @@ -79,17 +79,17 @@ dependencies: - m2w64-gcc-libs=5.3.0=7 - pcre2=10.40=h17e33f8_0 - python=3.10.12=h4de0772_0_cpython - - sqlite=3.42.0=hcfcfb64_0 + - sqlite=3.43.0=hcfcfb64_0 - zeromq=4.3.4=h0e60522_1 - zlib=1.2.13=hcfcfb64_5 - - zstd=1.5.2=h12be248_7 + - zstd=1.5.5=h12be248_0 - asciitree=0.3.3=py_2 - attrs=23.1.0=pyh71513ae_1 - backcall=0.2.0=pyh9f0ad1d_0 - backports=1.0=pyhd8ed1ab_3 - blinker=1.6.2=pyhd8ed1ab_0 - blosc=1.21.4=hdccc3a2_0 - - boost-cpp=1.78.0=h9f4b32c_3 + - boost-cpp=1.78.0=h9f4b32c_4 - brotli-bin=1.0.9=hcfcfb64_9 - brotli-python=1.0.9=py310h00ffb61_9 - c-blosc2=2.10.2=h183a6f4_0 @@ -121,7 +121,7 @@ dependencies: - libglib=2.76.4=he8f3873_0 - libhwloc=2.9.0=h51c2c0f_0 - libpq=15.3=ha9684e8_0 - - libtiff=4.5.1=h6c8260b_0 + - libtiff=4.5.1=h6c8260b_1 - libxslt=1.1.37=h0192164_0 - llvmlite=0.40.1=py310hb84602e_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -138,7 +138,7 @@ dependencies: - parso=0.8.3=pyhd8ed1ab_0 - pickleshare=0.7.5=py_1003 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_0 - - pluggy=1.2.0=pyhd8ed1ab_0 + - pluggy=1.3.0=pyhd8ed1ab_0 - ply=3.11=py_1 - prometheus_client=0.17.1=pyhd8ed1ab_0 - psutil=5.9.5=py310h8d17308_0 @@ -154,7 +154,7 @@ dependencies: - pywinpty=2.0.11=py310h00ffb61_0 - pyyaml=6.0.1=py310h8d17308_0 - pyzmq=24.0.1=py310hcd737a0_1 - - rpds-py=0.9.2=py310h87d50f1_0 + - rpds-py=0.10.0=py310h87d50f1_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 - sniffio=1.3.0=pyhd8ed1ab_0 @@ -182,7 +182,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py310h5588dad_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -262,7 +262,7 @@ dependencies: - prompt-toolkit=3.0.39=pyha770c72_0 - pylint=2.17.5=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - gst-plugins-base=1.22.5=h001b923_0 - jupyter_client=7.3.4=pyhd8ed1ab_0 - libcblas=3.9.0=17_win64_mkl @@ -272,7 +272,7 @@ dependencies: - pooch=1.7.0=pyha770c72_3 - prompt_toolkit=3.0.39=hd8ed1ab_0 - dash-daq=0.5.0=pyh9f0ad1d_1 - - ipython=8.14.0=pyh08f2357_0 + - ipython=8.15.0=pyh5737063_0 - nbclient=0.8.0=pyhd8ed1ab_0 - numpy=1.23.5=py310h4a8f9c9_0 - qt-main=5.15.8=h2c8576c_14 @@ -282,7 +282,7 @@ dependencies: - imagecodecs=2023.8.12=py310h997794f_0 - imageio=2.31.1=pyh24c5eb1_0 - ipykernel=6.25.1=pyh6817e22_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - numba=0.57.1=py310h19bcfe9_0 - numcodecs=0.11.0=py310h00ffb61_1 - pandas=1.5.3=py310h1c4a608_1 @@ -298,14 +298,14 @@ dependencies: - fiona=1.9.3=py310h4a685fe_0 - jupyter_server=1.23.6=pyhd8ed1ab_0 - matplotlib-base=3.7.2=py310h51140c5_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py310h847dae0_4 - pyqtwebengine=5.15.9=py310he49db7d_4 - scikit-learn=1.2.2=py310hd266714_2 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - geoana=0.4.0=py310h232114e_1 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - scikit-image=0.19.3=py310h1c4a608_2 @@ -315,9 +315,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.10-win-64.lock.yml b/environments/conda-py-3.10-win-64.lock.yml index 1bec4d574..7ef4dcbac 100644 --- a/environments/conda-py-3.10-win-64.lock.yml +++ b/environments/conda-py-3.10-win-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 2466afc89705a459689ce0504fefcc99bec3f7fff7ec8d12b5b6ca2baa04d5f1 +# input_hash: 7a1fea23d6e69a46582555e2cee10f6adbada733e9587fc588f881fd888ceac7 channels: - conda-forge @@ -45,7 +45,7 @@ dependencies: - libjpeg-turbo=2.1.5.1=hcfcfb64_0 - libogg=1.3.4=h8ffe710_1 - libsodium=1.0.18=h8d14728_1 - - libsqlite=3.42.0=hcfcfb64_0 + - libsqlite=3.43.0=hcfcfb64_0 - libwebp-base=1.3.1=hcfcfb64_0 - libzlib=1.2.13=hcfcfb64_5 - libzopfli=1.0.3=h0e60522_0 @@ -56,7 +56,7 @@ dependencies: - pthreads-win32=2.9.1=hfa6e2cd_3 - snappy=1.1.10=hfb803bf_0 - tk=8.6.12=h8ffe710_0 - - xerces-c=3.2.4=h63175ca_2 + - xerces-c=3.2.4=h63175ca_3 - xz=5.2.6=h8d14728_0 - yaml=0.2.5=h8ffe710_2 - zfp=1.0.0=h63175ca_3 @@ -79,17 +79,17 @@ dependencies: - m2w64-gcc-libs=5.3.0=7 - pcre2=10.40=h17e33f8_0 - python=3.10.12=h4de0772_0_cpython - - sqlite=3.42.0=hcfcfb64_0 + - sqlite=3.43.0=hcfcfb64_0 - zeromq=4.3.4=h0e60522_1 - zlib=1.2.13=hcfcfb64_5 - - zstd=1.5.2=h12be248_7 + - zstd=1.5.5=h12be248_0 - asciitree=0.3.3=py_2 - attrs=23.1.0=pyh71513ae_1 - backcall=0.2.0=pyh9f0ad1d_0 - backports=1.0=pyhd8ed1ab_3 - blinker=1.6.2=pyhd8ed1ab_0 - blosc=1.21.4=hdccc3a2_0 - - boost-cpp=1.78.0=h9f4b32c_3 + - boost-cpp=1.78.0=h9f4b32c_4 - brotli-bin=1.0.9=hcfcfb64_9 - brotli-python=1.0.9=py310h00ffb61_9 - c-blosc2=2.10.2=h183a6f4_0 @@ -116,7 +116,7 @@ dependencies: - libglib=2.76.4=he8f3873_0 - libhwloc=2.9.0=h51c2c0f_0 - libpq=15.3=ha9684e8_0 - - libtiff=4.5.1=h6c8260b_0 + - libtiff=4.5.1=h6c8260b_1 - libxslt=1.1.37=h0192164_0 - llvmlite=0.40.1=py310hb84602e_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -147,7 +147,7 @@ dependencies: - pywinpty=2.0.11=py310h00ffb61_0 - pyyaml=6.0.1=py310h8d17308_0 - pyzmq=24.0.1=py310hcd737a0_1 - - rpds-py=0.9.2=py310h87d50f1_0 + - rpds-py=0.10.0=py310h87d50f1_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 - sniffio=1.3.0=pyhd8ed1ab_0 @@ -171,7 +171,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py310h5588dad_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -243,7 +243,7 @@ dependencies: - poppler=23.05.0=h45d20d0_1 - prompt-toolkit=3.0.39=pyha770c72_0 - requests=2.31.0=pyhd8ed1ab_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - gst-plugins-base=1.22.5=h001b923_0 - jupyter_client=7.3.4=pyhd8ed1ab_0 - libcblas=3.9.0=17_win64_mkl @@ -253,7 +253,7 @@ dependencies: - pooch=1.7.0=pyha770c72_3 - prompt_toolkit=3.0.39=hd8ed1ab_0 - dash-daq=0.5.0=pyh9f0ad1d_1 - - ipython=8.14.0=pyh08f2357_0 + - ipython=8.15.0=pyh5737063_0 - nbclient=0.8.0=pyhd8ed1ab_0 - numpy=1.23.5=py310h4a8f9c9_0 - qt-main=5.15.8=h2c8576c_14 @@ -263,7 +263,7 @@ dependencies: - imagecodecs=2023.8.12=py310h997794f_0 - imageio=2.31.1=pyh24c5eb1_0 - ipykernel=6.25.1=pyh6817e22_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - numba=0.57.1=py310h19bcfe9_0 - numcodecs=0.11.0=py310h00ffb61_1 - pandas=1.5.3=py310h1c4a608_1 @@ -279,14 +279,14 @@ dependencies: - fiona=1.9.3=py310h4a685fe_0 - jupyter_server=1.23.6=pyhd8ed1ab_0 - matplotlib-base=3.7.2=py310h51140c5_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py310h847dae0_4 - pyqtwebengine=5.15.9=py310he49db7d_4 - scikit-learn=1.2.2=py310hd266714_2 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - geoana=0.4.0=py310h232114e_1 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - scikit-image=0.19.3=py310h1c4a608_2 @@ -296,9 +296,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.9-linux-64-dev.lock.yml b/environments/conda-py-3.9-linux-64-dev.lock.yml index d9b8007c6..382ceb8d8 100644 --- a/environments/conda-py-3.9-linux-64-dev.lock.yml +++ b/environments/conda-py-3.9-linux-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: b5c1863f3c85ba4405d588e4f58b557ab8aa83d83bff55d899b02d07dc2bc2f6 +# input_hash: b55e8a7bc8f8f23be1cce7b96faf349eb3f407e27d9e2cb9be03bcf468265511 channels: - conda-forge @@ -99,7 +99,7 @@ dependencies: - libnghttp2=1.52.0=h61bc06f_0 - libpng=1.6.39=h753d276_0 - librttopo=1.1.0=h0d5128d_13 - - libsqlite=3.42.0=h2797004_0 + - libsqlite=3.43.0=h2797004_0 - libssh2=1.11.0=h0841786_0 - libvorbis=1.3.7=h9c3ff4c_0 - libxcb=1.13=h7f98852_1004 @@ -113,7 +113,7 @@ dependencies: - xorg-libsm=1.2.4=h7391055_0 - zeromq=4.3.4=h9c3ff4c_1 - zlib=1.2.13=hd590300_5 - - zstd=1.5.2=hfc55251_7 + - zstd=1.5.5=hfc55251_0 - blosc=1.21.4=h0f2a231_0 - boost-cpp=1.78.0=h6582d0a_3 - brotli-bin=1.0.9=h166bdaf_9 @@ -125,15 +125,15 @@ dependencies: - libhwloc=2.9.0=hd6dc26d_0 - libllvm16=16.0.3=hbf9e925_1 - libsndfile=1.2.2=hbc2eb40_0 - - libtiff=4.5.1=h8b53f26_0 + - libtiff=4.5.1=h8b53f26_1 - libxkbcommon=1.5.0=h79f4944_1 - libxslt=1.1.37=h873f0b0_0 - llvm-openmp=16.0.6=h4dfa4b3_0 - mysql-libs=8.0.33=hca2cd23_2 - nss=3.92=h1d7d5a4_0 - pandoc=3.1.3=h32600fe_0 - - python=3.9.17=h0755675_0_cpython - - sqlite=3.42.0=h2c6b66d_0 + - python=3.9.18=h0755675_0_cpython + - sqlite=3.43.0=h2c6b66d_0 - xcb-util=0.4.0=h516909a_0 - xcb-util-keysyms=0.4.0=h516909a_0 - xcb-util-renderutil=0.3.9=h166bdaf_0 @@ -196,7 +196,7 @@ dependencies: - parso=0.8.3=pyhd8ed1ab_0 - pickleshare=0.7.5=py_1003 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_0 - - pluggy=1.2.0=pyhd8ed1ab_0 + - pluggy=1.3.0=pyhd8ed1ab_0 - ply=3.11=py_1 - prometheus_client=0.17.1=pyhd8ed1ab_0 - psutil=5.9.5=py39h72bdee0_0 @@ -211,7 +211,7 @@ dependencies: - pytz=2023.3=pyhd8ed1ab_0 - pyyaml=6.0.1=py39hd1e30aa_0 - pyzmq=24.0.1=py39headdf64_1 - - rpds-py=0.9.2=py39h9fdd4d6_0 + - rpds-py=0.10.0=py39h9fdd4d6_0 - send2trash=1.8.2=pyh41d4057_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 @@ -242,7 +242,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py39hf3d152e_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -318,7 +318,7 @@ dependencies: - wcwidth=0.2.6=pyhd8ed1ab_0 - xorg-libxtst=1.2.3=h7f98852_1002 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - distributed=2022.10.0=pyhd8ed1ab_2 - gst-plugins-base=1.22.0=h4243ec0_2 - jsonschema=4.19.0=pyhd8ed1ab_1 @@ -340,7 +340,7 @@ dependencies: - h5py=3.8.0=nompi_py39h89bf01e_101 - imagecodecs=2023.8.12=py39he027151_0 - imageio=2.31.1=pyh24c5eb1_0 - - ipython=8.14.0=pyh41d4057_0 + - ipython=8.15.0=pyh0d859eb_0 - nbclient=0.8.0=pyhd8ed1ab_0 - numba=0.57.1=py39hb75a051_0 - numcodecs=0.11.0=py39h227be39_1 @@ -357,18 +357,18 @@ dependencies: - fiona=1.9.3=py39h0801953_0 - ipykernel=6.25.1=pyh71e2992_0 - matplotlib-base=3.7.2=py39h0126182_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py39h051f8f4_4 - pyqtwebengine=5.15.9=py39h071a739_4 - scikit-learn=1.2.2=py39hc236052_2 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - geoana=0.4.0=py39hf939315_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - scikit-image=0.19.3=py39h4661b88_2 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - nbclassic=1.0.0=pyhb4ecaf3_1 - notebook=6.5.5=pyha770c72_0 @@ -376,9 +376,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.9-linux-64.lock.yml b/environments/conda-py-3.9-linux-64.lock.yml index 89b13b228..40cc47b2c 100644 --- a/environments/conda-py-3.9-linux-64.lock.yml +++ b/environments/conda-py-3.9-linux-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: b5c1863f3c85ba4405d588e4f58b557ab8aa83d83bff55d899b02d07dc2bc2f6 +# input_hash: b55e8a7bc8f8f23be1cce7b96faf349eb3f407e27d9e2cb9be03bcf468265511 channels: - conda-forge @@ -99,7 +99,7 @@ dependencies: - libnghttp2=1.52.0=h61bc06f_0 - libpng=1.6.39=h753d276_0 - librttopo=1.1.0=h0d5128d_13 - - libsqlite=3.42.0=h2797004_0 + - libsqlite=3.43.0=h2797004_0 - libssh2=1.11.0=h0841786_0 - libvorbis=1.3.7=h9c3ff4c_0 - libxcb=1.13=h7f98852_1004 @@ -113,7 +113,7 @@ dependencies: - xorg-libsm=1.2.4=h7391055_0 - zeromq=4.3.4=h9c3ff4c_1 - zlib=1.2.13=hd590300_5 - - zstd=1.5.2=hfc55251_7 + - zstd=1.5.5=hfc55251_0 - blosc=1.21.4=h0f2a231_0 - boost-cpp=1.78.0=h6582d0a_3 - brotli-bin=1.0.9=h166bdaf_9 @@ -125,15 +125,15 @@ dependencies: - libhwloc=2.9.0=hd6dc26d_0 - libllvm16=16.0.3=hbf9e925_1 - libsndfile=1.2.2=hbc2eb40_0 - - libtiff=4.5.1=h8b53f26_0 + - libtiff=4.5.1=h8b53f26_1 - libxkbcommon=1.5.0=h79f4944_1 - libxslt=1.1.37=h873f0b0_0 - llvm-openmp=16.0.6=h4dfa4b3_0 - mysql-libs=8.0.33=hca2cd23_2 - nss=3.92=h1d7d5a4_0 - pandoc=3.1.3=h32600fe_0 - - python=3.9.17=h0755675_0_cpython - - sqlite=3.42.0=h2c6b66d_0 + - python=3.9.18=h0755675_0_cpython + - sqlite=3.43.0=h2c6b66d_0 - xcb-util=0.4.0=h516909a_0 - xcb-util-keysyms=0.4.0=h516909a_0 - xcb-util-renderutil=0.3.9=h166bdaf_0 @@ -204,7 +204,7 @@ dependencies: - pytz=2023.3=pyhd8ed1ab_0 - pyyaml=6.0.1=py39hd1e30aa_0 - pyzmq=24.0.1=py39headdf64_1 - - rpds-py=0.9.2=py39h9fdd4d6_0 + - rpds-py=0.10.0=py39h9fdd4d6_0 - send2trash=1.8.2=pyh41d4057_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 @@ -231,7 +231,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py39hf3d152e_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -300,7 +300,7 @@ dependencies: - wcwidth=0.2.6=pyhd8ed1ab_0 - xorg-libxtst=1.2.3=h7f98852_1002 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - distributed=2022.10.0=pyhd8ed1ab_2 - gst-plugins-base=1.22.0=h4243ec0_2 - jsonschema=4.19.0=pyhd8ed1ab_1 @@ -321,7 +321,7 @@ dependencies: - h5py=3.8.0=nompi_py39h89bf01e_101 - imagecodecs=2023.8.12=py39he027151_0 - imageio=2.31.1=pyh24c5eb1_0 - - ipython=8.14.0=pyh41d4057_0 + - ipython=8.15.0=pyh0d859eb_0 - nbclient=0.8.0=pyhd8ed1ab_0 - numba=0.57.1=py39hb75a051_0 - numcodecs=0.11.0=py39h227be39_1 @@ -338,18 +338,18 @@ dependencies: - fiona=1.9.3=py39h0801953_0 - ipykernel=6.25.1=pyh71e2992_0 - matplotlib-base=3.7.2=py39h0126182_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py39h051f8f4_4 - pyqtwebengine=5.15.9=py39h071a739_4 - scikit-learn=1.2.2=py39hc236052_2 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - geoana=0.4.0=py39hf939315_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - scikit-image=0.19.3=py39h4661b88_2 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - nbclassic=1.0.0=pyhb4ecaf3_1 - notebook=6.5.5=pyha770c72_0 @@ -357,9 +357,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.9-osx-64-dev.lock.yml b/environments/conda-py-3.9-osx-64-dev.lock.yml index af0963cdf..dfc722352 100644 --- a/environments/conda-py-3.9-osx-64-dev.lock.yml +++ b/environments/conda-py-3.9-osx-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: 8f3e57e6845fd412e7e900329f1e580a3d8f744075e44816ce76644bf8677ba6 +# input_hash: 86a498f1203213af78b4e702353fa73d38a26bc5eb5e43c96944a6cf6e5e641b channels: - conda-forge @@ -59,7 +59,7 @@ dependencies: - libgfortran5=12.3.0=hbd3c1fe_1 - libllvm14=14.0.6=hc8e404f_4 - libpng=1.6.39=ha978bb4_0 - - libsqlite=3.42.0=h58db7d2_0 + - libsqlite=3.43.0=h58db7d2_0 - libvorbis=1.3.7=h046ec9c_0 - libxcb=1.13=h0d85af4_1004 - libxml2=2.10.4=h554bb67_0 @@ -76,7 +76,7 @@ dependencies: - zeromq=4.3.4=he49afe7_1 - zfp=1.0.0=ha894c9a_3 - zlib=1.2.13=h8a1eda9_5 - - zstd=1.5.2=h829000d_7 + - zstd=1.5.5=h829000d_0 - blosc=1.21.4=heccf04b_0 - boost-cpp=1.78.0=hf5ba120_3 - brotli-bin=1.0.9=hb7f2c08_9 @@ -92,14 +92,14 @@ dependencies: - libnghttp2=1.52.0=he2ab024_0 - librttopo=1.1.0=h5c328d2_13 - libssh2=1.11.0=hd019ec5_0 - - libtiff=4.5.1=hf955e92_0 + - libtiff=4.5.1=hf955e92_1 - libxslt=1.1.37=h5d22bc9_0 - libzip=1.10.1=hc158999_0 - mkl=2022.2.1=h44ed08c_16952 - mysql-common=8.0.33=hc6116ba_2 - nss=3.92=hd6ac835_0 - - python=3.9.17=h07e1443_0_cpython - - sqlite=3.42.0=h2b0dec6_0 + - python=3.9.18=h07e1443_0_cpython + - sqlite=3.43.0=h2b0dec6_0 - appnope=0.1.3=pyhd8ed1ab_0 - asciitree=0.3.3=py_2 - attrs=23.1.0=pyh71513ae_1 @@ -157,7 +157,7 @@ dependencies: - parso=0.8.3=pyhd8ed1ab_0 - pickleshare=0.7.5=py_1003 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_0 - - pluggy=1.2.0=pyhd8ed1ab_0 + - pluggy=1.3.0=pyhd8ed1ab_0 - ply=3.11=py_1 - prometheus_client=0.17.1=pyhd8ed1ab_0 - psutil=5.9.5=py39ha30fb19_0 @@ -172,7 +172,7 @@ dependencies: - pytz=2023.3=pyhd8ed1ab_0 - pyyaml=6.0.1=py39hdc70f33_0 - pyzmq=24.0.1=py39hed8f129_1 - - rpds-py=0.9.2=py39hf33989b_0 + - rpds-py=0.10.0=py39hf33989b_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 - sniffio=1.3.0=pyhd8ed1ab_0 @@ -197,7 +197,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py39h6e9494a_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -270,7 +270,7 @@ dependencies: - wcwidth=0.2.6=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - contourpy=1.1.0=py39h8ee36c8_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - distributed=2022.10.0=pyhd8ed1ab_2 - gst-plugins-base=1.22.5=hb5d3a86_0 - h5py=3.8.0=nompi_py39h03e16b4_101 @@ -297,12 +297,12 @@ dependencies: - prompt_toolkit=3.0.39=hd8ed1ab_0 - qt-main=5.15.8=h23c57ac_14 - scipy=1.10.1=py39hded996c_3 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - discretize=0.8.3=py39h6dc771e_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py39hcea2a47_0 - - ipython=8.14.0=pyhd1c38e8_0 + - ipython=8.15.0=pyh31c8845_0 - nbclient=0.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py39h29261d1_4 - pyqt=5.15.9=py39h3dce684_4 @@ -312,12 +312,12 @@ dependencies: - scikit-learn=1.2.2=py39hcb35850_2 - geoana=0.4.0=py39h92daf61_1 - ipykernel=6.25.1=pyh5fb750a_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - pyqtwebengine=5.15.9=py39h6ed9014_4 - jupyter_server=1.23.6=pyhd8ed1ab_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - nbclassic=1.0.0=pyhb4ecaf3_1 - notebook=6.5.5=pyha770c72_0 @@ -325,9 +325,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.9-osx-64.lock.yml b/environments/conda-py-3.9-osx-64.lock.yml index 1b6254b4e..168709c3b 100644 --- a/environments/conda-py-3.9-osx-64.lock.yml +++ b/environments/conda-py-3.9-osx-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: 8f3e57e6845fd412e7e900329f1e580a3d8f744075e44816ce76644bf8677ba6 +# input_hash: 86a498f1203213af78b4e702353fa73d38a26bc5eb5e43c96944a6cf6e5e641b channels: - conda-forge @@ -59,7 +59,7 @@ dependencies: - libgfortran5=12.3.0=hbd3c1fe_1 - libllvm14=14.0.6=hc8e404f_4 - libpng=1.6.39=ha978bb4_0 - - libsqlite=3.42.0=h58db7d2_0 + - libsqlite=3.43.0=h58db7d2_0 - libvorbis=1.3.7=h046ec9c_0 - libxcb=1.13=h0d85af4_1004 - libxml2=2.10.4=h554bb67_0 @@ -76,7 +76,7 @@ dependencies: - zeromq=4.3.4=he49afe7_1 - zfp=1.0.0=ha894c9a_3 - zlib=1.2.13=h8a1eda9_5 - - zstd=1.5.2=h829000d_7 + - zstd=1.5.5=h829000d_0 - blosc=1.21.4=heccf04b_0 - boost-cpp=1.78.0=hf5ba120_3 - brotli-bin=1.0.9=hb7f2c08_9 @@ -92,14 +92,14 @@ dependencies: - libnghttp2=1.52.0=he2ab024_0 - librttopo=1.1.0=h5c328d2_13 - libssh2=1.11.0=hd019ec5_0 - - libtiff=4.5.1=hf955e92_0 + - libtiff=4.5.1=hf955e92_1 - libxslt=1.1.37=h5d22bc9_0 - libzip=1.10.1=hc158999_0 - mkl=2022.2.1=h44ed08c_16952 - mysql-common=8.0.33=hc6116ba_2 - nss=3.92=hd6ac835_0 - - python=3.9.17=h07e1443_0_cpython - - sqlite=3.42.0=h2b0dec6_0 + - python=3.9.18=h07e1443_0_cpython + - sqlite=3.43.0=h2b0dec6_0 - appnope=0.1.3=pyhd8ed1ab_0 - asciitree=0.3.3=py_2 - attrs=23.1.0=pyh71513ae_1 @@ -165,7 +165,7 @@ dependencies: - pytz=2023.3=pyhd8ed1ab_0 - pyyaml=6.0.1=py39hdc70f33_0 - pyzmq=24.0.1=py39hed8f129_1 - - rpds-py=0.9.2=py39hf33989b_0 + - rpds-py=0.10.0=py39hf33989b_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 - sniffio=1.3.0=pyhd8ed1ab_0 @@ -186,7 +186,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py39h6e9494a_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -252,7 +252,7 @@ dependencies: - wcwidth=0.2.6=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - contourpy=1.1.0=py39h8ee36c8_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - distributed=2022.10.0=pyhd8ed1ab_2 - gst-plugins-base=1.22.5=hb5d3a86_0 - h5py=3.8.0=nompi_py39h03e16b4_101 @@ -278,12 +278,12 @@ dependencies: - prompt_toolkit=3.0.39=hd8ed1ab_0 - qt-main=5.15.8=h23c57ac_14 - scipy=1.10.1=py39hded996c_3 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - discretize=0.8.3=py39h6dc771e_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py39hcea2a47_0 - - ipython=8.14.0=pyhd1c38e8_0 + - ipython=8.15.0=pyh31c8845_0 - nbclient=0.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py39h29261d1_4 - pyqt=5.15.9=py39h3dce684_4 @@ -293,12 +293,12 @@ dependencies: - scikit-learn=1.2.2=py39hcb35850_2 - geoana=0.4.0=py39h92daf61_1 - ipykernel=6.25.1=pyh5fb750a_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - pyqtwebengine=5.15.9=py39h6ed9014_4 - jupyter_server=1.23.6=pyhd8ed1ab_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - nbclassic=1.0.0=pyhb4ecaf3_1 - notebook=6.5.5=pyha770c72_0 @@ -306,9 +306,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.9-win-64-dev.lock.yml b/environments/conda-py-3.9-win-64-dev.lock.yml index 62a0ffb4d..36764bbc8 100644 --- a/environments/conda-py-3.9-win-64-dev.lock.yml +++ b/environments/conda-py-3.9-win-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 99f7f98ebc3dded107c42ab5dd22fb313b8992c54e685cd31ed827bc2832a9fb +# input_hash: 610077cd4be3642daa5616a9f6df3bd7b48db66463496e36877a27e4303793c3 channels: - conda-forge @@ -45,7 +45,7 @@ dependencies: - libjpeg-turbo=2.1.5.1=hcfcfb64_0 - libogg=1.3.4=h8ffe710_1 - libsodium=1.0.18=h8d14728_1 - - libsqlite=3.42.0=hcfcfb64_0 + - libsqlite=3.43.0=hcfcfb64_0 - libwebp-base=1.3.1=hcfcfb64_0 - libzlib=1.2.13=hcfcfb64_5 - libzopfli=1.0.3=h0e60522_0 @@ -56,7 +56,7 @@ dependencies: - pthreads-win32=2.9.1=hfa6e2cd_3 - snappy=1.1.10=hfb803bf_0 - tk=8.6.12=h8ffe710_0 - - xerces-c=3.2.4=h63175ca_2 + - xerces-c=3.2.4=h63175ca_3 - xz=5.2.6=h8d14728_0 - yaml=0.2.5=h8ffe710_2 - zfp=1.0.0=h63175ca_3 @@ -78,18 +78,18 @@ dependencies: - libzip=1.10.1=h1d365fa_0 - m2w64-gcc-libs=5.3.0=7 - pcre2=10.40=h17e33f8_0 - - python=3.9.17=h4de0772_0_cpython - - sqlite=3.42.0=hcfcfb64_0 + - python=3.9.18=h4de0772_0_cpython + - sqlite=3.43.0=hcfcfb64_0 - zeromq=4.3.4=h0e60522_1 - zlib=1.2.13=hcfcfb64_5 - - zstd=1.5.2=h12be248_7 + - zstd=1.5.5=h12be248_0 - asciitree=0.3.3=py_2 - attrs=23.1.0=pyh71513ae_1 - backcall=0.2.0=pyh9f0ad1d_0 - backports=1.0=pyhd8ed1ab_3 - blinker=1.6.2=pyhd8ed1ab_0 - blosc=1.21.4=hdccc3a2_0 - - boost-cpp=1.78.0=h9f4b32c_3 + - boost-cpp=1.78.0=h9f4b32c_4 - brotli-bin=1.0.9=hcfcfb64_9 - brotli-python=1.0.9=py39h99910a6_9 - c-blosc2=2.10.2=h183a6f4_0 @@ -121,7 +121,7 @@ dependencies: - libglib=2.76.4=he8f3873_0 - libhwloc=2.9.0=h51c2c0f_0 - libpq=15.3=ha9684e8_0 - - libtiff=4.5.1=h6c8260b_0 + - libtiff=4.5.1=h6c8260b_1 - libxslt=1.1.37=h0192164_0 - llvmlite=0.40.1=py39hd28a505_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -138,7 +138,7 @@ dependencies: - parso=0.8.3=pyhd8ed1ab_0 - pickleshare=0.7.5=py_1003 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_0 - - pluggy=1.2.0=pyhd8ed1ab_0 + - pluggy=1.3.0=pyhd8ed1ab_0 - ply=3.11=py_1 - prometheus_client=0.17.1=pyhd8ed1ab_0 - psutil=5.9.5=py39ha55989b_0 @@ -154,7 +154,7 @@ dependencies: - pywinpty=2.0.11=py39h99910a6_0 - pyyaml=6.0.1=py39ha55989b_0 - pyzmq=24.0.1=py39hea35a22_1 - - rpds-py=0.9.2=py39hf21820d_0 + - rpds-py=0.10.0=py39hf21820d_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 - sniffio=1.3.0=pyhd8ed1ab_0 @@ -182,7 +182,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py39hcbf5309_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -263,7 +263,7 @@ dependencies: - prompt-toolkit=3.0.39=pyha770c72_0 - pylint=2.17.5=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - gst-plugins-base=1.22.5=h001b923_0 - jupyter_client=7.3.4=pyhd8ed1ab_0 - libcblas=3.9.0=17_win64_mkl @@ -273,7 +273,7 @@ dependencies: - pooch=1.7.0=pyha770c72_3 - prompt_toolkit=3.0.39=hd8ed1ab_0 - dash-daq=0.5.0=pyh9f0ad1d_1 - - ipython=8.14.0=pyh08f2357_0 + - ipython=8.15.0=pyh5737063_0 - nbclient=0.8.0=pyhd8ed1ab_0 - numpy=1.23.5=py39hbccbffa_0 - qt-main=5.15.8=h2c8576c_14 @@ -283,7 +283,7 @@ dependencies: - imagecodecs=2023.8.12=py39had998c7_0 - imageio=2.31.1=pyh24c5eb1_0 - ipykernel=6.25.1=pyh6817e22_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - numba=0.57.1=py39hadaa1c4_0 - numcodecs=0.11.0=py39h99910a6_1 - pandas=1.5.3=py39h2ba5b7c_1 @@ -299,14 +299,14 @@ dependencies: - fiona=1.9.3=py39h7b53f02_0 - jupyter_server=1.23.6=pyhd8ed1ab_0 - matplotlib-base=3.7.2=py39ha3e071c_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py39h9be9993_4 - pyqtwebengine=5.15.9=py39h2f4a3f1_4 - scikit-learn=1.2.2=py39hfa9d973_2 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - geoana=0.4.0=py39h1f6ef14_1 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - scikit-image=0.19.3=py39h2ba5b7c_2 @@ -316,9 +316,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/environments/conda-py-3.9-win-64.lock.yml b/environments/conda-py-3.9-win-64.lock.yml index 413abaf42..9e6a56599 100644 --- a/environments/conda-py-3.9-win-64.lock.yml +++ b/environments/conda-py-3.9-win-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 99f7f98ebc3dded107c42ab5dd22fb313b8992c54e685cd31ed827bc2832a9fb +# input_hash: 610077cd4be3642daa5616a9f6df3bd7b48db66463496e36877a27e4303793c3 channels: - conda-forge @@ -45,7 +45,7 @@ dependencies: - libjpeg-turbo=2.1.5.1=hcfcfb64_0 - libogg=1.3.4=h8ffe710_1 - libsodium=1.0.18=h8d14728_1 - - libsqlite=3.42.0=hcfcfb64_0 + - libsqlite=3.43.0=hcfcfb64_0 - libwebp-base=1.3.1=hcfcfb64_0 - libzlib=1.2.13=hcfcfb64_5 - libzopfli=1.0.3=h0e60522_0 @@ -56,7 +56,7 @@ dependencies: - pthreads-win32=2.9.1=hfa6e2cd_3 - snappy=1.1.10=hfb803bf_0 - tk=8.6.12=h8ffe710_0 - - xerces-c=3.2.4=h63175ca_2 + - xerces-c=3.2.4=h63175ca_3 - xz=5.2.6=h8d14728_0 - yaml=0.2.5=h8ffe710_2 - zfp=1.0.0=h63175ca_3 @@ -78,18 +78,18 @@ dependencies: - libzip=1.10.1=h1d365fa_0 - m2w64-gcc-libs=5.3.0=7 - pcre2=10.40=h17e33f8_0 - - python=3.9.17=h4de0772_0_cpython - - sqlite=3.42.0=hcfcfb64_0 + - python=3.9.18=h4de0772_0_cpython + - sqlite=3.43.0=hcfcfb64_0 - zeromq=4.3.4=h0e60522_1 - zlib=1.2.13=hcfcfb64_5 - - zstd=1.5.2=h12be248_7 + - zstd=1.5.5=h12be248_0 - asciitree=0.3.3=py_2 - attrs=23.1.0=pyh71513ae_1 - backcall=0.2.0=pyh9f0ad1d_0 - backports=1.0=pyhd8ed1ab_3 - blinker=1.6.2=pyhd8ed1ab_0 - blosc=1.21.4=hdccc3a2_0 - - boost-cpp=1.78.0=h9f4b32c_3 + - boost-cpp=1.78.0=h9f4b32c_4 - brotli-bin=1.0.9=hcfcfb64_9 - brotli-python=1.0.9=py39h99910a6_9 - c-blosc2=2.10.2=h183a6f4_0 @@ -116,7 +116,7 @@ dependencies: - libglib=2.76.4=he8f3873_0 - libhwloc=2.9.0=h51c2c0f_0 - libpq=15.3=ha9684e8_0 - - libtiff=4.5.1=h6c8260b_0 + - libtiff=4.5.1=h6c8260b_1 - libxslt=1.1.37=h0192164_0 - llvmlite=0.40.1=py39hd28a505_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -147,7 +147,7 @@ dependencies: - pywinpty=2.0.11=py39h99910a6_0 - pyyaml=6.0.1=py39ha55989b_0 - pyzmq=24.0.1=py39hea35a22_1 - - rpds-py=0.9.2=py39hf21820d_0 + - rpds-py=0.10.0=py39hf21820d_0 - setuptools=68.1.2=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 - sniffio=1.3.0=pyhd8ed1ab_0 @@ -171,7 +171,7 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_0 - zipp=3.16.2=pyhd8ed1ab_0 - ansi2html=1.8.0=py39hcbf5309_1 - - anyio=3.7.1=pyhd8ed1ab_0 + - anyio=4.0.0=pyhd8ed1ab_0 - asttokens=2.2.1=pyhd8ed1ab_0 - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 @@ -244,7 +244,7 @@ dependencies: - poppler=23.05.0=h45d20d0_1 - prompt-toolkit=3.0.39=pyha770c72_0 - requests=2.31.0=pyhd8ed1ab_0 - - dash=2.12.1=pyhd8ed1ab_0 + - dash=2.13.0=pyhd8ed1ab_0 - gst-plugins-base=1.22.5=h001b923_0 - jupyter_client=7.3.4=pyhd8ed1ab_0 - libcblas=3.9.0=17_win64_mkl @@ -254,7 +254,7 @@ dependencies: - pooch=1.7.0=pyha770c72_3 - prompt_toolkit=3.0.39=hd8ed1ab_0 - dash-daq=0.5.0=pyh9f0ad1d_1 - - ipython=8.14.0=pyh08f2357_0 + - ipython=8.15.0=pyh5737063_0 - nbclient=0.8.0=pyhd8ed1ab_0 - numpy=1.23.5=py39hbccbffa_0 - qt-main=5.15.8=h2c8576c_14 @@ -264,7 +264,7 @@ dependencies: - imagecodecs=2023.8.12=py39had998c7_0 - imageio=2.31.1=pyh24c5eb1_0 - ipykernel=6.25.1=pyh6817e22_0 - - nbconvert-core=7.7.4=pyhd8ed1ab_0 + - nbconvert-core=7.8.0=pyhd8ed1ab_0 - numba=0.57.1=py39hadaa1c4_0 - numcodecs=0.11.0=py39h99910a6_1 - pandas=1.5.3=py39h2ba5b7c_1 @@ -280,14 +280,14 @@ dependencies: - fiona=1.9.3=py39h7b53f02_0 - jupyter_server=1.23.6=pyhd8ed1ab_0 - matplotlib-base=3.7.2=py39ha3e071c_0 - - nbconvert-pandoc=7.7.4=pyhd8ed1ab_0 + - nbconvert-pandoc=7.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py39h9be9993_4 - pyqtwebengine=5.15.9=py39h2f4a3f1_4 - scikit-learn=1.2.2=py39hfa9d973_2 - - tifffile=2023.8.12=pyhd8ed1ab_1 + - tifffile=2023.8.30=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - geoana=0.4.0=py39h1f6ef14_1 - - nbconvert=7.7.4=pyhd8ed1ab_0 + - nbconvert=7.8.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 - scikit-image=0.19.3=py39h2ba5b7c_2 @@ -297,9 +297,10 @@ dependencies: - ipywidgets=7.8.0=pyhd8ed1ab_0 - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: + - semver === 3.0.1 - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip - properties === 0.6.1 - - mira-omf === 3.0.0 + - mira-omf === 3.0.1 - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip - simpeg-archive === 0.11.0.dev6 diff --git a/geoapps/driver_base/driver.py b/geoapps/driver_base/driver.py index 015a77e13..40ca693a3 100644 --- a/geoapps/driver_base/driver.py +++ b/geoapps/driver_base/driver.py @@ -16,6 +16,7 @@ from geoh5py.ui_json import InputFile, monitored_directory_copy from param_sweeps.driver import SweepParams from param_sweeps.generate import generate +from semver import compare from geoapps import __version__ from geoapps.driver_base.params import BaseParams @@ -101,9 +102,9 @@ def start(cls, filepath: str | Path, driver_class=None): ) version = ifile.data.get("version", None) - if version is not None and version != __version__: + if version is not None and compare(version, __version__) == 1: warn( - f"Input file version '{version}' does not match the " + f"Input file version '{version}' is ahead of the " f"installed 'geoapps v{__version__}'. " "Proceed with caution." ) diff --git a/pyproject.toml b/pyproject.toml index 08f9bd888..66034f79f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,13 +41,13 @@ python = "^3.9, < 3.11" ## dependencies for a minimal environment numpy = "~1.23.5" # also geoh5py, simpeg and geoana - #geoh5py = {version = "~0.8.0a3", source = "pypi", allow-prereleases = true} geoh5py = {url = "https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/release/0.8.0-alpha.4.zip#sha256="} mira-omf = {version = "~3.0.0", source = "pypi", allow-prereleases = true} #mira-omf = {url = "https://github.com/MiraGeoscience/omf/archive/refs/heads/develop.zip#sha256="} #param-sweeps = {version = "~0.1.6a1", source = "pypi", allow-prereleases = true} param-sweeps = {url = "https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip#sha256="} +semver = {version="~3.0.0", source = "pypi"} ## dependencies for core algorithms dask = {version = "2022.10.0", extras = ["distributed"], optional = true} @@ -62,7 +62,6 @@ tqdm = {version = "^4.64.0", optional = true } libhwloc = {version = "2.9.0"} simpeg_archive = {version = "~0.11.0.dev6", source = "pypi", optional = true} #simpeg_archive = {url = "https://github.com/MiraGeoscience/simpeg/archive/refs/heads/feature/simpeg_archive.zip#sha256="} - #mira-simpeg = {version = "~0.15.1.dev9", source = "pypi", optional = true} mira-simpeg = {url = "https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev2+geoapps.0.11.0.zip#sha256=", optional = true} diff --git a/tests/version_test.py b/tests/version_test.py index 364804867..e24d33bb0 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -34,10 +34,8 @@ def test_version_is_semver(): def test_input_file_version(tmp_path): oct_init["geoh5"] = str(assets_path() / "FlinFlon.geoh5") params = OctreeParams(**oct_init) - params.version = "0.0.0" + params.version = "10.0.0" params.write_input_file("test.ui.json", tmp_path) - with pytest.warns( - UserWarning, match="Input file version '0.0.0' does not match the." - ): + with pytest.warns(UserWarning, match="Input file version '10.0.0' is ahead"): OctreeDriver.start(tmp_path / "test.ui.json") From c1adb28ae4b9f7168ae94ea43127a2cc4748e181 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 5 Sep 2023 09:45:34 -0700 Subject: [PATCH 5/7] Augment testing on versions --- tests/version_test.py | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/tests/version_test.py b/tests/version_test.py index e24d33bb0..5b802834a 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -6,9 +6,8 @@ from __future__ import annotations -import re - import pytest +from semver import Version import geoapps from geoapps import assets_path @@ -18,24 +17,38 @@ def test_version_is_consistent(pyproject: dict[str]): - assert geoapps.__version__ == pyproject["tool"]["poetry"]["version"] + assert Version.parse(geoapps.__version__) == Version.parse( + pyproject["tool"]["poetry"]["version"] + ) def test_version_is_semver(): - semver_re = ( - r"^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)" - r"(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)" - r"(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?" - r"(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$" - ) - assert re.search(semver_re, geoapps.__version__) is not None + assert Version.is_valid(geoapps.__version__) def test_input_file_version(tmp_path): oct_init["geoh5"] = str(assets_path() / "FlinFlon.geoh5") + oct_init["Refinement A levels"] = "0, 0" + oct_init["Refinement B levels"] = "0, 0" + oct_init["Refinement B type"] = "radial" + params = OctreeParams(**oct_init) - params.version = "10.0.0" + app_version = Version.parse(geoapps.__version__) + + version_in_file = app_version.replace(minor=app_version.minor + 1) + params.version = str(version_in_file) params.write_input_file("test.ui.json", tmp_path) - with pytest.warns(UserWarning, match="Input file version '10.0.0' is ahead"): + with pytest.warns( + UserWarning, match=f"Input file version '{version_in_file}' is ahead" + ): OctreeDriver.start(tmp_path / "test.ui.json") + + if app_version.minor > 0: + version_in_file = app_version.replace(minor=app_version.minor - 1) + else: + version_in_file = app_version.replace(major=app_version.major - 1) + + params.version = str(version_in_file) + params.write_input_file("test.ui.json", tmp_path) + OctreeDriver.start(tmp_path / "test.ui.json") From 7a246094903f4c4c7e9d23312132ebd519efec23 Mon Sep 17 00:00:00 2001 From: domfournier Date: Tue, 5 Sep 2023 13:05:27 -0700 Subject: [PATCH 6/7] Update tests/version_test.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sébastien Hensgen --- tests/version_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/version_test.py b/tests/version_test.py index 5b802834a..e9c4a7f05 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -51,4 +51,6 @@ def test_input_file_version(tmp_path): params.version = str(version_in_file) params.write_input_file("test.ui.json", tmp_path) - OctreeDriver.start(tmp_path / "test.ui.json") + with warnings.catch_warnings(): + warnings.simplefilter("error") + OctreeDriver.start(tmp_path / "test.ui.json") From 2ec94c6da494ba7b1579392ce046cf4cefa48d2b Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 5 Sep 2023 13:44:17 -0700 Subject: [PATCH 7/7] Use base class to test version. --- geoapps/driver_base/driver.py | 6 +++--- tests/version_test.py | 32 ++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/geoapps/driver_base/driver.py b/geoapps/driver_base/driver.py index 40ca693a3..17631d9e4 100644 --- a/geoapps/driver_base/driver.py +++ b/geoapps/driver_base/driver.py @@ -16,7 +16,7 @@ from geoh5py.ui_json import InputFile, monitored_directory_copy from param_sweeps.driver import SweepParams from param_sweeps.generate import generate -from semver import compare +from semver import Version from geoapps import __version__ from geoapps.driver_base.params import BaseParams @@ -101,8 +101,8 @@ def start(cls, filepath: str | Path, driver_class=None): validations=driver_class._validations, # pylint: disable=protected-access ) - version = ifile.data.get("version", None) - if version is not None and compare(version, __version__) == 1: + version = Version.parse(ifile.data.get("version", None)) + if version is not None and version.compare(__version__) == 1: warn( f"Input file version '{version}' is ahead of the " f"installed 'geoapps v{__version__}'. " diff --git a/tests/version_test.py b/tests/version_test.py index e9c4a7f05..c6398a3f4 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -6,14 +6,17 @@ from __future__ import annotations +import warnings + import pytest +from geoh5py.ui_json.constants import default_ui_json +from geoh5py.ui_json.input_file import InputFile from semver import Version import geoapps from geoapps import assets_path -from geoapps.octree_creation.constants import app_initializer as oct_init -from geoapps.octree_creation.driver import OctreeDriver -from geoapps.octree_creation.params import OctreeParams +from geoapps.driver_base.driver import BaseDriver +from geoapps.driver_base.params import BaseParams def test_version_is_consistent(pyproject: dict[str]): @@ -27,22 +30,27 @@ def test_version_is_semver(): def test_input_file_version(tmp_path): - oct_init["geoh5"] = str(assets_path() / "FlinFlon.geoh5") - oct_init["Refinement A levels"] = "0, 0" - oct_init["Refinement B levels"] = "0, 0" - oct_init["Refinement B type"] = "radial" - - params = OctreeParams(**oct_init) + ui_json = default_ui_json.copy() + ui_json["version"] = "0.0.1" + params = BaseParams( + geoh5=str(assets_path() / "FlinFlon.geoh5"), + input_file=InputFile(ui_json=ui_json), + ) app_version = Version.parse(geoapps.__version__) - version_in_file = app_version.replace(minor=app_version.minor + 1) params.version = str(version_in_file) params.write_input_file("test.ui.json", tmp_path) + class TestDriver(BaseDriver): + _validations = None + + def run(self): + pass + with pytest.warns( UserWarning, match=f"Input file version '{version_in_file}' is ahead" ): - OctreeDriver.start(tmp_path / "test.ui.json") + TestDriver.start(tmp_path / "test.ui.json") if app_version.minor > 0: version_in_file = app_version.replace(minor=app_version.minor - 1) @@ -53,4 +61,4 @@ def test_input_file_version(tmp_path): params.write_input_file("test.ui.json", tmp_path) with warnings.catch_warnings(): warnings.simplefilter("error") - OctreeDriver.start(tmp_path / "test.ui.json") + TestDriver.start(tmp_path / "test.ui.json")