From 68a1407c67e273934de888340ea3e20ca63ce028 Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Tue, 5 Oct 2021 13:03:07 +1000 Subject: [PATCH 1/9] Update CI to the latest 3.10 release --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 137f74b72..0299afaf1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, windows-latest] - python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-rc.2] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10] env: PY_COLORS: 1 @@ -45,7 +45,7 @@ jobs: sudo apt install ffmpeg # For replaygain - name: Test older Python versions with tox - if: matrix.python-version != '3.9' && matrix.python-version != '3.10.0-rc.2' + if: matrix.python-version != '3.9' && matrix.python-version != '3.10' run: | tox -e py-test @@ -55,7 +55,7 @@ jobs: tox -vv -e py-cov - name: Test nightly Python version with tox - if: matrix.python-version == '3.10.0-rc.2' + if: matrix.python-version == '3.10' # continue-on-error is not ideal since it doesn't give a visible # warning, but there doesn't seem to be anything better: # https://github.com/actions/toolkit/issues/399 From eafef0d521c8205183082fa05de5d3710a3721e7 Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Tue, 5 Oct 2021 13:10:09 +1000 Subject: [PATCH 2/9] Versioning --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0299afaf1..f3a44fc8c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, windows-latest] - python-version: [3.6, 3.7, 3.8, 3.9, 3.10] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0] env: PY_COLORS: 1 @@ -45,7 +45,7 @@ jobs: sudo apt install ffmpeg # For replaygain - name: Test older Python versions with tox - if: matrix.python-version != '3.9' && matrix.python-version != '3.10' + if: matrix.python-version != '3.9' && matrix.python-version != '3.10.0' run: | tox -e py-test @@ -55,7 +55,7 @@ jobs: tox -vv -e py-cov - name: Test nightly Python version with tox - if: matrix.python-version == '3.10' + if: matrix.python-version == '3.10.0' # continue-on-error is not ideal since it doesn't give a visible # warning, but there doesn't seem to be anything better: # https://github.com/actions/toolkit/issues/399 From 400aece2a5612814fe1b7fc0ff779441be998599 Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Wed, 6 Oct 2021 07:35:05 +1000 Subject: [PATCH 3/9] Add quotes around versions --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f3a44fc8c..fb1d42ceb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, windows-latest] - python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10'] env: PY_COLORS: 1 @@ -45,7 +45,7 @@ jobs: sudo apt install ffmpeg # For replaygain - name: Test older Python versions with tox - if: matrix.python-version != '3.9' && matrix.python-version != '3.10.0' + if: matrix.python-version != '3.9' && matrix.python-version != '3.10' run: | tox -e py-test @@ -55,7 +55,7 @@ jobs: tox -vv -e py-cov - name: Test nightly Python version with tox - if: matrix.python-version == '3.10.0' + if: matrix.python-version == '3.10' # continue-on-error is not ideal since it doesn't give a visible # warning, but there doesn't seem to be anything better: # https://github.com/actions/toolkit/issues/399 From af5be3dbedf4fd66db3751648dd3f5c4a6dd443d Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Sat, 5 Feb 2022 21:55:31 +1000 Subject: [PATCH 4/9] Update CI for latest nightly --- .github/workflows/ci.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fb1d42ceb..4ae995b89 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, windows-latest] - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11-a05'] env: PY_COLORS: 1 @@ -45,17 +45,17 @@ jobs: sudo apt install ffmpeg # For replaygain - name: Test older Python versions with tox - if: matrix.python-version != '3.9' && matrix.python-version != '3.10' + if: matrix.python-version != '3.10' && matrix.python-version != '3.11-a05' run: | tox -e py-test - name: Test latest Python version with tox and get coverage - if: matrix.python-version == '3.9' + if: matrix.python-version == '3.10' run: | tox -vv -e py-cov - name: Test nightly Python version with tox - if: matrix.python-version == '3.10' + if: matrix.python-version == '3.11-a05' # continue-on-error is not ideal since it doesn't give a visible # warning, but there doesn't seem to be anything better: # https://github.com/actions/toolkit/issues/399 @@ -64,7 +64,7 @@ jobs: tox -e py-test - name: Upload code coverage - if: matrix.python-version == '3.9' + if: matrix.python-version == '3.10' run: | pip install codecov || true codecov || true @@ -78,10 +78,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.10 - name: Install base dependencies run: | @@ -100,10 +100,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.10 - name: Install base dependencies run: | From ec010d49509a34e9d594c4f3062776360af17ec6 Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Sat, 5 Feb 2022 22:01:25 +1000 Subject: [PATCH 5/9] Naming and quoting --- .github/workflows/ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4ae995b89..62cb36914 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, windows-latest] - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11-a05'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11.0-alpha.5'] env: PY_COLORS: 1 @@ -45,7 +45,7 @@ jobs: sudo apt install ffmpeg # For replaygain - name: Test older Python versions with tox - if: matrix.python-version != '3.10' && matrix.python-version != '3.11-a05' + if: matrix.python-version != '3.10' && matrix.python-version != '3.11.0-alpha.5' run: | tox -e py-test @@ -55,7 +55,7 @@ jobs: tox -vv -e py-cov - name: Test nightly Python version with tox - if: matrix.python-version == '3.11-a05' + if: matrix.python-version == '3.11.0-alpha.5' # continue-on-error is not ideal since it doesn't give a visible # warning, but there doesn't seem to be anything better: # https://github.com/actions/toolkit/issues/399 @@ -81,7 +81,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v2 with: - python-version: 3.10 + python-version: '3.10' - name: Install base dependencies run: | @@ -103,7 +103,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v2 with: - python-version: 3.10 + python-version: '3.10' - name: Install base dependencies run: | From b24ed6e78203d911900d41911a48dbb3328bde3d Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Sun, 6 Feb 2022 08:44:55 +1000 Subject: [PATCH 6/9] Update tox as well --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 95f250f96..1c0a984ed 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ commands = lint: python -m flake8 {posargs} {[_lint]files} [testenv:docs] -basepython = python3.9 +basepython = python3.10 deps = sphinx<4.4.0 commands = sphinx-build -W -q -b html docs {envtmpdir}/html {posargs} From 21dbb0436004438c3970576906a4c40b992e81d6 Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Sun, 6 Feb 2022 08:49:56 +1000 Subject: [PATCH 7/9] Try just py3.11 --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 62cb36914..dc0454d89 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, windows-latest] - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11.0-alpha.5'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] env: PY_COLORS: 1 @@ -45,7 +45,7 @@ jobs: sudo apt install ffmpeg # For replaygain - name: Test older Python versions with tox - if: matrix.python-version != '3.10' && matrix.python-version != '3.11.0-alpha.5' + if: matrix.python-version != '3.10' && matrix.python-version != '3.11' run: | tox -e py-test @@ -55,7 +55,7 @@ jobs: tox -vv -e py-cov - name: Test nightly Python version with tox - if: matrix.python-version == '3.11.0-alpha.5' + if: matrix.python-version == '3.11' # continue-on-error is not ideal since it doesn't give a visible # warning, but there doesn't seem to be anything better: # https://github.com/actions/toolkit/issues/399 From 4a9771430e9aea2659b9249387a08b7252d2b0cb Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Sun, 6 Feb 2022 09:41:23 +1000 Subject: [PATCH 8/9] Try a subversion of 3.11 --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dc0454d89..07ac5f51e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, windows-latest] - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11.0'] env: PY_COLORS: 1 @@ -45,7 +45,7 @@ jobs: sudo apt install ffmpeg # For replaygain - name: Test older Python versions with tox - if: matrix.python-version != '3.10' && matrix.python-version != '3.11' + if: matrix.python-version != '3.10' && matrix.python-version != '3.11.0' run: | tox -e py-test @@ -55,7 +55,7 @@ jobs: tox -vv -e py-cov - name: Test nightly Python version with tox - if: matrix.python-version == '3.11' + if: matrix.python-version == '3.11.0' # continue-on-error is not ideal since it doesn't give a visible # warning, but there doesn't seem to be anything better: # https://github.com/actions/toolkit/issues/399 From af7f29491e2c63aae359f8abcee9038f78c03c44 Mon Sep 17 00:00:00 2001 From: Andrew Rogl Date: Mon, 13 Jun 2022 18:26:30 +1000 Subject: [PATCH 9/9] Update pyhon versions --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 07ac5f51e..b3472e412 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, windows-latest] - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11.0'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11-dev'] env: PY_COLORS: 1 @@ -45,7 +45,7 @@ jobs: sudo apt install ffmpeg # For replaygain - name: Test older Python versions with tox - if: matrix.python-version != '3.10' && matrix.python-version != '3.11.0' + if: matrix.python-version != '3.10' && matrix.python-version != '3.11-dev' run: | tox -e py-test @@ -55,7 +55,7 @@ jobs: tox -vv -e py-cov - name: Test nightly Python version with tox - if: matrix.python-version == '3.11.0' + if: matrix.python-version == '3.11-dev' # continue-on-error is not ideal since it doesn't give a visible # warning, but there doesn't seem to be anything better: # https://github.com/actions/toolkit/issues/399