From ff2333acee3bf2d675471dc2838cd6ce592a8145 Mon Sep 17 00:00:00 2001 From: Hugo Rodger-Brown Date: Mon, 18 Sep 2023 15:05:28 +0100 Subject: [PATCH] Fix --- .github/workflows/tox.yml | 100 +++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index fe56f65..ddb302a 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) @@ -68,7 +68,7 @@ jobs: env: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres - POSTGRES_DB: django_anonymiser + POSTGRES_DB: postgres POSTGRES_PORT: 5432 # Set health checks to wait until postgres has started options: >- @@ -92,5 +92,5 @@ jobs: - name: Run tox env: TOXENV: pg-only - DATABASE_URL: postgres://postgres:postgres@postgres:5432/django_anonymiser + DATABASE_URL: postgres://postgres:postgres@postgres:5432/postgres run: tox