diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a60612..82d72cc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index fe45bb5..1ff821b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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` diff --git a/docs/example_model_run_HBV.ipynb b/docs/example_model_run_HBV.ipynb index 5f2ea42..f1a241a 100644 --- a/docs/example_model_run_HBV.ipynb +++ b/docs/example_model_run_HBV.ipynb @@ -473,7 +473,7 @@ "metadata": {}, "outputs": [], "source": [ - "from ewatercycle.models import HBVLocal" + "from ewatercycle_HBV.model import HBVLocal" ] }, { @@ -645,7 +645,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.13" + "version": "3.10.0" } }, "nbformat": 4, diff --git a/pyproject.toml b/pyproject.toml index 2442de0..d0e8342 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 = "davidhaasnoot@gmail.com" }, ] @@ -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" diff --git a/src/ewatercycle_HBV/__init__.py b/src/ewatercycle_HBV/__init__.py index 616b002..9662497 100644 --- a/src/ewatercycle_HBV/__init__.py +++ b/src/ewatercycle_HBV/__init__.py @@ -1 +1 @@ -__version__ = "1.8.4" +__version__ = "1.8.5"