From 352d95b2ab5f1a5c645b9add151e82a87a3eca20 Mon Sep 17 00:00:00 2001 From: Paolo Melchiorre Date: Thu, 19 Jan 2023 18:06:05 +0100 Subject: [PATCH] Update github actions and fix pipeline --- .github/workflows/release.yml | 10 +++++----- .github/workflows/test.yml | 14 +++++++------- LICENSE | 2 +- docs/conf.py | 2 +- tests/test_values.py | 1 + tox.ini | 4 ++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index efe7015..3c09267 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,12 +11,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 @@ -26,7 +26,7 @@ jobs: echo "::set-output name=dir::$(pip cache dir)" - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache.outputs.dir }} key: release-${{ hashFiles('**/setup.py') }} @@ -35,8 +35,8 @@ jobs: - name: Install dependencies run: | - python -m pip install -U pip - python -m pip install -U setuptools twine wheel + python -m pip install --upgrade pip + python -m pip install --upgrade setuptools twine wheel - name: Build package run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a93dedb..c2b2b88 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,20 +16,20 @@ jobs: python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Get pip cache dir id: pip-cache run: | - echo "::set-output name=dir::$(pip cache dir)" + echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache.outputs.dir }} key: @@ -40,14 +40,14 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install --upgrade tox tox-gh-actions + python -m pip install --upgrade "tox<4" "tox-gh-actions<3" - name: Tox tests run: | - tox -v + tox --verbose - name: Upload coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 with: name: Python ${{ matrix.python-version }} fail_ci_if_error: true diff --git a/LICENSE b/LICENSE index c0ad72f..7e02d6a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012-2022, Jannis Leidel and other contributors. +Copyright (c) 2012-2023, Jannis Leidel and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/docs/conf.py b/docs/conf.py index 632a5d9..9d8d54f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -2,7 +2,7 @@ import configurations # -- Project information ----------------------------------------------------- project = 'django-configurations' -copyright = '2012-2022, Jannis Leidel and other contributors' +copyright = '2012-2023, Jannis Leidel and other contributors' author = 'Jannis Leidel and other contributors' release = configurations.__version__ diff --git a/tests/test_values.py b/tests/test_values.py index a98e718..55478e6 100644 --- a/tests/test_values.py +++ b/tests/test_values.py @@ -375,6 +375,7 @@ class ValueTests(TestCase): with env(DATABASE_URL='sqlite://'): self.assertEqual(value.setup('DATABASE_URL'), { 'default': { + 'CONN_HEALTH_CHECKS': False, 'CONN_MAX_AGE': 0, 'ENGINE': 'django.db.backends.sqlite3', 'HOST': '', diff --git a/tox.ini b/tox.ini index 3df6a60..86295d8 100644 --- a/tox.ini +++ b/tox.ini @@ -6,8 +6,8 @@ envlist = py37-checkqa docs py{37,py37}-dj{32} - py{38,py38,39,py39,310}-dj{32,40,41,main} - py{311}-dj{41,main} + py{38,py38,39,py39,310}-dj{32,40,41} + py{311}-dj{41} [gh-actions] python =