From e210774877d21a29fe0e23aca41c0c6171b4e48a Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Sun, 21 Jan 2024 16:17:06 -0800 Subject: [PATCH 01/19] I don't really know this did something locally.. --- tox.ini | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 2049123..1bf9866 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,12 @@ DB = sqlite: sqlite [testenv] -install_command = pip install -e ".[testing]" -U {opts} {packages} +install_command = python -m pip install -e ".[testing]" -U {opts} {packages} + +commands_pre = + # Mostly to check that the requirements are in order + python -m pip freeze + commands = # Run coverage in append mode so that we get a combined report over all environments. # This can not be combined with parallel mode. @@ -35,9 +40,9 @@ basepython = python3.11: python3.11 deps = - # Coverage is required here (even though it's in pyproject.toml) to make it work on GitHub Actions - coverage - +; # Coverage is required here (even though it's in pyproject.toml) to make it work on GitHub Actions +; coverage +; django3.2: Django>=3.2,<4.0 django4.0: Django>=4.0,<4.1 django4.1: Django>=4.1,<4.2 From 937059ac27fa7ab661d87021a409d3513e5e00c9 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Sun, 21 Jan 2024 16:24:34 -0800 Subject: [PATCH 02/19] Show more output --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f343ce3..51d7e1c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install .[ci] - name: Test - run: tox + run: tox -vv env: DB: sqlite - name: Upload coverage reports to Codecov From b2f95c620d488e4717bad9bd793f9cb7b7a0d382 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Sun, 21 Jan 2024 16:50:04 -0800 Subject: [PATCH 03/19] Use the native "extras" declaration instead of custom install command --- tox.ini | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 1bf9866..07fc015 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -skipsdist = True -usedevelop = True +;skipsdist = True +;usedevelop = True envlist = python{3.8,3.9,3.10,3.11}-django{3.2,4.1,4.2} @@ -17,7 +17,9 @@ DB = sqlite: sqlite [testenv] -install_command = python -m pip install -e ".[testing]" -U {opts} {packages} +;install_command = python -m pip install -e ".[testing]" -U {opts} {packages} +package = editable +extras = testing commands_pre = # Mostly to check that the requirements are in order From 0f75051f0ad0f8357b28e33e1c0d4a2c479d3eb5 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Sun, 21 Jan 2024 16:54:13 -0800 Subject: [PATCH 04/19] Bump CI tools --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e94b429..2338d6d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,8 +37,8 @@ testing = [ "coverage==7.3.4", ] ci = [ - "tox==4.11.3", - "tox-gh-actions==3.1.3", + "tox==4.12.1", + "tox-gh-actions==3.2.0", # Allow use of pyenv for virtual environments. To enable you need to set `VIRTUALENV_DISCOVERY=pyenv` in the shell. # This is useful to help tox find the correct python version when using pyenv. "virtualenv-pyenv==0.4.0" From cd268785d412812b02bfdd2afc5fdecead828433 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Sun, 21 Jan 2024 17:06:05 -0800 Subject: [PATCH 05/19] Remove the outdated code --- tox.ini | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tox.ini b/tox.ini index 07fc015..06d73ad 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,4 @@ [tox] -;skipsdist = True -;usedevelop = True - envlist = python{3.8,3.9,3.10,3.11}-django{3.2,4.1,4.2} @@ -17,7 +14,6 @@ DB = sqlite: sqlite [testenv] -;install_command = python -m pip install -e ".[testing]" -U {opts} {packages} package = editable extras = testing @@ -29,6 +25,7 @@ commands = # Run coverage in append mode so that we get a combined report over all environments. # This can not be combined with parallel mode. # This only affects local working, because each env is run on a different runner in CI. + # In CI, Codecov will combine the reports. coverage run -a testmanage.py test --deprecation all {posargs: -v 2} commands_post = @@ -42,9 +39,6 @@ basepython = python3.11: python3.11 deps = -; # Coverage is required here (even though it's in pyproject.toml) to make it work on GitHub Actions -; coverage -; django3.2: Django>=3.2,<4.0 django4.0: Django>=4.0,<4.1 django4.1: Django>=4.1,<4.2 From 531242316432c605f0024e467d1966f0f48c7b6a Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Sun, 21 Jan 2024 17:11:01 -0800 Subject: [PATCH 06/19] Use normal output level again in CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 51d7e1c..f343ce3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install .[ci] - name: Test - run: tox -vv + run: tox env: DB: sqlite - name: Upload coverage reports to Codecov From 6ed6589282fda4a1ce934b565b180580c0f66a26 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Wed, 24 Jan 2024 19:40:47 -0800 Subject: [PATCH 07/19] Remove the unnecessary environment setting via envar See also: https://github.com/ymyzk/tox-gh-actions/discussions/193 --- tox.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tox.ini b/tox.ini index 06d73ad..8bc75e1 100644 --- a/tox.ini +++ b/tox.ini @@ -9,10 +9,6 @@ python = 3.10: python3.10 3.11: python3.11 -[gh-actions:env] -DB = - sqlite: sqlite - [testenv] package = editable extras = testing From a1865d78866acec9de3572794fdc9445fee6ecef Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Wed, 24 Jan 2024 19:47:00 -0800 Subject: [PATCH 08/19] Remove unnecessary sqlite reference from job name --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f343ce3..459b15a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: python-version: '3.8' - uses: pre-commit/action@v3.0.0 - test-sqlite: + test: runs-on: ubuntu-latest needs: lint strategy: @@ -47,8 +47,6 @@ jobs: python -m pip install .[ci] - name: Test run: tox - env: - DB: sqlite - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 env: From 523355da4c8391f8662f60d6e7e51bebc6963931 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Wed, 24 Jan 2024 19:57:01 -0800 Subject: [PATCH 09/19] Back to the original tox installation command --- tox.ini | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 8bc75e1..e972309 100644 --- a/tox.ini +++ b/tox.ini @@ -1,4 +1,7 @@ [tox] +skipsdist = True +usedevelop = True + envlist = python{3.8,3.9,3.10,3.11}-django{3.2,4.1,4.2} @@ -10,8 +13,9 @@ python = 3.11: python3.11 [testenv] -package = editable -extras = testing +;package = editable +;extras = testing +install_command = python -m pip install -e ".[testing]" {opts} {packages} commands_pre = # Mostly to check that the requirements are in order From 4d893c237adc5d719ee7464f8802e49fc37542de Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Wed, 24 Jan 2024 20:02:32 -0800 Subject: [PATCH 10/19] Revert "Back to the original tox installation command" This reverts commit b8a7e677c3d05b479919e94ed7191fdac6b9c956. --- tox.ini | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index e972309..8bc75e1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,4 @@ [tox] -skipsdist = True -usedevelop = True - envlist = python{3.8,3.9,3.10,3.11}-django{3.2,4.1,4.2} @@ -13,9 +10,8 @@ python = 3.11: python3.11 [testenv] -;package = editable -;extras = testing -install_command = python -m pip install -e ".[testing]" {opts} {packages} +package = editable +extras = testing commands_pre = # Mostly to check that the requirements are in order From 27e91fe4bcabda3ce2045ca433fcbe16659bfe25 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Thu, 25 Jan 2024 19:40:44 -0800 Subject: [PATCH 11/19] Bump checkout action to v4 --- .github/workflows/nightly.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8ee7592..e5ea3a7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -13,7 +13,7 @@ jobs: WEBHOOK_EXISTS: ${{ secrets.SLACK_WEBHOOK_URL != '' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: '3.11' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 422d322..d96fe64 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ jobs: permissions: contents: read # to fetch code (actions/checkout) steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 459b15a..52c4b2b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Python 3.8 @@ -36,7 +36,7 @@ jobs: python: ['3.8', '3.9', '3.10', '3.11'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python }} uses: actions/setup-python@v4 with: From 2fbd61bb4ae5db20499692409e25fd021dd362f9 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Thu, 25 Jan 2024 19:43:42 -0800 Subject: [PATCH 12/19] Bump setup-python action to v5 --- .github/workflows/nightly.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e5ea3a7..4a2016d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.11' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d96fe64..82bd41f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,7 +17,7 @@ jobs: fetch-depth: 0 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 52c4b2b..171e865 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.8' - uses: pre-commit/action@v3.0.0 @@ -38,7 +38,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} - name: Install From c36e664b367e21d0e40ff2e15e2c123fb9bc41ab Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Thu, 25 Jan 2024 20:20:44 -0800 Subject: [PATCH 13/19] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae4d1f6..72d1ebc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Add more tests and example usage. +- Extended documentation in [README](./README.md). ### Changed From 264d832f18d6d56a26dfee38f40eea31fd7f772e Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Thu, 25 Jan 2024 20:24:40 -0800 Subject: [PATCH 14/19] Update CHANGELOG --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d1ebc..8209be0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,12 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Add more tests and example usage. -- Extended documentation in [README](./README.md). +- Add more tests and example usage. ([#6](https://github.com/tbrlpld/laces/pull/6)) +- Extended documentation in [README](./README.md). ([#7](https://github.com/tbrlpld/laces/pull/7)) ### Changed -- ... +- Fixed tox configuration to actually run Django 3.2 in CI. Tox also uses the "testing" dependencies without the need to duplicate them in the `tox.ini`. ([#7](https://github.com/tbrlpld/laces/pull/7)) ### Removed From f592346dd4d7bc077ae9ce7d22d4fbd01d1f142f Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Thu, 25 Jan 2024 20:25:12 -0800 Subject: [PATCH 15/19] Fix CHANGELOG heading --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8209be0..82b0cf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# laces Changelog +# Laces Changelog All notable changes to this project will be documented in this file. From d75230fb4012a1fbf2b0b14ebe86dd3501996c27 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Thu, 25 Jan 2024 20:27:18 -0800 Subject: [PATCH 16/19] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82b0cf8..89210d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Fixed tox configuration to actually run Django 3.2 in CI. Tox also uses the "testing" dependencies without the need to duplicate them in the `tox.ini`. ([#7](https://github.com/tbrlpld/laces/pull/7)) +- Bumped GitHub Actions to latest versions. This removes a reliance on the now deprecated Node 16. ([#11](https://github.com/tbrlpld/laces/pull/11)) ### Removed From 291d1ea2f9667d8c4b6f5a8c28bcc9f80646bbb8 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Thu, 25 Jan 2024 20:29:19 -0800 Subject: [PATCH 17/19] Fix PR version number in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89210d0..e1cb80a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Fixed tox configuration to actually run Django 3.2 in CI. Tox also uses the "testing" dependencies without the need to duplicate them in the `tox.ini`. ([#7](https://github.com/tbrlpld/laces/pull/7)) +- Fixed tox configuration to actually run Django 3.2 in CI. Tox also uses the "testing" dependencies without the need to duplicate them in the `tox.ini`. ([#10](https://github.com/tbrlpld/laces/pull/10)) - Bumped GitHub Actions to latest versions. This removes a reliance on the now deprecated Node 16. ([#11](https://github.com/tbrlpld/laces/pull/11)) ### Removed From 4437f89b1e003e17d274416584996325059d713c Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Sat, 27 Jan 2024 09:38:58 -0800 Subject: [PATCH 18/19] Remove CHANGELOG entry that is not part of history anymore after rebase --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1cb80a..579f105 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Add more tests and example usage. ([#6](https://github.com/tbrlpld/laces/pull/6)) -- Extended documentation in [README](./README.md). ([#7](https://github.com/tbrlpld/laces/pull/7)) ### Changed From 41fa4245c382e50e457c3bbed5be2733b7c4d270 Mon Sep 17 00:00:00 2001 From: Tibor Leupold Date: Sat, 27 Jan 2024 09:43:10 -0800 Subject: [PATCH 19/19] Fix changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 579f105..4899357 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Fixed tox configuration to actually run Django 3.2 in CI. Tox also uses the "testing" dependencies without the need to duplicate them in the `tox.ini`. ([#10](https://github.com/tbrlpld/laces/pull/10)) -- Bumped GitHub Actions to latest versions. This removes a reliance on the now deprecated Node 16. ([#11](https://github.com/tbrlpld/laces/pull/11)) +- Bumped GitHub Actions to latest versions. This removes a reliance on the now deprecated Node 16. ([#10](https://github.com/tbrlpld/laces/pull/10)) ### Removed