Merge branch 'main' of github.com:Deltares-research/geost

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: ci
+name: GeoST CI
 
 on:
   push:
@@ -17,11 +17,11 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Check out repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
       - name: Setup Pixi
-        uses: prefix-dev/setup-pixi@v0.3.0
+        uses: prefix-dev/setup-pixi@v0.5.1
       - name: Run linter
         run: pixi run lint
 
@@ -33,9 +33,9 @@ jobs:
           - "3.10"
     steps:
       - name: Check out repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup Pixi
-        uses: prefix-dev/setup-pixi@v0.3.0
+        uses: prefix-dev/setup-pixi@v0.5.1
       - name: Setup older Python versions
         run: pixi add python=${{ matrix.python-version }} 
       - name: Run Tests
@@ -45,12 +45,14 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Check out repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup Pixi
-        uses: prefix-dev/setup-pixi@v0.3.0
+        uses: prefix-dev/setup-pixi@v0.5.1
       - name: Run Tests
         run: pixi run test
       - name: Publish Code Coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Build Docs
         run: pixi run docs

README.md

@@ -2,7 +2,7 @@
 [![License: MIT](https://img.shields.io/pypi/l/imod)](https://choosealicense.com/licenses/mit)
 [![Lifecycle: experimental](https://lifecycle.r-lib.org/articles/figures/lifecycle-experimental.svg)](https://lifecycle.r-lib.org/articles/stages.html)
 [![Build: status](https://img.shields.io/github/actions/workflow/status/deltares-research/geost/ci.yml)](https://github.com/Deltares-research/geost/actions)
-[![Coverage](https://gitlab.com/deltares/tgg-projects/subsurface-toolbox/pysst/badges/main/coverage.svg)](https://github.com/Deltares-research/geost/actions)
+[![codecov](https://codecov.io/gh/Deltares-research/geost/graph/badge.svg?token=HCNGLWTQ2H)](https://codecov.io/gh/Deltares-research/geost)
 [![Formatting: ruff](https://camo.githubusercontent.com/18c26428c337f9d641fa09b629a3a03b514e8ac84b57974a0ed7d1b38e14e060/68747470733a2f2f696d672e736869656c64732e696f2f656e64706f696e743f75726c3d68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f61737472616c2d73682f727566662f6d61696e2f6173736574732f62616467652f76322e6a736f6e)](https://github.com/charliermarsh/ruff)
 
 The Geological Subsurface Toolbox (geost) package is designed to be an easy-to-use Python interface for working with subsurface point data in The Netherlands(boreholes, well logs and CPT's). It provides selection, analysis and export methods that can be applied generically to the loaded data. It is designed to connect with other Deltares developments such as [iMod](https://gitlab.com/deltares/imod) and [DataFusionTools](https://bitbucket.org/DeltaresGEO/datafusiontools/src/master/).

geost/io/parsers/xml_parsers.py

@@ -5,7 +5,6 @@
 import pandas as pd
 from lxml import etree
 
-from geost.bro.api import BroApi
 from geost.io.parsers.parser_utils import DDCoord, RDCoord
 
 

pixi.toml

@@ -10,7 +10,7 @@ platforms = ["win-64"]
 
 [tasks]
 install = "python -m pip install --no-deps --editable ."
-test = { depends_on = ["install"], cmd = "python -m pytest --verbose --cov=geost --cov-config=.coveragerc"}
+test = { depends_on = ["install"], cmd = "python -m pytest --verbose --cov=geost --cov-report xml --cov-report term"}
 docs = "sphinx-build -b html docs ./docs/build"
 format = "black ."
 lint = { depends_on = ["install"], cmd = "ruff check --fix ./geost"}