Merge branch 'develop' into GEOPY-2088

benk-mira · benk-mira · commit a2f301b6c228 · 2025-05-09T09:05:49.000-07:00
# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	environments/py-3.11-linux-64-dev.conda.lock.yml
#	environments/py-3.11-linux-64.conda.lock.yml
#	environments/py-3.11-win-64-dev.conda.lock.yml
#	environments/py-3.11-win-64.conda.lock.yml
#	environments/py-3.12-linux-64-dev.conda.lock.yml
#	environments/py-3.12-linux-64.conda.lock.yml
#	environments/py-3.12-win-64-dev.conda.lock.yml
#	environments/py-3.12-win-64.conda.lock.yml
#	py-3.10.conda-lock.yml
#	py-3.11.conda-lock.yml
#	py-3.12.conda-lock.yml
diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml
@@ -16,8 +16,9 @@ jobs:
     with:
       package-name: 'surface-apps'
       python-version: '3.10'
-      source-repo-names: '["public-conda-dev-local", "conda-forge-dev-remote"]'
-      publish-repo-names: '["public-conda-dev"]'
+      source-repo-names: '["public-noremote-conda-dev"]'
+      conda-channels: '["conda-forge"]'
+      publish-repo-names: '["public-noremote-conda-dev"]'
     secrets:
       JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
       JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
diff --git a/.github/workflows/python_deploy_prod.yml b/.github/workflows/python_deploy_prod.yml
@@ -11,10 +11,12 @@ on:
       publish-conda:
         description: 'Publish Conda package'
         required: false
+        type: boolean
         default: true
       publish-pypi:
         description: 'Publish PyPI package'
         required: false
+        type: boolean
         default: true
 
 concurrency:
@@ -24,10 +26,10 @@ concurrency:
 jobs:
   call-workflow-conda-release:
     name: Publish production Conda package on JFrog Artifactory
-    uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
     if: ${{ github.event_name == 'release' || github.event.inputs.publish-conda == 'true' }}
+    uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
     with:
-      virtual-repo-names: '["public-conda-prod"]'
+      virtual-repo-names: '["public-noremote-conda-prod"]'
       release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
     secrets:
       JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
     -   id: pycln
         args: [--config=pyproject.toml]
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.9
+    rev: v0.11.4
     hooks:
     -   id: ruff
         args:
@@ -75,7 +75,6 @@ repos:
         exclude_types: [jupyter]
     -   id: check-toml
     -   id: check-yaml
-        exclude: ^recipe.yaml$
     -   id: check-added-large-files
     -   id: check-case-conflict
     -   id: check-merge-conflict
diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 2e6f011c214d86a119c3127fdfc4b39182c206f4fbae6ee5b94eb494558e6608
+# input_hash: dcbb0c7f313b8369213b9d9d9720fc719401d2f96b70477ea4114a9b7b429298
 
 channels:
   - conda-forge
@@ -108,7 +108,7 @@ dependencies:
   - packaging=25.0=pyh29332c3_1
   - pillow=10.3.0=py310hebfe307_1
   - pip=25.1.1=pyh8b19718_0
-  - platformdirs=4.3.7=pyh29332c3_0
+  - platformdirs=4.3.8=pyhe01879c_0
   - pluggy=1.5.0=pyhd8ed1ab_1
   - pthread-stubs=0.4=hb9d3cd8_1002
   - pycparser=2.22=pyh29332c3_1
@@ -149,7 +149,7 @@ dependencies:
   - toml=0.10.2=pyhd8ed1ab_1
   - tomli=2.2.1=pyhd8ed1ab_1
   - tomlkit=0.13.2=pyha770c72_1
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 2e6f011c214d86a119c3127fdfc4b39182c206f4fbae6ee5b94eb494558e6608
+# input_hash: dcbb0c7f313b8369213b9d9d9720fc719401d2f96b70477ea4114a9b7b429298
 
 channels:
   - conda-forge
