From 25740310629a2dc305f5b561881073a84b63dbc1 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 07:37:02 -0300 Subject: [PATCH 01/10] Update actions on python-publish.yml --- .github/workflows/python-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 0376072..82ad4ab 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -13,9 +13,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.x' - name: Install dependencies From f16ccc6fd2501245075b65efe61ab9a0d7fff3eb Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 07:41:21 -0300 Subject: [PATCH 02/10] Update actions versions and add 3.10 and 3.11 --- .github/workflows/tests.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6a768f4..505b045 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,15 +24,20 @@ jobs: env: py38,flake8,mypy,black - py_version: '3.9' env: py39 + - py_version: '3.10' + env: py310 + - py_version: '3.11' + env: py311 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.tox.py_version }} - - uses: actions/cache@v2 - with: - path: .tox - key: ${{ matrix.os }}-${{ matrix.tox.python-version }}-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements-dev.txt') }} + cache: 'pip' + cache-dependency-path: | + **/setup.cfg + **/requirements*.txt + .tox - name: Install tox run: python3 -m pip install tox - name: Run tox From 02343b2aa469d9ac77d715f193e6be335e813084 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 07:43:02 -0300 Subject: [PATCH 03/10] Add 3.11 to tox.ini --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 4a5ade2..37c8e93 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ skip_covered = True show_missing = True [tox] -envlist = py3{6,7,8,9,10}, flake8, mypy, black, coverage +envlist = py3{6,7,8,9,10,11}, flake8, mypy, black, coverage skip_missing_interpreters = True [testenv] @@ -24,7 +24,7 @@ setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname} [testenv:coverage] -depends = py38, py39, py310 +depends = py38, py39, py310, py311 parallel_show_output = True skip_install = True setenv = COVERAGE_FILE={toxworkdir}/.coverage From 83e0aafe95d02298f012ffdfe583a3b102355873 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 07:43:56 -0300 Subject: [PATCH 04/10] Add workflow_dispatch to tests.yml Allows manual starting a workflow run --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 505b045..d65922f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,6 +1,7 @@ name: Tests on: + workflow_dispatch: push: branches: - master From c7dce24626d45e980add818a10d345ca65deba5a Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 07:46:59 -0300 Subject: [PATCH 05/10] Disable fail-fast --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d65922f..5d3c68d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,6 +14,7 @@ jobs: name: Run tox on ${{ matrix.os }} for Python ${{ matrix.tox.py_version }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [ubuntu-latest, macos-latest] tox: From 64199f8ddc591aacae67204ef852ca905eb683f4 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 08:13:14 -0300 Subject: [PATCH 06/10] disable env to try to run all testenv --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5d3c68d..648e810 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -43,4 +43,4 @@ jobs: - name: Install tox run: python3 -m pip install tox - name: Run tox - run: tox -q -p all -e ${{ matrix.tox.env }} + run: tox -q -p all From caf2d215664a42aa9e3c52fc399fbb6afe1f6d76 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 08:35:45 -0300 Subject: [PATCH 07/10] move tests env down, rewrite matrix --- .github/workflows/tests.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 648e810..87fccde 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,15 +15,17 @@ jobs: runs-on: ${{ matrix.os }} strategy: fail-fast: false + max-parallel: 5 matrix: os: [ubuntu-latest, macos-latest] - tox: + py_version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] + include: - py_version: '3.6' env: py36 - py_version: '3.7' env: py37 - py_version: '3.8' - env: py38,flake8,mypy,black + env: py38 - py_version: '3.9' env: py39 - py_version: '3.10' @@ -43,4 +45,4 @@ jobs: - name: Install tox run: python3 -m pip install tox - name: Run tox - run: tox -q -p all + run: tox -q -p all -e ${{ matrix.tox.env }},flake8,mypy,black From 1b0666166c6279992f589a1f674b517613f0b06a Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 08:38:23 -0300 Subject: [PATCH 08/10] Fix variables env and py_version --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 87fccde..309b5cb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ on: jobs: test: - name: Run tox on ${{ matrix.os }} for Python ${{ matrix.tox.py_version }} + name: Run tox on ${{ matrix.os }} for Python ${{ matrix.py_version }} runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: ${{ matrix.tox.py_version }} + python-version: ${{ matrix.py_version }} cache: 'pip' cache-dependency-path: | **/setup.cfg @@ -45,4 +45,4 @@ jobs: - name: Install tox run: python3 -m pip install tox - name: Run tox - run: tox -q -p all -e ${{ matrix.tox.env }},flake8,mypy,black + run: tox -q -p all -e ${{ matrix.env }},flake8,mypy,black From 9767ec83a4f05a77a6799c063b11948e066770f3 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 10:29:33 -0300 Subject: [PATCH 09/10] Revert caching with setup-python Caching tox didn't work --- .github/workflows/tests.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 309b5cb..17f26ae 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,11 +37,10 @@ jobs: - uses: actions/setup-python@v4 with: python-version: ${{ matrix.py_version }} - cache: 'pip' - cache-dependency-path: | - **/setup.cfg - **/requirements*.txt - .tox + - uses: actions/cache@v3 + with: + path: .tox + key: ${{ matrix.os }}-${{ matrix.tox.python-version }}-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements-dev.txt') }} - name: Install tox run: python3 -m pip install tox - name: Run tox From 4d902b394b0d6a085547b70263db6a58cd337273 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Mon, 28 Nov 2022 11:04:50 -0300 Subject: [PATCH 10/10] Fix matrix variable name used in action/cache --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 17f26ae..ec93a66 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/cache@v3 with: path: .tox - key: ${{ matrix.os }}-${{ matrix.tox.python-version }}-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements-dev.txt') }} + key: ${{ matrix.os }}-${{ matrix.py_version }}-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements-dev.txt') }} - name: Install tox run: python3 -m pip install tox - name: Run tox