TNO Intern

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

Merge branch '32-fix-importing-pythermogis-as-package-2' into 'main' 

Resolve "fix importing pythermogis as package"

Closes #32

See merge request AGS/pythermogis!33
parents 91099f20 c3d9b4ec

.idea/pythermogis.iml

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    <content url="file://$MODULE_DIR$">

      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/tests/tests" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/pythermogis" isTestSource="false" />

      <excludeFolder url="file://$MODULE_DIR$/.venv" />

    </content>

    <orderEntry type="jdk" jdkName="Python 3.13 (2)" jdkType="Python SDK" />
@@ -14,7 +14,7 @@ 
    <option name="namespacePackageFolders">

      <list>

        <option value="$MODULE_DIR$/resources" />

        <option value="$MODULE_DIR$/src" />

        <option value="$MODULE_DIR$/pythermogis" />

      </list>

    </option>

  </component>

README.md

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ print(results) 


```python

from pythermogis import calculate_doublet_performance

from pygridsio.pygridsio import read_grid

from pygridsio import read_grid



input_grids = read_grid("thickness.zmap").to_dataset(name="thickness_mean")

input_grids["thickness_sd"] = read_grid("thickness_sd.zmap")

pixi.lock

+2 −2
Original line number Diff line number Diff line
@@ -2293,8 +2293,8 @@ packages: 
  timestamp: 1740946648058

- pypi: .

  name: pythermogis

  version: 0.1.18

  sha256: 991c6bf3932428f808ed2f520ace0ca0ead9593f4e408125795f4a4b998a3fb4

  version: 0.1.25

  sha256: d9fecb41ae23b43e1805038c4a2aba398a39af1dc24e28df528a2856b875ac36

  requires_dist:

  - jpype1>=1.5.2,<2

  - xarray==2024.9.0.*

pyproject.toml

+5 −8
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ requires = ["setuptools", "wheel"] 
build-backend = "setuptools.build_meta"



[project]

name = "pythermoGIS"

version = "0.1.19"

name = "pythermogis"

version = "0.1.25"

description = "This repository is used as a python API for the ThermoGIS Doublet simulations"

authors = [

    { name = "Hen Brett", email = "hen.brett@tno.nl" },
@@ -31,10 +31,7 @@ markers = [ 
]



[tool.setuptools]

package-dir = {"" = "src"}



[tool.setuptools.packages.find]

where = ["src"]

package-dir = {"" = "pythermogis"}



[project.scripts]

pytg = "main:app"
@@ -47,8 +44,8 @@ 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"

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

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





[tool.pixi.dependencies]

pythermogis/__init__.py

0 → 100644
+2 −0
Original line number Diff line number Diff line 
from thermogis_classes.doublet import *

from thermogis_classes.utc_properties import *
 
 No newline at end of file