Skip to content

Commit 2e17e6b

Browse files
emma58emma58
committed
Merge remote-tracking branch 'emmaFork/add_slacks_additions' into add_slacks_additions
2 parents ed1ebb4 + 31a8486 commit 2e17e6b

6 files changed

Lines changed: 56 additions & 46 deletions

File tree

‎.github/workflows/release_wheel_creation.yml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,13 @@ jobs:
6060
os: windows-latest
6161

6262
steps:
63-
- uses: actions/checkout@v4
63+
- uses: actions/checkout@v6
6464
- name: Update README.md
6565
shell: bash
6666
run: |
67-
sed -i '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md
67+
# Don't use "sed -i" because sed -i requires an argument on OSX
68+
sed '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md > README.new
69+
mv README.new README.md
6870
- name: Build wheels
6971
uses: pypa/cibuildwheel@main
7072
with:
@@ -109,11 +111,12 @@ jobs:
109111
TARGET: 'py314'
110112
GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
111113
steps:
112-
- uses: actions/checkout@v4
114+
- uses: actions/checkout@v6
113115
- name: Update README.md
114116
shell: bash
115117
run: |
116-
sed -i '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md
118+
sed '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md > README.new
119+
mv README.new README.md
117120
- name: Set up QEMU
118121
if: runner.os == 'Linux'
119122
uses: docker/setup-qemu-action@v3
@@ -142,11 +145,12 @@ jobs:
142145
matrix:
143146
python-version: ['3.12']
144147
steps:
145-
- uses: actions/checkout@v4
148+
- uses: actions/checkout@v6
146149
- name: Update README.md
147150
shell: bash
148151
run: |
149-
sed -i '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md
152+
sed '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md > README.new
153+
mv README.new README.md
150154
- name: Set up Python ${{ matrix.python-version }}
151155
uses: actions/setup-python@v5
152156
with:
@@ -178,11 +182,12 @@ jobs:
178182
TARGET: generic_tarball
179183
python-version: ['3.10']
180184
steps:
181-
- uses: actions/checkout@v4
185+
- uses: actions/checkout@v6
182186
- name: Update README.md
183187
shell: bash
184188
run: |
185-
sed -i '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md
189+
sed '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md > README.new
190+
mv README.new README.md
186191
- name: Set up Python ${{ matrix.python-version }}
187192
uses: actions/setup-python@v5
188193
with:

‎.github/workflows/test_branches.yml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: Checkout Pyomo source
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v6
4141
- name: Set up Python
42-
uses: actions/setup-python@v5
42+
uses: actions/setup-python@v6
4343
with:
4444
python-version: 3.11
4545
- name: Black Formatting Check
@@ -73,7 +73,8 @@ jobs:
7373
# Exclude:
7474
# - All gnu.org links because they consistently fail the checker
7575
# - All lpsolve.sourceforge.net links because SF appears to reject from GHA
76-
exclude_patterns: https://www.gnu.org,https://lpsolve.sourceforge.net/
76+
# - All www.mathworks.com links because MathWorks appears to reject from GHA
77+
exclude_patterns: https://www.gnu.org,https://lpsolve.sourceforge.net/,https://www.mathworks.com/
7778

7879

7980
build:
@@ -140,7 +141,7 @@ jobs:
140141

141142
steps:
142143
- name: Checkout Pyomo source
143-
uses: actions/checkout@v4
144+
uses: actions/checkout@v6
144145

145146
- name: Configure job parameters
146147
run: |
@@ -161,23 +162,23 @@ jobs:
161162
| tr '\n' ' ' | sed 's/ \+/ /g' >> $GITHUB_ENV
162163
163164
#- name: Pip package cache
164-
# uses: actions/cache@v4
165+
# uses: actions/cache@v5
165166
# if: matrix.PYENV == 'pip'
166167
# id: pip-cache
167168
# with:
168169
# path: cache/pip
169170
# key: pip-${{env.CACHE_VER}}.0-${{runner.os}}-${{matrix.python}}
170171

171172
#- name: OS package cache
172-
# uses: actions/cache@v4
173+
# uses: actions/cache@v5
173174
# if: matrix.TARGET != 'osx'
174175
# id: os-cache
175176
# with:
176177
# path: cache/os
177178
# key: pkg-${{env.CACHE_VER}}.0-${{runner.os}}
178179

179180
- name: TPL package download cache
180-
uses: actions/cache@v4
181+
uses: actions/cache@v5
181182
if: ${{ ! matrix.slim }}
182183
id: download-cache
183184
with:
@@ -237,7 +238,7 @@ jobs:
237238
238239
- name: Set up Python ${{ matrix.python }}
239240
if: matrix.PYENV == 'pip'
240-
uses: actions/setup-python@v5
241+
uses: actions/setup-python@v6
241242
with:
242243
python-version: ${{ matrix.python }}
243244

