From a986b7f6baca23fa7da508fa0e6edb6cd347c192 Mon Sep 17 00:00:00 2001 From: Hugo Rodger-Brown Date: Mon, 18 Sep 2023 14:16:58 +0100 Subject: [PATCH] Test tox.yml --- .github/workflows/tox.yml | 96 +++++++++++++++++++------------------- tests/settings_postgres.py | 9 ++-- 2 files changed, 53 insertions(+), 52 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index ab1f700..7db858b 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -9,54 +9,54 @@ on: types: [opened, synchronize, reopened] jobs: - format: - name: Check formatting - runs-on: ubuntu-latest - strategy: - matrix: - toxenv: [fmt, lint, mypy] - env: - TOXENV: ${{ matrix.toxenv }} - - steps: - - name: Check out the repository - uses: actions/checkout@v3 - - - name: Set up Python (3.11) - uses: actions/setup-python@v4 - with: - python-version: "3.11" - - - name: Install and run tox - run: | - pip install tox - tox - - test: - name: Run tests (SQLite) - runs-on: ubuntu-latest - - strategy: - matrix: - python: ["3.10", "3.11"] - django: ["32", "40", "41", "42", "main"] - - env: - TOXENV: py${{ matrix.python }}-django${{ matrix.django }} - - steps: - - name: Check out the repository - uses: actions/checkout@v3 - - - name: Set up Python ${{ matrix.python }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python }} - - - name: Install and run tox - run: | - pip install tox - tox +# format: +# name: Check formatting +# runs-on: ubuntu-latest +# strategy: +# matrix: +# toxenv: [fmt, lint, mypy] +# env: +# TOXENV: ${{ matrix.toxenv }} + +# steps: +# - name: Check out the repository +# uses: actions/checkout@v3 + +# - name: Set up Python (3.11) +# uses: actions/setup-python@v4 +# with: +# python-version: "3.11" + +# - name: Install and run tox +# run: | +# pip install tox +# tox + +# test: +# name: Run tests (SQLite) +# runs-on: ubuntu-latest + +# strategy: +# matrix: +# python: ["3.10", "3.11"] +# django: ["32", "40", "41", "42", "main"] + +# env: +# TOXENV: py${{ matrix.python }}-django${{ matrix.django }} + +# steps: +# - name: Check out the repository +# uses: actions/checkout@v3 + +# - name: Set up Python ${{ matrix.python }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python }} + +# - name: Install and run tox +# run: | +# pip install tox +# tox test-pg: name: Run tests (PostgreSQL) diff --git a/tests/settings_postgres.py b/tests/settings_postgres.py index b010077..de718bf 100644 --- a/tests/settings_postgres.py +++ b/tests/settings_postgres.py @@ -3,7 +3,8 @@ import dj_database_url -DEFAULT_DATABASE_URL = getenv( - "DATABASE_URL", "postgres://postgres@localhost:5432/django_anonymiser" -) -DATABASES["default"] = dj_database_url.parse(DEFAULT_DATABASE_URL) # noqa: F405 +DEFAULT_DATABASE_URL = "postgres://postgres@localhost:5432/django_anonymiser" +DATABASE_URL = getenv("DATABASE_URL", DEFAULT_DATABASE_URL) + +DATABASES["default"] = dj_database_url.parse(DATABASE_URL) # noqa: F405 +print(DATABASES)