Skip to content

Commit 8cbcbbe

Browse files
kaklisekaklise
committed
Merge branch 'main' of https://github.com/USEPA/WNTR 
2 parents ebf593b + e74e9df commit 8cbcbbe

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

‎.github/workflows/build_tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
strategy:
1919
matrix:
2020
python-version: ['3.9', '3.10', '3.11', '3.12']
21-
os: [windows-latest, macOS-latest, ubuntu-latest]
21+
os: [windows-latest, macOS-13, ubuntu-latest]
22+
fail-fast: false
2223
steps:
2324
- uses: actions/checkout@v2
2425
- name: Set up Python
@@ -47,7 +48,8 @@ jobs:
4748
strategy:
4849
matrix:
4950
python-version: ['3.9', '3.10', '3.11', '3.12']
50-
os: [windows-latest, macOS-latest, ubuntu-latest]
51+
os: [windows-latest, macOS-13, ubuntu-latest]
52+
fail-fast: false
5153
steps:
5254
- name: Set up Python
5355
uses: actions/setup-python@v4
@@ -57,13 +59,10 @@ jobs:
5759
uses: actions/download-artifact@v3
5860
with:
5961
name: wntr_${{ matrix.python-version }}_${{ matrix.os }}.whl
60-
# - name: Discover
61-
# run: |
62-
# ls .
6362
- name: Install wntr
6463
run: |
6564
python -m pip install --upgrade pip
66-
pip install wheel numpy scipy networkx pandas matplotlib setuptools
65+
pip install wheel "numpy>=1.2.1,<2.0" scipy networkx pandas matplotlib setuptools
6766
pip install --no-index --pre --find-links=. wntr
6867
- name: Usage of wntr
6968
run: |
@@ -74,7 +73,8 @@ jobs:
7473
strategy:
7574
matrix:
7675
python-version: ['3.9', '3.10', '3.11', '3.12']
77-
os: [windows-latest, macOS-latest, ubuntu-latest]
76+
os: [windows-latest, macOS-13, ubuntu-latest]
77+
fail-fast: false
7878
steps:
7979
- uses: actions/checkout@v2
8080
- name: Set up Python ${{ matrix.python-version }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414
strategy:
1515
matrix:
16-
os: [windows-2019, macOS-11, ubuntu-20.04]
16+
os: [windows-2019, macOS-13, ubuntu-20.04]
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Build wheels

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools", "numpy>=1.21"]
2+
requires = ["setuptools", "numpy>=1.21,<2.0"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.pytest.ini_options]

‎requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Required
2-
numpy>=1.21
2+
numpy>=1.21,<2.0
33
scipy<1.13.0
44
networkx
55
pandas
@@ -26,4 +26,4 @@ pytest
2626
nbformat
2727
nbconvert
2828
ipykernel
29-
coverage
29+
coverage

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
MAINTAINER_EMAIL = '[email protected]'
7373
LICENSE = 'Revised BSD'
7474
URL = 'https://github.com/USEPA/WNTR'
75-
DEPENDENCIES = ['numpy>=1.21', 'scipy', 'networkx', 'pandas', 'matplotlib', 'setuptools']
75+
DEPENDENCIES = ['numpy>=1.21,<2.0', 'scipy', 'networkx', 'pandas', 'matplotlib', 'setuptools']
7676

7777
# use README file as the long description
7878
file_dir = os.path.abspath(os.path.dirname(__file__))

‎wntr/tests/test_network.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def test_add_pipe(self):
142142
self.assertEqual(l.name, "p1")
143143
self.assertEqual(l.start_node_name, "j1")
144144
self.assertEqual(l.end_node_name, "j2")
145-
self.assertEqual(l.initial_status, self.wntr.network.LinkStatus.opened)
145+
self.assertEqual(l.initial_status, self.wntr.network.LinkStatus.Opened)
146146
self.assertEqual(l.length, 1000.0)
147147
self.assertEqual(l.diameter, 1.0)
148148
self.assertEqual(l.roughness, 100.0)
@@ -255,7 +255,7 @@ def test_remove_controls_for_removing_link(self):
255255
wn = self.wntr.network.WaterNetworkModel(inp_file)
256256

257257
control_action = self.wntr.network.ControlAction(
258-
wn.get_link("21"), "status", self.wntr.network.LinkStatus.opened
258+
wn.get_link("21"), "status", self.wntr.network.LinkStatus.Opened
259259
)
260260
control = self.wntr.network.controls.Control._conditional_control(
261261
wn.get_node("2"), "head", np.greater_equal, 10.0, control_action

‎wntr/tests/test_network_controls.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ def test_time_control_open_vs_closed(self):
102102
link_res["flowrate"].at[t, "pipe2"], 150 / 3600.0
103103
)
104104
self.assertEqual(
105-
link_res["status"].at[t, "pipe2"], self.wntr.network.LinkStatus.open
105+
link_res["status"].at[t, "pipe2"], self.wntr.network.LinkStatus.Open
106106
)
107107
else:
108108
self.assertAlmostEqual(link_res["flowrate"].at[t, "pipe2"], 0.0)
109109
self.assertEqual(
110110
link_res["status"].at[t, "pipe2"],
111-
self.wntr.network.LinkStatus.closed,
111+
self.wntr.network.LinkStatus.Closed,
112112
)
113113

114114

@@ -147,14 +147,14 @@ def test_close_link_by_tank_level(self):
147147
self.assertAlmostEqual(link_res["flowrate"].at[t, "pump1"], 0.0)
148148
self.assertEqual(
149149
link_res["status"].at[t, "pump1"],
150-
self.wntr.network.LinkStatus.closed,
150+
self.wntr.network.LinkStatus.Closed,
151151
)
152152
count += 1
153153
else:
154154
self.assertGreaterEqual(link_res["flowrate"].at[t, "pump1"], 0.0001)
155155
self.assertEqual(
156156
link_res["status"].loc[t, "pump1"],
157-
self.wntr.network.LinkStatus.open,
157+
self.wntr.network.LinkStatus.Open,
158158
)
159159
self.assertEqual(activated_flag, True)
160160
self.assertGreaterEqual(count, 2)
@@ -229,20 +229,20 @@ def test_open_link_by_tank_level(self):
229229
self.assertGreaterEqual(results.link["flowrate"].at[t, "pipe1"], 0.002)
230230
self.assertEqual(
231231
results.link["status"].at[t, "pipe1"],
232-
self.wntr.network.LinkStatus.open,
232+
self.wntr.network.LinkStatus.Open,
233233
)
234234
count += 1
235235
else:
236236
self.assertAlmostEqual(results.link["flowrate"].at[t, "pipe1"], 0.0)
237237
self.assertEqual(
238238
results.link["status"].at[t, "pipe1"],
239-
self.wntr.network.LinkStatus.closed,
239+
self.wntr.network.LinkStatus.Closed,
240240
)
241241
self.assertEqual(activated_flag, True)
242242
self.assertGreaterEqual(count, 2)
243243
self.assertEqual(
244244
results.link["status"].at[results.link["status"].index[0], "pipe1"],
245-
self.wntr.network.LinkStatus.closed,
245+
self.wntr.network.LinkStatus.Closed,
246246
) # make sure the pipe starts closed
247247
self.assertLessEqual(
248248
results.node["pressure"].at[results.node["pressure"].index[0], "tank1"],
@@ -277,7 +277,7 @@ def test_pipe_closed_for_low_level(self):
277277
self.assertLessEqual(results.link["flowrate"].at[t, "pipe1"], 0.0)
278278
self.assertEqual(
279279
results.link["status"].at[t, "pipe1"],
280-
self.wntr.network.LinkStatus.closed,
280+
self.wntr.network.LinkStatus.Closed,
281281
)
282282
tank_level_dropped_flag = True
283283
self.assertEqual(tank_level_dropped_flag, True)
@@ -384,7 +384,7 @@ def test_open_by_time_close_by_condition(self):
384384
inp_file = join(test_datadir, "control_comb.inp")
385385
wn = self.wntr.network.WaterNetworkModel(inp_file)
386386
control_action = self.wntr.network.ControlAction(
387-
wn.get_link("pipe1"), "status", self.wntr.network.LinkStatus.opened
387+
wn.get_link("pipe1"), "status", self.wntr.network.LinkStatus.Opened
388388
)
389389
control = self.wntr.network.controls.Control._time_control(
390390
wn, 6 * 3600, "SIM_TIME", False, control_action
@@ -432,9 +432,9 @@ def test_close_by_condition_open_by_time_stay(self):
432432
tank1.init_level = 40.0
433433
tank1._head = tank1.elevation + 40.0
434434
pipe1 = wn.get_link("pipe1")
435-
pipe1._user_status = self.wntr.network.LinkStatus.opened
435+
pipe1._user_status = self.wntr.network.LinkStatus.Opened
436436
control_action = self.wntr.network.ControlAction(
437-
wn.get_link("pipe1"), "status", self.wntr.network.LinkStatus.opened
437+
wn.get_link("pipe1"), "status", self.wntr.network.LinkStatus.Opened
438438
)
439439
control = self.wntr.network.controls.Control._time_control(
440440
wn, 19 * 3600, "SIM_TIME", False, control_action
@@ -482,9 +482,9 @@ def test_close_by_condition_open_by_time_reclose(self):
482482
tank1.init_level = 40.0
483483
tank1._head = tank1.elevation + 40.0
484484
pipe1 = wn.get_link("pipe1")
485-
pipe1._user_status = self.wntr.network.LinkStatus.opened
485+
pipe1._user_status = self.wntr.network.LinkStatus.Opened
486486
control_action = self.wntr.network.ControlAction(
487-
wn.get_link("pipe1"), "status", self.wntr.network.LinkStatus.opened
487+
wn.get_link("pipe1"), "status", self.wntr.network.LinkStatus.Opened
488488
)
489489
control = self.wntr.network.controls.Control._time_control(
490490
wn, 5 * 3600, "SIM_TIME", False, control_action

0 commit comments

Comments
 (0)