Skip to content

Commit 5aa67fc

Browse files
authored
Merge pull request #184 from bnavigator/drop-py37
Drop support for Python 3.7
2 parents d891ed3 + c92de62 commit 5aa67fc

File tree

4 files changed

+26
-33
lines changed

4 files changed

+26
-33
lines changed

.github/conda-env/build-env.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
name: build-env
22
dependencies:
3-
- conda-build
4-
- conda-verify
5-
# - boa # re-enable when boa is compatible with mamba 1.0 and Python 3.11
6-
- numpy !=1.23.0
3+
- boa
4+
- numpy!=1.23.0

.github/workflows/slycot-build-and-test.yml

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout Slycot
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222
with:
2323
fetch-depth: 0
2424
submodules: 'recursive'
@@ -57,7 +57,7 @@ jobs:
5757
- 'ubuntu'
5858
- 'macos'
5959
python:
60-
- '3.7'
60+
- '3.8'
6161
- '3.11'
6262
bla_vendor: [ 'unset' ]
6363
include:
@@ -79,7 +79,7 @@ jobs:
7979

8080
steps:
8181
- name: Checkout Slycot
82-
uses: actions/checkout@v2
82+
uses: actions/checkout@v3
8383
with:
8484
fetch-depth: 0
8585
submodules: 'recursive'
@@ -126,7 +126,7 @@ jobs:
126126
mkdir -p ${wheeldir}
127127
cp ./slycot*.whl ${wheeldir}/
128128
- name: Save wheel
129-
uses: actions/upload-artifact@v2
129+
uses: actions/upload-artifact@v3
130130
with:
131131
name: slycot-wheels
132132
path: slycot-wheels
@@ -148,7 +148,7 @@ jobs:
148148

149149
steps:
150150
- name: Checkout Slycot
151-
uses: actions/checkout@v2
151+
uses: actions/checkout@v3
152152
with:
153153
fetch-depth: 0
154154
submodules: 'recursive'
@@ -168,15 +168,15 @@ jobs:
168168
run: |
169169
set -e
170170
numpyversion=$(python -c 'import numpy; print(numpy.version.version)')
171-
conda build --python "${{ matrix.python }}" --numpy $numpyversion conda-recipe
171+
conda mambabuild --python "${{ matrix.python }}" --numpy $numpyversion conda-recipe
172172
# preserve directory structure for custom conda channel
173173
find "${CONDA_PREFIX}/conda-bld" -maxdepth 2 -name 'slycot*.tar.bz2' | while read -r conda_pkg; do
174174
conda_platform=$(basename $(dirname "${conda_pkg}"))
175175
mkdir -p "slycot-conda-pkgs/${conda_platform}"
176176
cp "${conda_pkg}" "slycot-conda-pkgs/${conda_platform}/"
177177
done
178178
- name: Save to local conda pkg channel
179-
uses: actions/upload-artifact@v2
179+
uses: actions/upload-artifact@v3
180180
with:
181181
name: slycot-conda-pkgs
182182
path: slycot-conda-pkgs
@@ -190,16 +190,14 @@ jobs:
190190
matrix: ${{ steps.set-matrix.outputs.matrix }}
191191
steps:
192192
- name: Checkout Slycot
193-
uses: actions/checkout@v2
193+
uses: actions/checkout@v3
194194
- name: Download wheels (if any)
195-
uses: actions/download-artifact@v2
195+
uses: actions/download-artifact@v3
196196
with:
197197
name: slycot-wheels
198198
path: slycot-wheels
199199
- id: set-matrix
200-
run: |
201-
matrix=$(python3 .github/scripts/set-pip-test-matrix.py)
202-
echo "::set-output name=matrix::$matrix"
200+
run: echo "matrix=$(python3 .github/scripts/set-pip-test-matrix.py)" >> $GITHUB_OUTPUT
203201

