From 9e1048c8efb2f25c2956dd27c6cc0aaa35473370 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Sun, 20 Nov 2022 15:19:51 +0100 Subject: [PATCH 1/7] Add Python 3.11 classifier --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 89690ac8d..691ea4643 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,7 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Topic :: Software Development", "Topic :: Scientific/Engineering", "Operating System :: Microsoft :: Windows", From f9cacd7ad562cce9fe2562b5152d5df303ae831b Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Sun, 20 Nov 2022 15:18:43 +0100 Subject: [PATCH 2/7] bump upper conda version to 3.11 --- .github/workflows/python-package-conda.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 459f9e69d..6a41a7227 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -17,14 +17,14 @@ jobs: max-parallel: 5 fail-fast: false matrix: - python-version: ['3.7', '3.10'] + python-version: ['3.7', '3.11'] slycot: ["", "conda"] pandas: [""] cvxopt: ["", "conda"] mplbackend: [""] array-and-matrix: [0] include: - - python-version: '3.10' + - python-version: '3.11' slycot: conda pandas: conda cvxopt: conda From d18e49655680bdd7f3f962c14347b30997d2a81e Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Sun, 20 Nov 2022 15:19:15 +0100 Subject: [PATCH 3/7] bump setup-python action tag --- .github/workflows/control-slycot-src.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/control-slycot-src.yml b/.github/workflows/control-slycot-src.yml index 2ce2a11dd..8d1e1cdf2 100644 --- a/.github/workflows/control-slycot-src.yml +++ b/.github/workflows/control-slycot-src.yml @@ -12,7 +12,7 @@ jobs: with: path: python-control - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 - name: Install Python dependencies and test tools run: pip install -v -e './python-control[test]' From d95e29e521ae8bd984c63c7519b8073e0b801141 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Sun, 20 Nov 2022 15:23:11 +0100 Subject: [PATCH 4/7] rename jobs --- .github/workflows/install_examples.yml | 2 +- .github/workflows/python-package-conda.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/install_examples.yml b/.github/workflows/install_examples.yml index 84cd706f5..d50f8fda6 100644 --- a/.github/workflows/install_examples.yml +++ b/.github/workflows/install_examples.yml @@ -3,7 +3,7 @@ name: Setup, Examples, Notebooks on: [push, pull_request] jobs: - build-linux: + install-examples: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 6a41a7227..1c4411ec6 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -3,7 +3,7 @@ name: Conda-based pytest on: [push, pull_request] jobs: - test-linux: + test-linux-conda: name: > Py${{ matrix.python-version }}; ${{ matrix.slycot || 'no' }} Slycot; @@ -75,7 +75,7 @@ jobs: coveralls: name: coveralls completion - needs: test-linux + needs: test-linux-conda runs-on: ubuntu-latest steps: - name: Coveralls Finished From 511ea46c46ed8183ea03eb8f4637e60ce2b89358 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Sun, 20 Nov 2022 15:24:29 +0100 Subject: [PATCH 5/7] do not install PEP517 in editable mode --- .github/workflows/control-slycot-src.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/control-slycot-src.yml b/.github/workflows/control-slycot-src.yml index 8d1e1cdf2..bc80d84f5 100644 --- a/.github/workflows/control-slycot-src.yml +++ b/.github/workflows/control-slycot-src.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 - name: Install Python dependencies and test tools - run: pip install -v -e './python-control[test]' + run: pip install -v './python-control[test]' - name: Checkout Slycot uses: actions/checkout@v3 From c9e4064934495a73b4dc1bace69934a58b739e87 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Sun, 20 Nov 2022 15:30:45 +0100 Subject: [PATCH 6/7] hardcode python version in slycot-src workflow --- .github/workflows/control-slycot-src.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/control-slycot-src.yml b/.github/workflows/control-slycot-src.yml index bc80d84f5..811a89216 100644 --- a/.github/workflows/control-slycot-src.yml +++ b/.github/workflows/control-slycot-src.yml @@ -13,6 +13,8 @@ jobs: path: python-control - name: Set up Python uses: actions/setup-python@v4 + with: + python-version: '3.11' - name: Install Python dependencies and test tools run: pip install -v './python-control[test]' From e46f22e6602242c5b1a821367ffb0563bcf1a2ab Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Wed, 23 Nov 2022 16:22:37 +0100 Subject: [PATCH 7/7] Drop Python 3.7 --- .github/workflows/python-package-conda.yml | 2 +- pyproject.toml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 1c4411ec6..cea5e542f 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -17,7 +17,7 @@ jobs: max-parallel: 5 fail-fast: false matrix: - python-version: ['3.7', '3.11'] + python-version: ['3.8', '3.11'] slycot: ["", "conda"] pandas: [""] cvxopt: ["", "conda"] diff --git a/pyproject.toml b/pyproject.toml index 691ea4643..493594155 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,6 @@ classifiers = [ "Intended Audience :: Developers", "License :: OSI Approved :: BSD License", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -29,7 +28,7 @@ classifiers = [ "Operating System :: Unix", "Operating System :: MacOS", ] -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "numpy", "scipy>=1.3",