@@ -102,7 +102,7 @@ dependencies:
   - svt-av1=3.0.2=h5888daf_0
   - tifffile=2025.3.30=pyhd8ed1ab_0
   - tk=8.6.13=noxft_h4845f30_101
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: 89cdee0ee44b39f1bae8b7ab4f8b27e6e5c2a265100e6d21e28dbc8529cd3a65
+# input_hash: f7e1eac069ab3cb53279eb22185d3c4368a45cfaab161719b1866d95126b55b8
 
 channels:
   - conda-forge
@@ -65,8 +65,8 @@ dependencies:
   - libffi=3.4.6=h537db12_1
   - libfreetype=2.13.3=h57928b3_1
   - libfreetype6=2.13.3=h0b5ce68_1
-  - libgcc=14.2.0=h1383e82_2
-  - libgomp=14.2.0=h1383e82_2
+  - libgcc=15.1.0=h1383e82_2
+  - libgomp=15.1.0=h1383e82_2
   - libhwloc=2.11.2=default_ha69328c_1001
   - libhwy=1.2.0=h1d1702c_0
   - libiconv=1.18=h135ad9c_1
@@ -95,7 +95,7 @@ dependencies:
   - packaging=25.0=pyh29332c3_1
   - pillow=10.3.0=py310h3e38d90_1
   - pip=25.1.1=pyh8b19718_0
-  - platformdirs=4.3.7=pyh29332c3_0
+  - platformdirs=4.3.8=pyhe01879c_0
   - pluggy=1.5.0=pyhd8ed1ab_1
   - pthread-stubs=0.4=h0e40799_1002
   - pycparser=2.22=pyh29332c3_1
@@ -136,7 +136,7 @@ dependencies:
   - toml=0.10.2=pyhd8ed1ab_1
   - tomli=2.2.1=pyhd8ed1ab_1
   - tomlkit=0.13.2=pyha770c72_1
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: 89cdee0ee44b39f1bae8b7ab4f8b27e6e5c2a265100e6d21e28dbc8529cd3a65
+# input_hash: f7e1eac069ab3cb53279eb22185d3c4368a45cfaab161719b1866d95126b55b8
 
 channels:
   - conda-forge
@@ -46,8 +46,8 @@ dependencies:
   - libffi=3.4.6=h537db12_1
   - libfreetype=2.13.3=h57928b3_1
   - libfreetype6=2.13.3=h0b5ce68_1
-  - libgcc=14.2.0=h1383e82_2
-  - libgomp=14.2.0=h1383e82_2
+  - libgcc=15.1.0=h1383e82_2
+  - libgomp=15.1.0=h1383e82_2
   - libhwloc=2.11.2=default_ha69328c_1001
   - libhwy=1.2.0=h1d1702c_0
   - libiconv=1.18=h135ad9c_1
@@ -89,7 +89,7 @@ dependencies:
   - tbb=2021.13.0=h62715c5_1
   - tifffile=2025.3.30=pyhd8ed1ab_0
   - tk=8.6.13=h5226925_1
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: f547cd0cf9e1379c7453cb1a94a17ecb1b06018cd4c20d06dac05f511c5d355c
+# input_hash: 1d3a35d442204a275005a0104cc4376302f4c033494706038c062fb61ed379b6
 
 channels:
   - conda-forge
@@ -108,7 +108,7 @@ dependencies:
   - packaging=25.0=pyh29332c3_1
   - pillow=10.3.0=py311h82a398c_1
   - pip=25.1.1=pyh8b19718_0
-  - platformdirs=4.3.7=pyh29332c3_0
+  - platformdirs=4.3.8=pyhe01879c_0
   - pluggy=1.5.0=pyhd8ed1ab_1
   - pthread-stubs=0.4=hb9d3cd8_1002
   - pycparser=2.22=pyh29332c3_1
