Skip to content

Commit d891ed3

Browse files
authored
Merge pull request #182 from bnavigator/py311
Support Python 3.11
2 parents 2de58dd + b7f07e9 commit d891ed3

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: build-env
22
dependencies:
3-
- boa
4-
- numpy!=1.23.0
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

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
fetch-depth: 0
2424
submodules: 'recursive'
2525
- name: Set up Python
26-
uses: actions/setup-python@v2
26+
uses: actions/setup-python@v4
2727
with:
28-
python-version: 3.9
28+
python-version: '3.11'
2929
- name: Setup Ubuntu
3030
run: |
3131
sudo apt-get -y install gfortran cmake --fix-missing
@@ -58,23 +58,23 @@ jobs:
5858
- 'macos'
5959
python:
6060
- '3.7'
61-
- '3.10'
61+
- '3.11'
6262
bla_vendor: [ 'unset' ]
6363
include:
6464
- os: 'ubuntu'
65-
python: '3.10'
65+
python: '3.11'
6666
bla_vendor: 'Generic'
6767
- os: 'ubuntu'
68-
python: '3.10'
68+
python: '3.11'
6969
bla_vendor: 'OpenBLAS'
7070
- os: 'macos'
71-
python: '3.10'
71+
python: '3.11'
7272
bla_vendor: 'Apple'
7373
- os: 'macos'
74-
python: '3.10'
74+
python: '3.11'
7575
bla_vendor: 'Generic'
7676
- os: 'macos'
77-
python: '3.10'
77+
python: '3.11'
7878
bla_vendor: 'OpenBLAS'
7979

8080
steps:
@@ -84,7 +84,7 @@ jobs:
8484
fetch-depth: 0
8585
submodules: 'recursive'
8686
- name: Set up Python
87-
uses: actions/setup-python@v2
87+
uses: actions/setup-python@v4
8888
with:
8989
python-version: ${{ matrix.python }}
9090
- name: Setup Ubuntu
@@ -113,7 +113,7 @@ jobs:
113113
echo "bla_vendor option ${{ matrix.bla_vendor }} not supported"
114114
exit 1 ;;
115115
esac
116-
echo "FC=gfortran-10" >> $GITHUB_ENV
116+
echo "FC=gfortran-11" >> $GITHUB_ENV
117117
- name: Build wheel
118118
env:
119119
BLA_VENDOR: ${{ matrix.bla_vendor }}
@@ -144,7 +144,7 @@ jobs:
144144
- 'windows'
145145
python:
146146
- '3.9'
147-
- '3.10'
147+
- '3.11'
148148

149149
steps:
150150
- name: Checkout Slycot
@@ -168,7 +168,7 @@ jobs:
168168
run: |
169169
set -e
170170
numpyversion=$(python -c 'import numpy; print(numpy.version.version)')
171-
conda mambabuild --python "${{ matrix.python }}" --numpy $numpyversion conda-recipe
171+
conda build --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}"))
@@ -243,7 +243,7 @@ jobs:
243243
repository: 'python-control/python-control'
244244
path: python-control
245245
- name: Setup Python
246-
uses: actions/setup-python@v2
246+
uses: actions/setup-python@v4
247247
with:
248248
python-version: ${{ matrix.python }}
249249
- name: Setup Ubuntu

README.rst

Lines changed: 3 additions & 3 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.6 or later.
22+
Slycot supports Python versions 3.7 or later.
2323

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

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

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

33-
- 3.6+
33+
- Python 3.7+
3434
- NumPy
3535
- scikit-build
3636
- CMake

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ classifiers = [
2929
"Programming Language :: Python :: 3.8",
3030
"Programming Language :: Python :: 3.9",
3131
"Programming Language :: Python :: 3.10",
32+
"Programming Language :: Python :: 3.11",
3233
"Topic :: Software Development",
3334
"Topic :: Scientific/Engineering",
3435
"Operating System :: Microsoft :: Windows",

0 commit comments

Comments
 (0)