TNO Intern

Commit f1d558b3 authored by Zanne Korevaar's avatar Zanne Korevaar
Browse files

Merge branch '4-add-dependencies' into 'main' 

Resolve "add dependencies"

Closes #4

See merge request !5
parents 555c1ca5 25580da9

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Run tests: 
  before_script:

    - pip install uv

    - uv venv

    - uv sync --extra dev

    - uv sync --group dev

    - uv pip install -e .

  script:

    - uv run pytest -vv

pyproject.toml

+5 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ dependencies = [ 
    "typer>=0.20.0",

]



[project.optional-dependencies]

[dependency-groups]

dev = [

    "ruff>=0.14.6",

    "black",
@@ -47,6 +47,10 @@ dev = [ 
    "mike>=2.1.3,<3",

    "mkdocstrings>=0.30.1",

    "mkdocstrings-python>=1.18.2",

    "build>=1.3.0",

    "twine>=6.2.0",

    "wheel>=0.45.1",

    "setuptools>=80.9.0",

]



[tool.setuptools.packages.find]

src/geoloop/axisym/AxisymetricEL.py

+0 −2
Original line number Diff line number Diff line 
import matplotlib.pyplot as plt

import numpy as np

import pandas as pd





def check_asarray(rmin: float | np.ndarray, nr: int) -> np.ndarray:
@@ -750,4 +749,3 @@ def thomas_heatloop( 


    res2 = result.reshape(len(time), grid.nx, grid.ny, grid.nz)

    return res2

src/geoloop/bin/Flowdatamain.py

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ from pathlib import Path 
import matplotlib.pyplot as plt

import numpy as np



from geoloop.configuration import load_single_config, FlowDataConfig

from geoloop.configuration import FlowDataConfig, load_single_config

from geoloop.loadflowdata.flow_data import FlowData

src/geoloop/bin/Lithologymain.py

+3 −2
Original line number Diff line number Diff line 
from pathlib import Path



import numpy as np

import xarray as xr

from pathlib import Path



from geoloop.configuration import LithologyConfig, load_single_config

from geoloop.geoloopcore.strat_interpolator import StratInterpolator

from geoloop.lithology.plot_lithology import plot_lithology_and_thermcon

from geoloop.lithology.process_lithology import ProcessLithologyToThermalConductivity

from geoloop.configuration import load_single_config, LithologyConfig





def main_lithology(config_path: str | Path) -> None: