Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
66193bd
Refactor pyproject.toml to align with PEP 508 standards and update de…
saicheranb Jul 11, 2025
fda896c
added poetry lockfile and conda-lock files for multi-Python support
Jul 11, 2025
dee5e3f
added poetry lockfile and conda-lock files for multi-Python support
Jul 11, 2025
29ebad5
Fix exclude field in pyproject.toml to use an empty list for packaging
saicheranb Jul 11, 2025
757d6ab
Refactor pyproject.toml to remove duplicate build-system section and …
saicheranb Jul 11, 2025
e87893a
Update pyproject.toml to require poetry-core version 2.0.0 and clean …
saicheranb Jul 13, 2025
85301a8
Downgrade poetry-core requirement to version 1.8.0 in pyproject.toml
saicheranb Jul 14, 2025
9ad166a
Fix get_pyproject_version function to return the correct version from…
saicheranb Jul 14, 2025
c278493
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 14, 2025
1fa5e1a
Update workflow references to use DEVOPS-690-poetry2 branch for stati…
saicheranb Jul 14, 2025
dc34d99
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 14, 2025
d894df6
Fix version formatting in pyproject.toml from "0.6.0-alpha.1" to "0.6…
saicheranb Jul 14, 2025
f96b437
Merge branch 'Devops-690_poetry2_migration' of https://github.com/Mir…
saicheranb Jul 14, 2025
208ed97
Fix import statement for packaging.version in version_test.py
saicheranb Jul 14, 2025
2798bb0
Refactor version validation tests to improve consistency and clarity
saicheranb Jul 14, 2025
e1151ef
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 14, 2025
a3e79e1
configured lock files using deps-lock
Jul 14, 2025
3ec5663
updated pyproject.toml
saicheranb Jul 14, 2025
6911ae5
configured lock files
Jul 14, 2025
041d407
Fix version format in pyproject.toml to include full alpha designation
saicheranb Jul 14, 2025
218527a
Fix build-system requirements in pyproject.toml to include setuptools
saicheranb Jul 15, 2025
bbb6e23
Update dependencies and metadata in pyproject.toml; adjust content-ha…
saicheranb Jul 15, 2025
58a4ca8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 15, 2025
eed49eb
Comment out dynamic dependencies in pyproject.toml checking if deps l…
saicheranb Jul 15, 2025
d83410d
Update content-hash in poetry.lock and restore dynamic dependencies i…
saicheranb Jul 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
ba
nd
astroid
4 changes: 2 additions & 2 deletions .github/workflows/python_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ concurrency:
jobs:
call-workflow-static-analysis:
name: Static analysis
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-static_analysis.yml@main
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-static_analysis.yml@DEVOPS-690-poetry2
with:
package-manager: 'conda'
app-name: 'geoapps_utils'
python-version: '3.10'
call-workflow-pytest:
name: Pytest
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@DEVOPS-690-poetry2
with:
package-manager: 'conda'
python-versions: '["3.10", "3.11", "3.12"]'
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ ci:
autoupdate_schedule: monthly

repos:
- repo: https://github.com/python-poetry/poetry
rev: 2.1.3
hooks:
- id: poetry-check
args: [--lock]
- repo: https://github.com/hadialqattan/pycln
rev: v2.5.0
hooks:
Expand Down
114 changes: 59 additions & 55 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: b71a3789f89cd0f59eb752d8a16a630f5e5bf5a59582226124bbfcca179012b4
# input_hash: 8f70d81d47096021c15198e0a9db361184aabf56db353452c7852e436c5065f2

