Skip to content

Commit

Permalink
relock on git depedencies @ develop
Browse files Browse the repository at this point in the history
  • Loading branch information
sebhmg committed Nov 20, 2024
1 parent d52fc2a commit 2cda599
Show file tree
Hide file tree
Showing 17 changed files with 126 additions and 90 deletions.
6 changes: 3 additions & 3 deletions environments/py-3.10-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: e10144aea8362d4db6a154e787cc4a94daa3110d3ed44e3ed10f02a9595ebb30
# input_hash: 2e6f011c214d86a119c3127fdfc4b39182c206f4fbae6ee5b94eb494558e6608

channels:
- conda-forge
Expand Down Expand Up @@ -162,8 +162,8 @@ dependencies:
- zstandard=0.23.0=py310ha39cb0e_1
- zstd=1.5.6=ha6fb4c9_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.10-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: e10144aea8362d4db6a154e787cc4a94daa3110d3ed44e3ed10f02a9595ebb30
# input_hash: 2e6f011c214d86a119c3127fdfc4b39182c206f4fbae6ee5b94eb494558e6608

channels:
- conda-forge
Expand Down Expand Up @@ -112,8 +112,8 @@ dependencies:
- zlib-ng=2.2.2=h5888daf_0
- zstd=1.5.6=ha6fb4c9_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.10-win-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 6736a2663081dbe9c67cc315785ca0de4fc579324d85d4f3700ab376ecadbaf5
# input_hash: 89cdee0ee44b39f1bae8b7ab4f8b27e6e5c2a265100e6d21e28dbc8529cd3a65

channels:
- conda-forge
Expand Down Expand Up @@ -150,8 +150,8 @@ dependencies:
- zstandard=0.23.0=py310he5e10e1_1
- zstd=1.5.6=h0ea2cb4_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.10-win-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 6736a2663081dbe9c67cc315785ca0de4fc579324d85d4f3700ab376ecadbaf5
# input_hash: 89cdee0ee44b39f1bae8b7ab4f8b27e6e5c2a265100e6d21e28dbc8529cd3a65

channels:
- conda-forge
Expand Down Expand Up @@ -99,8 +99,8 @@ dependencies:
- zlib-ng=2.2.2=he0c23c2_0
- zstd=1.5.6=h0ea2cb4_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.11-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: d8bb5498fdeb0c97ed408464498a2777ffd5b535c04b1ef260e8a193e80ade50
# input_hash: f547cd0cf9e1379c7453cb1a94a17ecb1b06018cd4c20d06dac05f511c5d355c

channels:
- conda-forge
Expand Down Expand Up @@ -163,8 +163,8 @@ dependencies:
- zstandard=0.23.0=py311hbc35293_1
- zstd=1.5.6=ha6fb4c9_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.11-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: d8bb5498fdeb0c97ed408464498a2777ffd5b535c04b1ef260e8a193e80ade50
# input_hash: f547cd0cf9e1379c7453cb1a94a17ecb1b06018cd4c20d06dac05f511c5d355c

channels:
- conda-forge
Expand Down Expand Up @@ -113,8 +113,8 @@ dependencies:
- zlib-ng=2.2.2=h5888daf_0
- zstd=1.5.6=ha6fb4c9_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.11-win-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 072ad9cd2d6314141a65e50e5e2df8f061ababc746686d58cb019dccd4a63dea
# input_hash: b7c6028b9dd3b4cd39a4fe84b9e6d2dc7dd5453d658df321c9237f75f144f475

channels:
- conda-forge
Expand Down Expand Up @@ -151,8 +151,8 @@ dependencies:
- zstandard=0.23.0=py311h53056dc_1
- zstd=1.5.6=h0ea2cb4_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.11-win-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 072ad9cd2d6314141a65e50e5e2df8f061ababc746686d58cb019dccd4a63dea
# input_hash: b7c6028b9dd3b4cd39a4fe84b9e6d2dc7dd5453d658df321c9237f75f144f475

channels:
- conda-forge
Expand Down Expand Up @@ -100,8 +100,8 @@ dependencies:
- zlib-ng=2.2.2=he0c23c2_0
- zstd=1.5.6=h0ea2cb4_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.12-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: a9ee0a7738e10ab3074b51b17bace2170cb9c6481ccbff91f5aa5b35855a8f3d
# input_hash: 3ba636c4c0f8ddfca853a1803ec71cff978121d9499f8a031295f963b547f024

channels:
- conda-forge
Expand Down Expand Up @@ -163,8 +163,8 @@ dependencies:
- zstandard=0.23.0=py312hef9b889_1
- zstd=1.5.6=ha6fb4c9_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.12-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: a9ee0a7738e10ab3074b51b17bace2170cb9c6481ccbff91f5aa5b35855a8f3d
# input_hash: 3ba636c4c0f8ddfca853a1803ec71cff978121d9499f8a031295f963b547f024

channels:
- conda-forge
Expand Down Expand Up @@ -113,8 +113,8 @@ dependencies:
- zlib-ng=2.2.2=h5888daf_0
- zstd=1.5.6=ha6fb4c9_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.12-win-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 3f70a6792660fd1b6bc4cb72bf96652850002fab8b9e8f890c1a08721825d596
# input_hash: 530e1e39cd209faefd91f2441f1c9db9e4a7b66255a123ba2a39fe926b47b2b4

