TNO Intern

Commit efd05706 authored by Hen Brett's avatar Hen Brett 🐔
Browse files

Merge branch... 

Merge branch '31-ensure-that-the-jvm-implementation-works-on-linux-as-well-as-windows-machines' into 'main'

Resolve "Ensure that the JVM implementation works on linux as well as windows machines"

Closes #31

See merge request AGS/pythermogis!30
parents b919bc0b 2e131bd6

pixi.lock

+74 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ environments: 
      - conda: https://conda.anaconda.org/conda-forge/linux-64/dbus-1.13.6-h5008d03_3.tar.bz2

      - conda: https://conda.anaconda.org/conda-forge/noarch/docutils-0.21.2-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/et_xmlfile-2.0.0-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.3.0-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/linux-64/expat-2.7.0-h5888daf_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/h2-4.2.0-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/hpack-4.1.0-pyhd8ed1ab_0.conda
@@ -37,6 +38,7 @@ environments: 
      - conda: https://conda.anaconda.org/conda-forge/noarch/imagesize-1.4.1-pyhd8ed1ab_0.tar.bz2

      - conda: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-8.6.1-pyha770c72_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/importlib_resources-6.5.2-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/jaraco.classes-3.4.0-pyhd8ed1ab_2.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/jaraco.context-6.0.1-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/jaraco.functools-4.1.0-pyhd8ed1ab_0.conda
@@ -77,9 +79,11 @@ environments: 
      - conda: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.2.3-py313ha87cce1_3.conda

      - conda: https://conda.anaconda.org/conda-forge/linux-64/pcre2-10.45-hc749103_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pip-25.1.1-pyh145f28c_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.6.0-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pycparser-2.22-pyh29332c3_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pygments-2.19.1-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha55dd90_7.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pytest-8.3.5-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.13.3-hf636f53_101_cp313.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.9.0.post0-pyhff2d567_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/python-gil-3.13.3-h4df99d1_101.conda
@@ -108,6 +112,7 @@ environments: 
      - conda: https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-qthelp-2.0.0-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.10-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/tomli-2.2.1-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/twine-6.1.0-pyh29332c3_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/typer-0.15.4-pyh9571d03_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/typer-slim-0.15.4-pyhe01879c_0.conda
@@ -164,6 +169,7 @@ environments: 
      - conda: https://conda.anaconda.org/conda-forge/noarch/cpython-3.13.3-py313hd8ed1ab_101.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/docutils-0.21.2-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/et_xmlfile-2.0.0-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.3.0-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/h2-4.2.0-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/hpack-4.1.0-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/hyperframe-6.1.0-pyhd8ed1ab_0.conda
@@ -172,6 +178,7 @@ environments: 
      - conda: https://conda.anaconda.org/conda-forge/noarch/imagesize-1.4.1-pyhd8ed1ab_0.tar.bz2

      - conda: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-8.6.1-pyha770c72_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/importlib_resources-6.5.2-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2024.2.1-h57928b3_1083.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/jaraco.classes-3.4.0-pyhd8ed1ab_2.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/jaraco.context-6.0.1-pyhd8ed1ab_0.conda
@@ -204,9 +211,11 @@ environments: 
      - conda: https://conda.anaconda.org/conda-forge/noarch/packaging-25.0-pyh29332c3_1.conda

      - conda: https://conda.anaconda.org/conda-forge/win-64/pandas-2.2.3-py313hf91d08e_3.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pip-25.1.1-pyh145f28c_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.6.0-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pycparser-2.22-pyh29332c3_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pygments-2.19.1-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyh09c184e_7.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/pytest-8.3.5-pyhd8ed1ab_0.conda

      - conda: https://conda.anaconda.org/conda-forge/win-64/python-3.13.3-h261c0b1_101_cp313.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.9.0.post0-pyhff2d567_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/python-gil-3.13.3-h4df99d1_101.conda
@@ -235,6 +244,7 @@ environments: 
      - conda: https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.10-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/win-64/tbb-2021.13.0-h62715c5_1.conda

      - conda: https://conda.anaconda.org/conda-forge/win-64/tk-8.6.13-h5226925_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/tomli-2.2.1-pyhd8ed1ab_1.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/twine-6.1.0-pyh29332c3_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/typer-0.15.4-pyh9571d03_0.conda

      - conda: https://conda.anaconda.org/conda-forge/noarch/typer-slim-0.15.4-pyhe01879c_0.conda
@@ -801,6 +811,17 @@ packages: 
  - pkg:pypi/et-xmlfile?source=hash-mapping

  size: 21908

  timestamp: 1733749746332

- conda: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.3.0-pyhd8ed1ab_0.conda

  sha256: ce61f4f99401a4bd455b89909153b40b9c823276aefcbb06f2044618696009ca

  md5: 72e42d28960d875c7654614f8b50939a

  depends:

  - python >=3.9

  - typing_extensions >=4.6.0

  license: MIT and PSF-2.0

  purls:

  - pkg:pypi/exceptiongroup?source=compressed-mapping

  size: 21284

  timestamp: 1746947398083

- conda: https://conda.anaconda.org/conda-forge/linux-64/expat-2.7.0-h5888daf_0.conda

  sha256: dd5530ddddca93b17318838b97a2c9d7694fa4d57fc676cf0d06da649085e57a

  md5: d6845ae4dea52a2f90178bf1829a21f8