channels:
- conda-forge
Expand All @@ -9,54 +9,58 @@ dependencies:
- _libgcc_mutex=0.1=conda_forge
- _openmp_mutex=4.5=2_gnu
- annotated-types=0.7.0=pyhd8ed1ab_1
- astroid=3.3.9=py310hff52083_0
- astroid=3.3.11=py310hff52083_0
- bzip2=1.0.8=h4bc722e_7
- c-ares=1.34.4=hb9d3cd8_0
- ca-certificates=2025.1.31=hbcca054_0
- c-ares=1.34.5=hb9d3cd8_0
- ca-certificates=2025.7.14=hbd8a1cb_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- colorama=0.4.6=pyhd8ed1ab_1
- coverage=7.8.0=py310h89163eb_0
- dill=0.3.9=pyhd8ed1ab_1
- exceptiongroup=1.2.2=pyhd8ed1ab_1
- freetype=2.13.3=h48d6fc4_0
- h5py=3.13.0=nompi_py310h60e0fe6_100
- hdf5=1.14.3=nompi_h2d575fe_109
- coverage=7.9.2=py310h89163eb_0
- dill=0.4.0=pyhd8ed1ab_0
- exceptiongroup=1.3.0=pyhd8ed1ab_0
- freetype=2.13.3=ha770c72_1
- h5py=3.14.0=nompi_py310hea1e86d_100
- hdf5=1.14.6=nompi_h6e4c0c1_102
- icu=75.1=he02047a_0
- iniconfig=2.0.0=pyhd8ed1ab_1
- isort=6.0.1=pyhd8ed1ab_0
- isort=6.0.1=pyhd8ed1ab_1
- jinja2=3.1.6=pyhd8ed1ab_0
- keyutils=1.6.1=h166bdaf_0
- krb5=1.21.3=h659f571_0
- lcms2=2.17=h717163a_0
- ld_impl_linux-64=2.43=h712a8e2_4
- lerc=4.0.0=h27087fc_0
- libaec=1.1.3=h59595ed_0
- libblas=3.9.0=31_h59b9bed_openblas
- libcblas=3.9.0=31_he106b2a_openblas
- libcurl=8.13.0=h332b0f4_0
- libdeflate=1.23=h4ddbbb0_0
- ld_impl_linux-64=2.44=h1423503_1
- lerc=4.0.0=h0aef613_1
- libaec=1.1.4=h3f801dc_0
- libblas=3.9.0=32_h59b9bed_openblas
- libcblas=3.9.0=32_he106b2a_openblas
- libcurl=8.14.1=h332b0f4_0
- libdeflate=1.24=h86f0d12_0
- libedit=3.1.20250104=pl5321h7949ede_0
- libev=4.33=hd590300_2
- libexpat=2.7.0=h5888daf_0
- libffi=3.4.6=h2dba641_1
- libgcc=14.2.0=h767d61c_2
- libgcc-ng=14.2.0=h69a702a_2
- libgfortran=14.2.0=h69a702a_2
- libgfortran5=14.2.0=hf1ad2bd_2
- libgomp=14.2.0=h767d61c_2
- libjpeg-turbo=3.0.0=hd590300_1
- liblapack=3.9.0=31_h7ac8fdf_openblas
- liblzma=5.8.1=hb9d3cd8_0
- libfreetype=2.13.3=ha770c72_1
- libfreetype6=2.13.3=h48d6fc4_1
- libgcc=15.1.0=h767d61c_3
- libgcc-ng=15.1.0=h69a702a_3
- libgfortran=15.1.0=h69a702a_3
- libgfortran5=15.1.0=hcea5267_3
- libgomp=15.1.0=h767d61c_3
- libjpeg-turbo=3.1.0=hb9d3cd8_0
- liblapack=3.9.0=32_h7ac8fdf_openblas
- liblzma=5.8.1=hb9d3cd8_2
- libnghttp2=1.64.0=h161d5f1_0
- libnsl=2.0.1=hd590300_0
- libopenblas=0.3.29=pthreads_h94d23a6_0
- libpng=1.6.47=h943b412_0
- libsqlite=3.49.1=hee588c1_2
- libssh2=1.11.1=hf672d98_0
- libstdcxx=14.2.0=h8f9b012_2
- libstdcxx-ng=14.2.0=h4852527_2
- libtiff=4.7.0=hd9ff511_3
- libnsl=2.0.1=hb9d3cd8_1
- libopenblas=0.3.30=pthreads_h94d23a6_0
- libpng=1.6.50=h943b412_0
- libsqlite=3.50.2=hee844dc_2
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_3
- libstdcxx-ng=15.1.0=h4852527_3
- libtiff=4.7.0=hf01ce69_5
- libuuid=2.38.1=h0b41bf4_0
- libwebp-base=1.5.0=h851e524_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
- libxcrypt=4.4.36=hd590300_1
- libzlib=1.3.1=hb9d3cd8_2
Expand All @@ -65,40 +69,40 @@ dependencies:
- ncurses=6.5=h2d0b736_3
- numpy=1.26.4=py310hb13e2d6_0
- openjpeg=2.5.3=h5fbd93e_0
- openssl=3.4.1=h7b32b05_0
- packaging=24.2=pyhd8ed1ab_2
- openssl=3.5.1=h7b32b05_0
- packaging=25.0=pyh29332c3_1
- pillow=10.3.0=py310hebfe307_1
- pip=25.0.1=pyh8b19718_0
- platformdirs=4.3.7=pyh29332c3_0
- pluggy=1.5.0=pyhd8ed1ab_1
- pip=25.1.1=pyh8b19718_0
- platformdirs=4.3.8=pyhe01879c_0
- pluggy=1.6.0=pyhd8ed1ab_0
- pthread-stubs=0.4=hb9d3cd8_1002
- pydantic=2.11.2=pyh3cfb1c2_0
- pydantic-core=2.33.1=py310hc1293b2_0
- pygments=2.19.1=pyhd8ed1ab_0
- pylint=3.3.6=pyh29332c3_0
- pytest=8.3.5=pyhd8ed1ab_0
- pytest-cov=6.1.1=pyhd8ed1ab_0
- python=3.10.16=habfa6aa_2_cpython
- python_abi=3.10=6_cp310
- pydantic=2.11.7=pyh3cfb1c2_0
- pydantic-core=2.33.2=py310hbcd0ec0_0
- pygments=2.19.2=pyhd8ed1ab_0
- pylint=3.3.7=pyhe01879c_0
- pytest=8.4.1=pyhd8ed1ab_0
- pytest-cov=6.2.1=pyhd8ed1ab_0
- python=3.10.18=hd6af730_0_cpython
- python_abi=3.10=7_cp310
- pyyaml=6.0.2=py310h89163eb_2
- readline=8.2=h8c095d6_2
- scipy=1.14.1=py310hfcf56fc_2
- setuptools=78.1.0=pyhff2d567_0
- tk=8.6.13=noxft_h4845f30_101
- setuptools=80.9.0=pyhff2d567_0
- tk=8.6.13=noxft_hd72426e_102
- toml=0.10.2=pyhd8ed1ab_1
- tomli=2.2.1=pyhd8ed1ab_1
- tomlkit=0.13.2=pyha770c72_1
- typing-extensions=4.13.1=hf5ce1d7_0
- typing-inspection=0.4.0=pyhd8ed1ab_0
- typing_extensions=4.13.1=pyh29332c3_0
- tomlkit=0.13.3=pyha770c72_0
- typing-extensions=4.14.1=h4440ef1_0
- typing-inspection=0.4.1=pyhd8ed1ab_0
- typing_extensions=4.14.1=pyhe01879c_0
- tzdata=2025b=h78e105d_0
- wheel=0.45.1=pyhd8ed1ab_1
- xorg-libxau=1.0.12=hb9d3cd8_0
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
- yaml=0.2.5=h7f98852_2
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@59dbfbebbcd1cf652e80dda2df29e048ea84509b
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a29cd93edd90cc7ad20c227104c58150a69c6c34

