Skip to content

Commit

Permalink
Remove local model from ewatercycle entrypoints (#65)
Browse files Browse the repository at this point in the history
* Remove local model from ewatercycle entrypoints

* Move to use conda-lock file in CI instead of environment.yml

* Move CI to Python 3.12

* Add env name (missing from lock file)

* Remove unused Python version matrix
  • Loading branch information
BSchilperoort authored Sep 6, 2024
1 parent 4593f72 commit d2c33d9
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,17 @@ jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10"]
fail-fast: false
name: Run tests in mamba environment ${{ matrix.python-version }}
name: Run tests in mamba environment
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download mamba environment.yml
run:
wget https://raw.githubusercontent.com/eWaterCycle/ewatercycle/main/environment.yml
wget https://raw.githubusercontent.com/eWaterCycle/ewatercycle/main/conda-lock.yml
- uses: mamba-org/setup-micromamba@v1
with:
environment-file: environment.yml
environment-file: conda-lock.yml
environment-name: ci
cache-environment: true
init-shell: bash
- name: Install dependencies
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,5 @@ Adding `.finalize()` method - clears up the directory. Especially useful for DA.
- Local model: `HBVLocal` also availible in wrapper
#### 1.8.4
- On generation of forcing adds a unique id (string) to be able to generate a lot of forcing at once
#### 1.8.5
- Removed the LocalHBV entrypoints (breaks ewatercycle). Import it like this instead: `from ewatercycle_hbv.model import HBVLocal`
4 changes: 2 additions & 2 deletions docs/example_model_run_HBV.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@
"metadata": {},
"outputs": [],
"source": [
"from ewatercycle.models import HBVLocal"
"from ewatercycle_HBV.model import HBVLocal"
]
},
{
Expand Down Expand Up @@ -645,7 +645,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.13"
"version": "3.10.0"
}
},
"nbformat": 4,
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "ewatercycle-HBV"
description = "Implementation of HBV for eWaterCycle"
readme = "README.md"
license = "Apache-2.0"
version = "1.8.4"
version = "1.8.5"
authors = [
{ name = "David Haasnoot", email = "[email protected]" },
]
Expand All @@ -32,7 +32,6 @@ dependencies = [
# This registers the plugin such that it is discoverable by eWaterCycle
[project.entry-points."ewatercycle.models"]
HBV = "ewatercycle_HBV.model:HBV"
HBVLocal= "ewatercycle_HBV.model:HBVLocal"
[project.entry-points."ewatercycle.forcings"]
HBVForcing = "ewatercycle_HBV.forcing:HBVForcing"

Expand Down
2 changes: 1 addition & 1 deletion src/ewatercycle_HBV/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.8.4"
__version__ = "1.8.5"

0 comments on commit d2c33d9

Please sign in to comment.