@@ -150,7 +150,7 @@ dependencies:
   - toml=0.10.2=pyhd8ed1ab_1
   - tomli=2.2.1=pyhd8ed1ab_1
   - tomlkit=0.13.2=pyha770c72_1
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: f547cd0cf9e1379c7453cb1a94a17ecb1b06018cd4c20d06dac05f511c5d355c
+# input_hash: 1d3a35d442204a275005a0104cc4376302f4c033494706038c062fb61ed379b6
 
 channels:
   - conda-forge
@@ -102,7 +102,7 @@ dependencies:
   - svt-av1=3.0.2=h5888daf_0
   - tifffile=2025.3.30=pyhd8ed1ab_0
   - tk=8.6.13=noxft_h4845f30_101
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: b7c6028b9dd3b4cd39a4fe84b9e6d2dc7dd5453d658df321c9237f75f144f475
+# input_hash: 875f127341f91eceaa6af85b1fedba59cf90f6915c0d882d52290caf958fabe9
 
 channels:
   - conda-forge
@@ -65,8 +65,8 @@ dependencies:
   - libffi=3.4.6=h537db12_1
   - libfreetype=2.13.3=h57928b3_1
   - libfreetype6=2.13.3=h0b5ce68_1
-  - libgcc=14.2.0=h1383e82_2
-  - libgomp=14.2.0=h1383e82_2
+  - libgcc=15.1.0=h1383e82_2
+  - libgomp=15.1.0=h1383e82_2
   - libhwloc=2.11.2=default_ha69328c_1001
   - libhwy=1.2.0=h1d1702c_0
   - libiconv=1.18=h135ad9c_1
@@ -95,7 +95,7 @@ dependencies:
   - packaging=25.0=pyh29332c3_1
   - pillow=10.3.0=py311h5592be9_1
   - pip=25.1.1=pyh8b19718_0
-  - platformdirs=4.3.7=pyh29332c3_0
+  - platformdirs=4.3.8=pyhe01879c_0
   - pluggy=1.5.0=pyhd8ed1ab_1
   - pthread-stubs=0.4=h0e40799_1002
   - pycparser=2.22=pyh29332c3_1
@@ -137,7 +137,7 @@ dependencies:
   - toml=0.10.2=pyhd8ed1ab_1
   - tomli=2.2.1=pyhd8ed1ab_1
   - tomlkit=0.13.2=pyha770c72_1
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: b7c6028b9dd3b4cd39a4fe84b9e6d2dc7dd5453d658df321c9237f75f144f475
+# input_hash: 875f127341f91eceaa6af85b1fedba59cf90f6915c0d882d52290caf958fabe9
 
 channels:
   - conda-forge
@@ -46,8 +46,8 @@ dependencies:
   - libffi=3.4.6=h537db12_1
   - libfreetype=2.13.3=h57928b3_1
   - libfreetype6=2.13.3=h0b5ce68_1
-  - libgcc=14.2.0=h1383e82_2
-  - libgomp=14.2.0=h1383e82_2
+  - libgcc=15.1.0=h1383e82_2
+  - libgomp=15.1.0=h1383e82_2
   - libhwloc=2.11.2=default_ha69328c_1001
   - libhwy=1.2.0=h1d1702c_0
   - libiconv=1.18=h135ad9c_1
@@ -89,7 +89,7 @@ dependencies:
   - tbb=2021.13.0=h62715c5_1
   - tifffile=2025.3.30=pyhd8ed1ab_0
   - tk=8.6.13=h5226925_1
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 3ba636c4c0f8ddfca853a1803ec71cff978121d9499f8a031295f963b547f024
+# input_hash: 38e7e16dc230d48d7eee6bebdb0294e2541027e7e0bac2f4d524a612752dcd5f
 
 channels:
   - conda-forge
@@ -108,7 +108,7 @@ dependencies:
   - packaging=25.0=pyh29332c3_1
   - pillow=10.3.0=py312h287a98d_1
   - pip=25.1.1=pyh8b19718_0
-  - platformdirs=4.3.7=pyh29332c3_0
+  - platformdirs=4.3.8=pyhe01879c_0
   - pluggy=1.5.0=pyhd8ed1ab_1
   - pthread-stubs=0.4=hb9d3cd8_1002
   - pycparser=2.22=pyh29332c3_1