channels:
- conda-forge
Expand Down Expand Up @@ -151,8 +151,8 @@ dependencies:
- zstandard=0.23.0=py312h7606c53_1
- zstd=1.5.6=h0ea2cb4_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
6 changes: 3 additions & 3 deletions environments/py-3.12-win-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 3f70a6792660fd1b6bc4cb72bf96652850002fab8b9e8f890c1a08721825d596
# input_hash: 530e1e39cd209faefd91f2441f1c9db9e4a7b66255a123ba2a39fe926b47b2b4

channels:
- conda-forge
Expand Down Expand Up @@ -100,8 +100,8 @@ dependencies:
- zlib-ng=2.2.2=he0c23c2_0
- zstd=1.5.6=h0ea2cb4_0
- pip:
- geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
- geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d

variables:
KMP_WARNINGS: 0
4 changes: 2 additions & 2 deletions meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ requirements:
- numpy >=1.26.0,<1.27.0
- scipy >=1.14.0,<1.15.0
- pydantic >=2.5.2,<2.6.0
- geoh5py >=0.10.0b1.dev,<0.11.0a.dev
- geoapps-utils >=0.4.0b1.dev,<0.5.0a.dev
- geoh5py >=0.11.0a1.dev,<0.12.0a.dev
- geoapps-utils >=0.5.0a1.dev,<0.6.0a.dev
- pillow >=10.3.0,<10.4.0
- h5py >=3.2.1,<4.0.0
- scikit-image >=0.24.0,<0.25.0
Expand Down
44 changes: 28 additions & 16 deletions py-3.10.conda-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
version: 1
metadata:
content_hash:
win-64: 6736a2663081dbe9c67cc315785ca0de4fc579324d85d4f3700ab376ecadbaf5
linux-64: e10144aea8362d4db6a154e787cc4a94daa3110d3ed44e3ed10f02a9595ebb30
win-64: 89cdee0ee44b39f1bae8b7ab4f8b27e6e5c2a265100e6d21e28dbc8529cd3a65
linux-64: 2e6f011c214d86a119c3127fdfc4b39182c206f4fbae6ee5b94eb494558e6608
channels:
- url: conda-forge
used_env_vars: []
Expand Down Expand Up @@ -4270,58 +4270,70 @@ package:
category: main
optional: false
- name: geoapps-utils
version: 0.4.0b1
version: 0.5.0-alpha.1
manager: pip
platform: linux-64
dependencies:
geoh5py: '>=0.10.0b1,<0.11.0a.dev'
geoh5py: 0.11.0-alpha.1
numpy: '>=1.26.0,<1.27.0'
pydantic: '>=2.5.2,<3.0.0'
scipy: '>=1.14.0,<1.15.0'
url: https://files.pythonhosted.org/packages/cb/d8/316a5682604665d0cb5eba0e6fd813b9ec8ecc3f670d1fadaa28d764ca71/geoapps_utils-0.4.0b1-py3-none-any.whl
url: git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
hash:
sha256: 9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
sha256: 2a9d77a577fadf9c1256b0385e588e499f7f0dcf
source:
type: url
url: git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
category: main
optional: false
- name: geoapps-utils
version: 0.4.0b1
version: 0.5.0-alpha.1
manager: pip
platform: win-64
dependencies:
geoh5py: '>=0.10.0b1,<0.11.0a.dev'
geoh5py: 0.11.0-alpha.1
numpy: '>=1.26.0,<1.27.0'
pydantic: '>=2.5.2,<3.0.0'
scipy: '>=1.14.0,<1.15.0'
url: https://files.pythonhosted.org/packages/cb/d8/316a5682604665d0cb5eba0e6fd813b9ec8ecc3f670d1fadaa28d764ca71/geoapps_utils-0.4.0b1-py3-none-any.whl
url: git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
hash:
sha256: 9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
sha256: 2a9d77a577fadf9c1256b0385e588e499f7f0dcf
source:
type: url
url: git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
category: main
optional: false
- name: geoh5py
version: 0.10.0b2
version: 0.11.0-alpha.1
manager: pip
platform: linux-64
dependencies:
h5py: '>=3.2.1,<4.0.0'
numpy: '>=1.26.0,<1.27.0'
pillow: '>=10.3.0,<10.4.0'
pydantic: '>=2.5.2,<3.0.0'
url: https://files.pythonhosted.org/packages/62/9e/83b55624e54c2ee04dd5fa10c057576eb53e5f49e81d94d1a17d2bbd84ed/geoh5py-0.10.0b2-py3-none-any.whl
url: git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d
hash:
sha256: 7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
sha256: c1e326fc443a0fa1640084053c62dac78cf7472d
source:
type: url
url: git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d
category: main
optional: false
- name: geoh5py
version: 0.10.0b2
version: 0.11.0-alpha.1
manager: pip
platform: win-64
dependencies:
h5py: '>=3.2.1,<4.0.0'
numpy: '>=1.26.0,<1.27.0'
pillow: '>=10.3.0,<10.4.0'
pydantic: '>=2.5.2,<3.0.0'
url: https://files.pythonhosted.org/packages/62/9e/83b55624e54c2ee04dd5fa10c057576eb53e5f49e81d94d1a17d2bbd84ed/geoh5py-0.10.0b2-py3-none-any.whl
url: git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d
hash:
sha256: 7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
sha256: c1e326fc443a0fa1640084053c62dac78cf7472d
source:
type: url
url: git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d
category: main
optional: false
Loading

0 comments on commit 2cda599

Please sign in to comment.