From fc1819841b989e8f52f88c7453e9746ab73b8eea Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 10 Jun 2024 16:37:32 +0900 Subject: [PATCH 1/9] build: exclude faulty images from build matrix --- .github/workflows/python.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 1083b7c..770d84c 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -13,6 +13,17 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11'] + exclude: + - os: macos-latest + python-version: '3.8' + - os: macos-latest + python-version: 'pypy3.8' + - os: macos-latest + python-version: '3.9' + - os: macos-latest + python-version: 'pypy3.9' + - os: macos-latest + python-version: '3.10' steps: - uses: actions/checkout@v4 From d6daed496691f04950c917e635e02533c4d864d0 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 10 Jun 2024 17:19:19 +0900 Subject: [PATCH 2/9] build: use macos-13 for older python versions --- .github/workflows/python.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 770d84c..2f7fb78 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -11,19 +11,21 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, windows-latest] python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11'] - exclude: - - os: macos-latest + include: + - os: macos-13 python-version: '3.8' - - os: macos-latest + - os: macos-13 python-version: 'pypy3.8' - - os: macos-latest + - os: macos-13 python-version: '3.9' - - os: macos-latest + - os: macos-13 python-version: 'pypy3.9' - - os: macos-latest + - os: macos-13 python-version: '3.10' + - os: macos-latest + python-version: '3.11' steps: - uses: actions/checkout@v4 From 90cc6b1aee281bf53b49ceacbd7517c382b93fd1 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 10 Jun 2024 19:24:35 +0900 Subject: [PATCH 3/9] build: add python 3.12 --- .github/workflows/python.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 2f7fb78..59931ce 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11'] + python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11', '3.12'] include: - os: macos-13 python-version: '3.8' @@ -26,6 +26,8 @@ jobs: python-version: '3.10' - os: macos-latest python-version: '3.11' + - os: macos-latest + python-version: '3.12' steps: - uses: actions/checkout@v4 From f573c459f1cb4fa9e9d00757023dfb0e97a4d80f Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 10 Jun 2024 19:29:14 +0900 Subject: [PATCH 4/9] build: use 3.12 on Jenkins --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5af78e5..333b73f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.11" +ARG PYTHON_VERSION="3.12" FROM python:${PYTHON_VERSION} From d2d2e9926be8e834addc230459fc5546c8234d61 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 10 Jun 2024 20:03:38 +0900 Subject: [PATCH 5/9] chore: change the way macos version is pinned --- .github/workflows/python.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 59931ce..5bed92e 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -11,8 +11,19 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11', '3.12'] + exclude: + - os: macos-latest + python-version: '3.8' + - os: macos-latest + python-version: 'pypy3.8' + - os: macos-latest + python-version: '3.9' + - os: macos-latest + python-version: 'pypy3.9' + - os: macos-latest + python-version: '3.10' include: - os: macos-13 python-version: '3.8' @@ -24,11 +35,6 @@ jobs: python-version: 'pypy3.9' - os: macos-13 python-version: '3.10' - - os: macos-latest - python-version: '3.11' - - os: macos-latest - python-version: '3.12' - steps: - uses: actions/checkout@v4 with: From a26ad89f1f4c2f53b3763c8a62d048f31b74303a Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 10 Jun 2024 20:04:41 +0900 Subject: [PATCH 6/9] build: don't build 3.12 on github --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 5bed92e..482bb37 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11'] exclude: - os: macos-latest python-version: '3.8' From a2deffa7a8d704b5cdfc7fd7a3c45fbe9094f009 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 10 Jun 2024 20:07:15 +0900 Subject: [PATCH 7/9] build: housekeeping --- .github/workflows/python.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 482bb37..f1a1520 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -42,7 +42,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - architecture: x64 - run: pip install -r requirements_ci.txt - run: git clone https://github.com/PyCQA/pycodestyle ../pycodestyle - run: cd ../pycodestyle && python setup.py build && cd - From aa5e2bcb9a311c205ad91bf5f38df9d5bb4d6aba Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 10 Jun 2024 21:12:34 +0900 Subject: [PATCH 8/9] build: re-add 3.12 --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index f1a1520..cb4d336 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11'] + python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11', '3.12.3'] exclude: - os: macos-latest python-version: '3.8' From 8db6c42b951b3b2edf083cd774d457b9c40e0869 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Tue, 11 Jun 2024 11:55:02 +0900 Subject: [PATCH 9/9] build: make version less specific --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index cb4d336..b538c2e 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11', '3.12.3'] + python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11', '3.12'] exclude: - os: macos-latest python-version: '3.8'