@@ -150,7 +150,7 @@ dependencies:
   - toml=0.10.2=pyhd8ed1ab_1
   - tomli=2.2.1=pyhd8ed1ab_1
   - tomlkit=0.13.2=pyha770c72_1
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 3ba636c4c0f8ddfca853a1803ec71cff978121d9499f8a031295f963b547f024
+# input_hash: 38e7e16dc230d48d7eee6bebdb0294e2541027e7e0bac2f4d524a612752dcd5f
 
 channels:
   - conda-forge
@@ -102,7 +102,7 @@ dependencies:
   - svt-av1=3.0.2=h5888daf_0
   - tifffile=2025.3.30=pyhd8ed1ab_0
   - tk=8.6.13=noxft_h4845f30_101
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: 530e1e39cd209faefd91f2441f1c9db9e4a7b66255a123ba2a39fe926b47b2b4
+# input_hash: f9e85d3832814b9b74550e51d5c173568bdc207c1479e906b6788201cdb3de9a
 
 channels:
   - conda-forge
@@ -65,8 +65,8 @@ dependencies:
   - libffi=3.4.6=h537db12_1
   - libfreetype=2.13.3=h57928b3_1
   - libfreetype6=2.13.3=h0b5ce68_1
-  - libgcc=14.2.0=h1383e82_2
-  - libgomp=14.2.0=h1383e82_2
+  - libgcc=15.1.0=h1383e82_2
+  - libgomp=15.1.0=h1383e82_2
   - libhwloc=2.11.2=default_ha69328c_1001
   - libhwy=1.2.0=h1d1702c_0
   - libiconv=1.18=h135ad9c_1
@@ -95,7 +95,7 @@ dependencies:
   - packaging=25.0=pyh29332c3_1
   - pillow=10.3.0=py312h381445a_1
   - pip=25.1.1=pyh8b19718_0
-  - platformdirs=4.3.7=pyh29332c3_0
+  - platformdirs=4.3.8=pyhe01879c_0
   - pluggy=1.5.0=pyhd8ed1ab_1
   - pthread-stubs=0.4=h0e40799_1002
   - pycparser=2.22=pyh29332c3_1
@@ -137,7 +137,7 @@ dependencies:
   - toml=0.10.2=pyhd8ed1ab_1
   - tomli=2.2.1=pyhd8ed1ab_1
   - tomlkit=0.13.2=pyha770c72_1
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: 530e1e39cd209faefd91f2441f1c9db9e4a7b66255a123ba2a39fe926b47b2b4
+# input_hash: f9e85d3832814b9b74550e51d5c173568bdc207c1479e906b6788201cdb3de9a
 
 channels:
   - conda-forge
@@ -46,8 +46,8 @@ dependencies:
   - libffi=3.4.6=h537db12_1
   - libfreetype=2.13.3=h57928b3_1
   - libfreetype6=2.13.3=h0b5ce68_1
-  - libgcc=14.2.0=h1383e82_2
-  - libgomp=14.2.0=h1383e82_2
+  - libgcc=15.1.0=h1383e82_2
+  - libgomp=15.1.0=h1383e82_2
   - libhwloc=2.11.2=default_ha69328c_1001
   - libhwy=1.2.0=h1d1702c_0
   - libiconv=1.18=h135ad9c_1
@@ -89,7 +89,7 @@ dependencies:
   - tbb=2021.13.0=h62715c5_1
   - tifffile=2025.3.30=pyhd8ed1ab_0
   - tk=8.6.13=h5226925_1
-  - tqdm=4.66.6=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - typing-extensions=4.13.2=h0e9735f_0
   - typing-inspection=0.4.0=pyhd8ed1ab_0
   - typing_extensions=4.13.2=pyh29332c3_0
diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml
diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml
diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml
diff --git a/pylintrc b/pylintrc
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/recipe.yaml b/recipe.yaml