204202
create-conda-test-matrix:
205203
name: Create conda test matrix
@@ -210,16 +208,14 @@ jobs:
210208
matrix: ${{ steps.set-matrix.outputs.matrix }}
211209
steps:
212210
- name: Checkout Slycot
213-
uses: actions/checkout@v2
211+
uses: actions/checkout@v3
214212
- name: Download conda packages
215-
uses: actions/download-artifact@v2
213+
uses: actions/download-artifact@v3
216214
with:
217215
name: slycot-conda-pkgs
218216
path: slycot-conda-pkgs
219217
- id: set-matrix
220-
run: |
221-
matrix=$(python3 .github/scripts/set-conda-test-matrix.py)
222-
echo "::set-output name=matrix::$matrix"
218+
run: echo "matrix=$(python3 .github/scripts/set-conda-test-matrix.py)" >> $GITHUB_OUTPUT
223219

224220

225221
test-wheel:
@@ -234,11 +230,11 @@ jobs:
234230

235231
steps:
236232
- name: Checkout Slycot
237-
uses: actions/checkout@v2
233+
uses: actions/checkout@v3
238234
with:
239235
path: slycot-src
240236
- name: Checkout python-control
241-
uses: actions/checkout@v2
237+
uses: actions/checkout@v3
242238
with:
243239
repository: 'python-control/python-control'
244240
path: python-control
@@ -276,7 +272,7 @@ jobs:
276272
exit 1 ;;
277273
esac
278274
- name: Download wheels
279-
uses: actions/download-artifact@v2
275+
uses: actions/download-artifact@v3
280276
with:
281277
name: slycot-wheels
282278
path: slycot-wheels
@@ -313,11 +309,11 @@ jobs:
313309

314310
steps:
315311
- name: Checkout Slycot
316-
uses: actions/checkout@v2
312+
uses: actions/checkout@v3
317313
with:
318314
path: slycot-src
319315
- name: Checkout python-control
320-
uses: actions/checkout@v2
316+
uses: actions/checkout@v3
321317
with:
322318
repository: 'python-control/python-control'
323319
path: python-control
@@ -335,7 +331,7 @@ jobs:
335331
channel-priority: strict
336332
auto-activate-base: false
337333
- name: Download conda packages
338-
uses: actions/download-artifact@v2
334+
uses: actions/download-artifact@v3
339335
with:
340336
name: slycot-conda-pkgs
341337
path: slycot-conda-pkgs

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ Riccati, Lyapunov, and Sylvester equations.
1919
Dependencies
2020
------------
2121

22-
Slycot supports Python versions 3.7 or later.
22+
Slycot supports Python versions 3.8 or later.
2323

2424
To run the compiled Slycot package, the following must be installed as
2525
dependencies:
2626

27-
- Python 3.7+
27+
- Python 3.8+
2828
- NumPy
2929

3030
If you are compiling and installing Slycot from source, you will need the
3131
following dependencies:
3232

33-
- Python 3.7+
33+
- Python 3.8+
3434
- NumPy
3535
- scikit-build
3636
- CMake
@@ -189,7 +189,7 @@ A similar method can be used for Linux and macOS, but is detailed here
189189
for Windows. This method uses conda and conda-forge to get most build
190190
dependencies, *except* for the C compiler.
191191

192-
This procedure has been tested on Python 3.7 and 3.8.
192+
This procedure has been tested on Python 3.8.
193193

194194
1. Install `Microsoft Visual Studio`_.
195195
2. Unpack the source code to a directory of your choice,

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ classifiers = [
2525
"Programming Language :: C",
2626
"Programming Language :: Fortran",
2727
"Programming Language :: Python",
28-
"Programming Language :: Python :: 3.7",
2928
"Programming Language :: Python :: 3.8",
3029
"Programming Language :: Python :: 3.9",
3130
"Programming Language :: Python :: 3.10",
@@ -37,7 +36,7 @@ classifiers = [
3736
"Operating System :: Unix",
3837
"Operating System :: MacOS",
3938
]
40-
requires-python = ">=3.7"
39+
requires-python = ">=3.8"
4140
dependencies = [
4241
"numpy",
4342
]

0 commit comments

Comments
 (0)