variables:
KMP_WARNINGS: 0
88 changes: 46 additions & 42 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: b71a3789f89cd0f59eb752d8a16a630f5e5bf5a59582226124bbfcca179012b4
# input_hash: 8f70d81d47096021c15198e0a9db361184aabf56db353452c7852e436c5065f2

channels:
- conda-forge
Expand All @@ -10,73 +10,77 @@ dependencies:
- _openmp_mutex=4.5=2_gnu
- annotated-types=0.7.0=pyhd8ed1ab_1
- bzip2=1.0.8=h4bc722e_7
- c-ares=1.34.4=hb9d3cd8_0
- ca-certificates=2025.1.31=hbcca054_0
- c-ares=1.34.5=hb9d3cd8_0
- ca-certificates=2025.7.14=hbd8a1cb_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- freetype=2.13.3=h48d6fc4_0
- h5py=3.13.0=nompi_py310h60e0fe6_100
- hdf5=1.14.3=nompi_h2d575fe_109
- freetype=2.13.3=ha770c72_1
- h5py=3.14.0=nompi_py310hea1e86d_100
- hdf5=1.14.6=nompi_h6e4c0c1_102
- icu=75.1=he02047a_0
- keyutils=1.6.1=h166bdaf_0
- krb5=1.21.3=h659f571_0
- lcms2=2.17=h717163a_0
- ld_impl_linux-64=2.43=h712a8e2_4
- lerc=4.0.0=h27087fc_0
- libaec=1.1.3=h59595ed_0
- libblas=3.9.0=31_h59b9bed_openblas
- libcblas=3.9.0=31_he106b2a_openblas
- libcurl=8.13.0=h332b0f4_0
- libdeflate=1.23=h4ddbbb0_0
- ld_impl_linux-64=2.44=h1423503_1
- lerc=4.0.0=h0aef613_1
- libaec=1.1.4=h3f801dc_0
- libblas=3.9.0=32_h59b9bed_openblas
- libcblas=3.9.0=32_he106b2a_openblas
- libcurl=8.14.1=h332b0f4_0
- libdeflate=1.24=h86f0d12_0
- libedit=3.1.20250104=pl5321h7949ede_0
- libev=4.33=hd590300_2
- libexpat=2.7.0=h5888daf_0
- libffi=3.4.6=h2dba641_1
- libgcc=14.2.0=h767d61c_2
- libgcc-ng=14.2.0=h69a702a_2
- libgfortran=14.2.0=h69a702a_2
- libgfortran5=14.2.0=hf1ad2bd_2
- libgomp=14.2.0=h767d61c_2
- libjpeg-turbo=3.0.0=hd590300_1
- liblapack=3.9.0=31_h7ac8fdf_openblas
- liblzma=5.8.1=hb9d3cd8_0
- libfreetype=2.13.3=ha770c72_1
- libfreetype6=2.13.3=h48d6fc4_1
- libgcc=15.1.0=h767d61c_3
- libgcc-ng=15.1.0=h69a702a_3
- libgfortran=15.1.0=h69a702a_3
- libgfortran5=15.1.0=hcea5267_3
- libgomp=15.1.0=h767d61c_3
- libjpeg-turbo=3.1.0=hb9d3cd8_0
- liblapack=3.9.0=32_h7ac8fdf_openblas
- liblzma=5.8.1=hb9d3cd8_2
- libnghttp2=1.64.0=h161d5f1_0
- libnsl=2.0.1=hd590300_0
- libopenblas=0.3.29=pthreads_h94d23a6_0
- libpng=1.6.47=h943b412_0
- libsqlite=3.49.1=hee588c1_2
- libssh2=1.11.1=hf672d98_0
- libstdcxx=14.2.0=h8f9b012_2
- libstdcxx-ng=14.2.0=h4852527_2
- libtiff=4.7.0=hd9ff511_3
- libnsl=2.0.1=hb9d3cd8_1
- libopenblas=0.3.30=pthreads_h94d23a6_0
- libpng=1.6.50=h943b412_0
- libsqlite=3.50.2=hee844dc_2
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_3
- libstdcxx-ng=15.1.0=h4852527_3
- libtiff=4.7.0=hf01ce69_5
- libuuid=2.38.1=h0b41bf4_0
- libwebp-base=1.5.0=h851e524_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
- libxcrypt=4.4.36=hd590300_1
- libzlib=1.3.1=hb9d3cd8_2
- ncurses=6.5=h2d0b736_3
- numpy=1.26.4=py310hb13e2d6_0
- openjpeg=2.5.3=h5fbd93e_0
- openssl=3.4.1=h7b32b05_0
- openssl=3.5.1=h7b32b05_0
- pillow=10.3.0=py310hebfe307_1
- pip=25.0.1=pyh8b19718_0
- pip=25.1.1=pyh8b19718_0
- pthread-stubs=0.4=hb9d3cd8_1002
- pydantic=2.11.2=pyh3cfb1c2_0
- pydantic-core=2.33.1=py310hc1293b2_0
- python=3.10.16=habfa6aa_2_cpython
- python_abi=3.10=6_cp310
- pydantic=2.11.7=pyh3cfb1c2_0
- pydantic-core=2.33.2=py310hbcd0ec0_0
- python=3.10.18=hd6af730_0_cpython
- python_abi=3.10=7_cp310
- readline=8.2=h8c095d6_2
- scipy=1.14.1=py310hfcf56fc_2
- setuptools=78.1.0=pyhff2d567_0
- tk=8.6.13=noxft_h4845f30_101
- typing-extensions=4.13.1=hf5ce1d7_0
- typing-inspection=0.4.0=pyhd8ed1ab_0
- typing_extensions=4.13.1=pyh29332c3_0
- setuptools=80.9.0=pyhff2d567_0
- tk=8.6.13=noxft_hd72426e_102
- typing-extensions=4.14.1=h4440ef1_0
- typing-inspection=0.4.1=pyhd8ed1ab_0
- typing_extensions=4.14.1=pyhe01879c_0
- tzdata=2025b=h78e105d_0
- wheel=0.45.1=pyhd8ed1ab_1
- xorg-libxau=1.0.12=hb9d3cd8_0
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@59dbfbebbcd1cf652e80dda2df29e048ea84509b
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a29cd93edd90cc7ad20c227104c58150a69c6c34

variables:
KMP_WARNINGS: 0
Loading