Skip to content

Commit ae79f88

Browse files
authored
Merge pull request #9 from zupit-it/chore/update-to-python-311-and-latest-libs
chore: update to python 3.11 and latest libs
2 parents c4b1f26 + 7c10a51 commit ae79f88

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/automatic_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
steps:
1313
- name: Prepare the repo
1414
uses: actions/checkout@master
15-
- name: Set up Python 3.7
15+
- name: Set up Python 3.11
1616
uses: actions/setup-python@v1
1717
with:
18-
python-version: 3.7
18+
python-version: 3.11
1919
- name: Install packages
2020
run: pip install -r test/unittest/test_requirements.txt
2121
- name: Test

.github/workflows/publish_to_pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
uses: actions/checkout@master
1616
with:
1717
ref: 'release' # The default behavior is that it checkouts to the trigger so we don't need this
18-
- name: Set up Python 3.7
18+
- name: Set up Python 3.11
1919
uses: actions/setup-python@v1
2020
with:
21-
python-version: 3.7
21+
python-version: 3.11
2222
- name: Build the package
2323
run: python setup.py sdist
2424
- name: Publish on PyPI

requirements.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
superflexpy
2-
matplotlib==3.3.*
3-
numba==0.50.*
4-
numpy==1.19.*
1+
matplotlib==3.8.2
2+
numba==0.57.1
3+
numpy==1.24.3

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'Topic :: Scientific/Engineering :: Hydrology',
1919
],
2020
install_requires=[
21-
'numpy>=1.19.*',
22-
'numba>=0.50.*',
21+
"numba==0.57.1",
22+
"numpy==1.24.3"
2323
],
2424
)

test/unittest/04_UR_FR_SR.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
sys.path.insert(0, package_path)
3636

3737
from superflexpy.implementation.elements.hbv import PowerReservoir, UnsaturatedReservoir
38-
from superflexpy.implementation.root_finders.pegasussusNumba, PegasusPython
38+
from superflexpy.implementation.root_finders.pegasus import PegasusPython, PegasusNumba
3939
from superflexpy.implementation.numerical_approximators.implicit_euler import ImplicitEulerNumba, ImplicitEulerPython
4040
from superflexpy.implementation.elements.structure_elements import Splitter, Junction
4141
from superflexpy.framework.unit import Unit

test/unittest/test_all.sh

100644100755
File mode changed.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
numba==0.50.*
2-
numpy==1.19.*
3-
pandas==1.0.3
1+
pandas==2.1.3
2+
matplotlib==3.8.2
3+
numba==0.57.1
4+
numpy==1.24.3

0 commit comments

Comments
 (0)