@@ -1008,6 +1029,17 @@ packages: 
  - pkg:pypi/importlib-resources?source=hash-mapping

  size: 33781

  timestamp: 1736252433366

- conda: https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_1.conda

  sha256: 0ec8f4d02053cd03b0f3e63168316530949484f80e16f5e2fb199a1d117a89ca

  md5: 6837f3eff7dcea42ecd714ce1ac2b108

  depends:

  - python >=3.9

  license: MIT

  license_family: MIT

  purls:

  - pkg:pypi/iniconfig?source=hash-mapping

  size: 11474

  timestamp: 1733223232820

- conda: https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2024.2.1-h57928b3_1083.conda

  sha256: 0fd2b0b84c854029041b0ede8f4c2369242ee92acc0092f8407b1fe9238a8209

  md5: 2d89243bfb53652c182a7c73182cce4f
@@ -2086,6 +2118,17 @@ packages: 
  - packaging

  - numpy ; extra == 'express'

  requires_python: '>=3.8'

- conda: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.6.0-pyhd8ed1ab_0.conda

  sha256: a8eb555eef5063bbb7ba06a379fa7ea714f57d9741fe0efdb9442dbbc2cccbcc

  md5: 7da7ccd349dbf6487a7778579d2bb971

  depends:

  - python >=3.9

  license: MIT

  license_family: MIT

  purls:

  - pkg:pypi/pluggy?source=compressed-mapping

  size: 24246

  timestamp: 1747339794916

- conda: https://conda.anaconda.org/conda-forge/noarch/pycparser-2.22-pyh29332c3_1.conda

  sha256: 79db7928d13fab2d892592223d7570f5061c192f27b9febd1a418427b719acc6

  md5: 12c566707c80111f9799308d9e265aef
@@ -2229,10 +2272,29 @@ packages: 
  - pkg:pypi/pysocks?source=hash-mapping

  size: 21085

  timestamp: 1733217331982

- conda: https://conda.anaconda.org/conda-forge/noarch/pytest-8.3.5-pyhd8ed1ab_0.conda

  sha256: 963524de7340c56615583ba7b97a6beb20d5c56a59defb59724dc2a3105169c9

  md5: c3c9316209dec74a705a36797970c6be

  depends:

  - colorama

  - exceptiongroup >=1.0.0rc8

  - iniconfig

  - packaging

  - pluggy <2,>=1.5

  - python >=3.9

  - tomli >=1

  constrains:

  - pytest-faulthandler >=2

  license: MIT

  license_family: MIT

  purls:

  - pkg:pypi/pytest?source=hash-mapping

  size: 259816

  timestamp: 1740946648058

- pypi: .

  name: pythermogis

  version: 0.1.18

  sha256: 9bd9cbbe0c353b10b418aa5cdc6b1f7938319a89ccdf9e45b2193e73b45695df

  sha256: 991c6bf3932428f808ed2f520ace0ca0ead9593f4e408125795f4a4b998a3fb4

  requires_dist:

  - jpype1>=1.5.2,<2

  - xarray==2024.9.0.*
@@ -2887,6 +2949,17 @@ packages: 
  purls: []

  size: 3503410

  timestamp: 1699202577803

- conda: https://conda.anaconda.org/conda-forge/noarch/tomli-2.2.1-pyhd8ed1ab_1.conda

  sha256: 18636339a79656962723077df9a56c0ac7b8a864329eb8f847ee3d38495b863e

  md5: ac944244f1fed2eb49bae07193ae8215

  depends:

  - python >=3.9

  license: MIT

  license_family: MIT

  purls:

  - pkg:pypi/tomli?source=hash-mapping

  size: 19167

  timestamp: 1733256819729

- conda: https://conda.anaconda.org/conda-forge/noarch/twine-6.1.0-pyh29332c3_0.conda

  sha256: c5b373f6512b96324c9607d7d91a76bb53c1056cb1012b4f9c86900c6b7f8898

  md5: d319066fad04e07a0223bf9936090161

pyproject.toml

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ platforms = ["win-64", "linux-64"] 
pythermogis = { path = ".", editable = true }



[tool.pixi.tasks]

test = "PYTHONPATH=src pytest -s tests/"

test_java_installation = "PYTHONPATH=src pytest -s tests/test_java_installation.py"





[tool.pixi.dependencies]

python = ">=3.13.2,<3.14"
@@ -62,3 +65,4 @@ sphinx = ">=8.2.3,<9" 
sphinx_rtd_theme = ">=3.0.1,<4"

openpyxl = ">=3.1.5,<4"

typer = ">=0.15.4,<0.16"

pytest = ">=8.3.5,<9"

src/physics/__pycache__/__init__.cpython-313.pyc

0 → 100644
+170 B

File added.

No diff preview for this file type.

View file

src/physics/__pycache__/temperature_grid_calculation.cpython-313.pyc

0 → 100644
+524 B

File added.

No diff preview for this file type.

View file

src/thermogis_classes/__pycache__/__init__.cpython-313.pyc

0 → 100644
+180 B

File added.

No diff preview for this file type.

View file