From b8ff387fd7f24ad745425579d769d12fdf76c96c Mon Sep 17 00:00:00 2001 From: Matthew McLaughlin Date: Thu, 5 Sep 2024 16:32:18 -0700 Subject: [PATCH 1/5] wip: fix gh actions --- .github/workflows/main.yml | 18 ++++++++++++++++-- tox.ini | 6 ++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ab4b7c3..8f5bb4f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ env: COVERAGE_PYTHON_VERSION: "3.12" jobs: - tests: + tests: name: "Python ${{ matrix.python-version }}" runs-on: "ubuntu-latest" @@ -22,6 +22,19 @@ jobs: python-version: ["3.10", "3.11", "3.12"] steps: + # - uses: actions/checkout@v3 + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v4 + # with: + # python-version: ${{ matrix.python-version }} + # - name: Install dependencies + # run: | + # python -m pip install --upgrade pip + # python -m pip install tox tox-gh-actions + # - name: Test with tox + # run: tox + + - uses: "actions/checkout@v4" - uses: "actions/setup-python@v5" with: @@ -34,7 +47,8 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install --upgrade coverage[toml] tox tox-gh-actions - name: "Run tox targets for ${{ matrix.python-version }}" - run: "python -m tox" + # run: "python -m tox" + run: tox # use a modern Python version for code coverage - uses: "actions/setup-python@v5" diff --git a/tox.ini b/tox.ini index ebede07..035e180 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,12 @@ envlist = lint py{310, 311, 312}-{base,s3} +[gh-actions] +python = + 3.10: lint, py-base, py-s3 + 3.11: lint, py-base, py-s3 + 3.12: lint, py-base, py-s3 + [testenv] usedevelop = True deps = From 6c5cec771180a210c6f6976415b413d6425f9360 Mon Sep 17 00:00:00 2001 From: Matthew McLaughlin Date: Thu, 5 Sep 2024 16:34:44 -0700 Subject: [PATCH 2/5] kickoff ghaction on test branch --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f5bb4f..ceec54b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: ["master"] + branches: ["chore/migrate_github_actions_tox_github"] tags: - "v[0-9].[0-9].[0-9]*" pull_request: From 7f83c16e4b48c6a788127a6ccc3d528cca3bc666 Mon Sep 17 00:00:00 2001 From: Matthew McLaughlin Date: Thu, 5 Sep 2024 16:40:25 -0700 Subject: [PATCH 3/5] fix matrix --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 035e180..c4a8193 100644 --- a/tox.ini +++ b/tox.ini @@ -5,9 +5,9 @@ envlist = [gh-actions] python = - 3.10: lint, py-base, py-s3 - 3.11: lint, py-base, py-s3 - 3.12: lint, py-base, py-s3 + 3.10: lint, py + 3.11: lint, py + 3.12: lint, py [testenv] usedevelop = True From fe00b16fadaa0380808eb479df0d7a3eccf96a08 Mon Sep 17 00:00:00 2001 From: Matthew McLaughlin Date: Thu, 5 Sep 2024 16:43:36 -0700 Subject: [PATCH 4/5] fix matrix 2 --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index c4a8193..6b31f3e 100644 --- a/tox.ini +++ b/tox.ini @@ -5,9 +5,9 @@ envlist = [gh-actions] python = - 3.10: lint, py - 3.11: lint, py - 3.12: lint, py + 3.10: lint, py310 + 3.11: lint, py311 + 3.12: lint, py312 [testenv] usedevelop = True From 9663b12b00ecc6f44a2f97b7e2dc818b1a22067a Mon Sep 17 00:00:00 2001 From: Matthew McLaughlin Date: Thu, 5 Sep 2024 16:47:29 -0700 Subject: [PATCH 5/5] cleanup --- .github/workflows/main.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ceec54b..46cadf2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: ["chore/migrate_github_actions_tox_github"] + branches: ["master"] tags: - "v[0-9].[0-9].[0-9]*" pull_request: @@ -13,7 +13,7 @@ env: COVERAGE_PYTHON_VERSION: "3.12" jobs: - tests: + tests: name: "Python ${{ matrix.python-version }}" runs-on: "ubuntu-latest" @@ -22,19 +22,6 @@ jobs: python-version: ["3.10", "3.11", "3.12"] steps: - # - uses: actions/checkout@v3 - # - name: Set up Python ${{ matrix.python-version }} - # uses: actions/setup-python@v4 - # with: - # python-version: ${{ matrix.python-version }} - # - name: Install dependencies - # run: | - # python -m pip install --upgrade pip - # python -m pip install tox tox-gh-actions - # - name: Test with tox - # run: tox - - - uses: "actions/checkout@v4" - uses: "actions/setup-python@v5" with: @@ -47,7 +34,6 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install --upgrade coverage[toml] tox tox-gh-actions - name: "Run tox targets for ${{ matrix.python-version }}" - # run: "python -m tox" run: tox # use a modern Python version for code coverage