@@ -785,7 +786,7 @@ jobs:
785786
coverage xml -i
786787
787788
- name: Record build artifacts
788-
uses: actions/upload-artifact@v4
789+
uses: actions/upload-artifact@v7
789790
with:
790791
name: ${{github.job}}_${{env.GHA_JOBGROUP}}-${{env.GHA_JOBNAME}}
791792
include-hidden-files: true
@@ -803,10 +804,10 @@ jobs:
803804
timeout-minutes: 10
804805
steps:
805806
- name: Checkout Pyomo source
806-
uses: actions/checkout@v4
807+
uses: actions/checkout@v6
807808

808809
- name: Set up Python 3.10
809-
uses: actions/setup-python@v5
810+
uses: actions/setup-python@v6
810811
with:
811812
python-version: '3.10'
812813

@@ -859,23 +860,23 @@ jobs:
859860

860861
steps:
861862
- name: Checkout Pyomo source
862-
uses: actions/checkout@v4
863+
uses: actions/checkout@v6
863864
# We need the source for .codecov.yml and running "coverage xml"
864865

865866
#- name: Pip package cache
866-
# uses: actions/cache@v4
867+
# uses: actions/cache@v5
867868
# id: pip-cache
868869
# with:
869870
# path: cache/pip
870871
# key: pip-${{env.CACHE_VER}}.0-${{runner.os}}-3.10
871872

872873
- name: Download build artifacts
873-
uses: actions/download-artifact@v4
874+
uses: actions/download-artifact@v8
874875
with:
875876
path: artifacts
876877

877878
- name: Set up Python 3.12
878-
uses: actions/setup-python@v5
879+
uses: actions/setup-python@v6
879880
with:
880881
python-version: 3.12
881882

