Skip to content

Commit

Permalink
To support release 2025 (#78)
Browse files Browse the repository at this point in the history
* Update assembly version for MIKE 2025

* To fix issue #42: No records insert to m_ScenarioManagementUpdatedFields when it is needed.

* To support 2025 version

* Add full test action for release

* Update test action secret

* Update change log

---------

Co-authored-by: Ryan Walter Murray <[email protected]>
  • Loading branch information
wuwwen and ryan-kipawa authored Nov 28, 2024
1 parent 902b9fd commit 9576e20
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Full test MIKE+ 2024 Update 1
name: Full test MIKE+ 2025

on:
workflow_dispatch:
Expand Down Expand Up @@ -27,11 +27,11 @@ jobs:

- name: Unzip MIKE+ dependency
run: |
7z x "2024_1.7z" -p${{ secrets.MIKE_2024_0_7Z }}
7z x "2025_0.7z" -p${{ secrets.MIKE_2024_0_7Z }} # Use secrets.MIKE_2024_0_7Z regardless of version
- name: Install MIKE+ dependency
run: |
./install.ps1 2024
./install.ps1 2025
- name: Checkout code
uses: actions/checkout@v3
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## [Unreleased]

## [2025.0.0] - 2025-11-28

### Added
- Support for MIKE+ 2025.

## [2024.1.1] - 2024-11-28

### Added
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ The version of MIKE+Py you install must match the version of MIKE+ installed on

| MIKE+ Version | Install command|
|:--------------|:---------------|
| MIKE+ 2025 | `pip install mikeplus==2025` |
| MIKE+ 2024 Update 1 | `pip install mikeplus==2024.1` |
| MIKE+ 2024 | `pip install mikeplus==2024.0` |

Expand Down
4 changes: 2 additions & 2 deletions mikeplus/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import clr

__version__ = "2024.1.1"
__version__ = "2025.0.0"

clr.AddReference(
"DHI.Mike.Install, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c513450b5d0bf0bf"
)
from DHI.Mike.Install import MikeImport, MikeProducts # noqa: E402

MikeImport.Setup(22, MikeProducts.MikePlus)
MikeImport.Setup(23, MikeProducts.MikePlus)

clr.AddReference("System")
clr.AddReference("System.Runtime")
Expand Down
2 changes: 1 addition & 1 deletion mikeplus/engines/engine1d.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Engine1D:
"""The Engine1D class can run MIKE1D simulation, print log file, and get the result file path."""

def __init__(self, dataTables):
MikeImport.Setup(22, MikeProducts.MikePlus)
MikeImport.Setup(23, MikeProducts.MikePlus)
self._dataTables = dataTables
self._result_file = None

Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ exclude = ["notebooks", "tests"]

[project]
name = "mikeplus"
version = "2024.1.1"
version = "2025.0.0"
dependencies = [
"numpy",
'pythonnet>=3.0',
"pandas",
]

authors = [
{ name="Ryan Walter Murray", email="[email protected]" },
{ name="Wen Wu", email="[email protected]" },
]
description = "A python script package to manipulate MIKE+ database, run simulation by using MIKE+ data, run tools based on MIKE+ data"
Expand Down

0 comments on commit 9576e20

Please sign in to comment.