From 257b617e393a31db15529c90ff6baacb7aa57e9e Mon Sep 17 00:00:00 2001 From: Nikita Karamov Date: Tue, 27 Jun 2023 18:57:44 +0200 Subject: [PATCH 1/5] Add Python 3.12, Django 4.2 Also use 'include' instead of 'exclude' for more readability --- .github/workflows/test.yml | 46 ++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed22d6e..374e6c1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,32 +9,50 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] - django-version: ['3.2', '4.0', '4.1', 'main'] - exclude: + # https://docs.djangoproject.com/faq/install/#what-python-version-can-i-use-with-django + include: - django-version: '3.2' - python-version: '3.11' + python-version: '3.6' + - django-version: '3.2' + python-version: '3.7' + - django-version: '3.2' + python-version: '3.8' + - django-version: '3.2' + python-version: '3.9' + - django-version: '3.2' + python-version: '3.10' - django-version: '4.0' - python-version: '3.6' + python-version: '3.8' - django-version: '4.0' - python-version: '3.7' + python-version: '3.9' - django-version: '4.0' - python-version: '3.11' + python-version: '3.10' - django-version: '4.1' - python-version: '3.6' + python-version: '3.8' - django-version: '4.1' - python-version: '3.7' + python-version: '3.9' + - django-version: '4.1' + python-version: '3.10' + - django-version: '4.1' + python-version: '3.11' + + - django-version: '4.2' + python-version: '3.8' + - django-version: '4.2' + python-version: '3.9' + - django-version: '4.2' + python-version: '3.10' + - django-version: '4.2' + python-version: '3.11' - django-version: 'main' - python-version: '3.6' - - django-version: 'main' - python-version: '3.7' + python-version: '3.10' - django-version: 'main' - python-version: '3.8' + python-version: '3.11' - django-version: 'main' - python-version: '3.9' + python-version: '3.12' steps: - uses: actions/checkout@v3 From 5b3bbaea3203ec9da9fa4e9cc5c603f9112d9de9 Mon Sep 17 00:00:00 2001 From: Nikita Karamov Date: Tue, 27 Jun 2023 19:00:40 +0200 Subject: [PATCH 2/5] Use pip cache from setup-python --- .github/workflows/test.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 374e6c1..d94894b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,20 +61,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - - name: Get pip cache dir - id: pip-cache - run: | - echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT - - - name: Cache - uses: actions/cache@v3 - with: - path: ${{ steps.pip-cache.outputs.dir }} - key: - ${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.cfg') }}-${{ hashFiles('**/tox.ini') }} - restore-keys: | - ${{ matrix.python-version }}-v1- + cache: pip - name: Install dependencies run: | From cdb83c1e9f64d305ba5ee324e56b43ca52577ad8 Mon Sep 17 00:00:00 2001 From: Nikita Karamov Date: Tue, 27 Jun 2023 19:00:48 +0200 Subject: [PATCH 3/5] Fix 3.12 not available --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d94894b..c89ddb3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,6 +61,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + allow-prereleases: true cache: pip - name: Install dependencies From 3fbb02630d018a1ee32593271dc5b977e0df6565 Mon Sep 17 00:00:00 2001 From: Nikita Karamov Date: Tue, 27 Jun 2023 19:03:19 +0200 Subject: [PATCH 4/5] Update running triggers Make CI run only on pushes to master + tags, so that PRs do not get double runs --- .github/workflows/test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c89ddb3..eec551c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,11 @@ name: Test -on: [push, pull_request] +on: + push: + branches: [master] + tags: ["*"] + pull_request: + branches: [master] jobs: build: From 499311a1ce9196ca95ea9a7a603286bede17d966 Mon Sep 17 00:00:00 2001 From: Nikita Karamov Date: Tue, 27 Jun 2023 19:10:11 +0200 Subject: [PATCH 5/5] Update versions in tox.ini --- tox.ini | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index c2a653d..4a703c9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,12 @@ [tox] usedevelop = true +; https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django envlist = - py{36,37,38,39,310}-dj32 - py{38,39,310}-dj40 - py{38,39,310,311}-dj41 - py{310,311}-djmain + py3{6,7,8,9,10}-dj32 + py3{8,9,10}-dj40 + py3{8,9,10,11}-dj41 + py3{8,9,10,11}-dj42 + py3{10,11,12}-djmain [gh-actions] python = @@ -14,12 +16,14 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [gh-actions:env] DJANGO = 3.2: dj32 4.0: dj40 4.1: dj41 + 4.2: dj42 main: djmain [testenv] @@ -28,7 +32,8 @@ deps = coverage dj32: Django~=3.2.16 dj40: Django~=4.0.8 - dj41: Django~=4.1.2 + dj41: Django~=4.1.3 + dj42: Django~=4.2.1 djmain: https://github.com/django/django/tarball/main setenv = DJANGO_SETTINGS_MODULE=simple_menu.test_settings