@@ -951,7 +952,7 @@ jobs:
951952
952953
- name: Upload codecov reports
953954
if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main'
954-
uses: codecov/codecov-action@v5
955+
uses: codecov/codecov-action@v6
955956
with:
956957
files: coverage.xml
957958
token: ${{ secrets.PYOMO_CODECOV_TOKEN }}
@@ -963,7 +964,7 @@ jobs:
963964
if: |
964965
hashFiles('coverage-other.xml') != '' &&
965966
(github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main')
966-
uses: codecov/codecov-action@v5
967+
uses: codecov/codecov-action@v6
967968
with:
968969
files: coverage-other.xml
969970
token: ${{ secrets.PYOMO_CODECOV_TOKEN }}

‎.github/workflows/test_pr_and_main.yml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ jobs:
4848
runs-on: ubuntu-latest
4949
steps:
5050
- name: Checkout Pyomo source
51-
uses: actions/checkout@v4
51+
uses: actions/checkout@v6
5252
- name: Set up Python
53-
uses: actions/setup-python@v5
53+
uses: actions/setup-python@v6
5454
with:
5555
python-version: 3.11
5656
- name: Black Formatting Check
@@ -84,7 +84,8 @@ jobs:
8484
# Exclude:
8585
# - All gnu.org links because they consistently fail the checker
8686
# - All lpsolve.sourceforge.net links because SF appears to reject from GHA
87-
exclude_patterns: https://www.gnu.org,https://lpsolve.sourceforge.net/
87+
# - All www.mathworks.com links because MathWorks appears to reject from GHA
88+
exclude_patterns: https://www.gnu.org,https://lpsolve.sourceforge.net/,https://www.mathworks.com/
8889

8990

9091
build:
@@ -177,7 +178,7 @@ jobs:
177178
PACKAGES: pyutilib
178179

179180
- os: ubuntu-latest
180-
python: 'pypy-3.11'
181+
python: 'pypy-3.11-v7.3.20' #FIXME: Temporary version pin to avoid PyPy 7.3.21
181182
TARGET: linux
182183
PYENV: pip
183184

@@ -192,7 +193,7 @@ jobs:
192193

193194
steps:
194195
- name: Checkout Pyomo source
195-
uses: actions/checkout@v4
196+
uses: actions/checkout@v6
196197

197198
- name: Configure job parameters
198199
run: |
@@ -213,23 +214,23 @@ jobs:
213214
| tr '\n' ' ' | sed 's/ \+/ /g' >> $GITHUB_ENV
214215
215216
#- name: Pip package cache
216-
# uses: actions/cache@v4
217+
# uses: actions/cache@v5
217218
# if: matrix.PYENV == 'pip'
218219
# id: pip-cache
219220
# with:
220221
# path: cache/pip
221222
# key: pip-${{env.CACHE_VER}}.0-${{runner.os}}-${{matrix.python}}
222223

223224
#- name: OS package cache
224-
# uses: actions/cache@v4
225+
# uses: actions/cache@v5
225226
# if: matrix.TARGET != 'osx'
226227
# id: os-cache
227228
# with:
228229
# path: cache/os
229230
# key: pkg-${{env.CACHE_VER}}.0-${{runner.os}}
230231

231232
- name: TPL package download cache
232-
uses: actions/cache@v4
233+
uses: actions/cache@v5
233234
if: ${{ ! matrix.slim }}
234235
id: download-cache
235236
with:
@@ -289,7 +290,7 @@ jobs:
289290
290291
- name: Set up Python ${{ matrix.python }}
291292
if: matrix.PYENV == 'pip'
292-
uses: actions/setup-python@v5
293+
uses: actions/setup-python@v6
293294
with:
294295
python-version: ${{ matrix.python }}
295296

@@ -837,7 +838,7 @@ jobs:
837838
coverage xml -i
838839
839840
- name: Record build artifacts
840-
uses: actions/upload-artifact@v4
841+
uses: actions/upload-artifact@v7
841842
with:
842843
name: ${{github.job}}_${{env.GHA_JOBGROUP}}-${{env.GHA_JOBNAME}}
843844
include-hidden-files: true
@@ -856,10 +857,10 @@ jobs:
856857
timeout-minutes: 10
857858
steps:
858859
- name: Checkout Pyomo source
859-
uses: actions/checkout@v4
860+
uses: actions/checkout@v6
860861

861862
- name: Set up Python 3.10
862-
uses: actions/setup-python@v5
863+
uses: actions/setup-python@v6
863864
with:
864865
python-version: '3.10'
865866

@@ -912,23 +913,23 @@ jobs:
912913

913914
steps:
914915
- name: Checkout Pyomo source
915-
uses: actions/checkout@v4
916+
uses: actions/checkout@v6
916917
# We need the source for .codecov.yml and running "coverage xml"
917918

918919
#- name: Pip package cache
919-
# uses: actions/cache@v4
920+
# uses: actions/cache@v5
920921
# id: pip-cache
921922
# with:
922923
# path: cache/pip
923924
# key: pip-${{env.CACHE_VER}}.0-${{runner.os}}-3.10
924925

925926
- name: Download build artifacts
926-
uses: actions/download-artifact@v4
927+
uses: actions/download-artifact@v8
927928
with:
928929
path: artifacts
929930

930931
- name: Set up Python 3.12
931-
uses: actions/setup-python@v5
932+
uses: actions/setup-python@v6
932933
with:
933934
python-version: 3.12
934935

@@ -1004,7 +1005,7 @@ jobs:
10041005
10051006
- name: Upload codecov reports
10061007
if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main'
1007-
uses: codecov/codecov-action@v5
1008+
uses: codecov/codecov-action@v6
10081009
with:
10091010
files: coverage.xml
10101011
token: ${{ secrets.PYOMO_CODECOV_TOKEN }}
@@ -1016,7 +1017,7 @@ jobs:
10161017
if: |
10171018
hashFiles('coverage-other.xml') != '' &&
10181019
(github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main')
1019-
uses: codecov/codecov-action@v5
1020+
uses: codecov/codecov-action@v6
10201021
with:
10211022
files: coverage-other.xml
10221023
token: ${{ secrets.PYOMO_CODECOV_TOKEN }}

‎.github/workflows/typos.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,6 @@ Bimap = "Bimap"
8181
cmo = "cmo"
8282
# Substituters
8383
Substituters = "Substituters"
84+
# numpy uses writeable in their API, which causes us problems
85+
writeable = "writeable"
8486
# AS NEEDED: Add More Words Below

‎.github/workflows/url_check.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout Pyomo source
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
- name: URL Checker
1919
uses: urlstechie/urlchecker-action@0.0.34
2020
with:
@@ -35,4 +35,5 @@ jobs:
3535
# Exclude:
3636
# - All gnu.org links because they consistently fail the checker
3737
# - All lpsolve.sourceforge.net links because SF appears to reject from GHA
38-
exclude_patterns: https://www.gnu.org,https://lpsolve.sourceforge.net/
38+
# - All www.mathworks.com links because MathWorks appears to reject from GHA
39+
exclude_patterns: https://www.gnu.org,https://lpsolve.sourceforge.net/,https://www.mathworks.com/

‎examples/dae/PDE_example.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# software. This software is distributed under the 3-clause BSD License.
88
# ____________________________________________________________________________________
99

10-
# Example 1 from http://www.mathworks.com/help/matlab/ref/pdepe.html
10+
# Example 1 from https://www.mathworks.com/help/matlab/ref/pdepe.html
1111

1212
import pyomo.environ as pyo
1313
from pyomo.dae import ContinuousSet, DerivativeVar

0 commit comments

Comments
 (0)