From 0958f25427f46d8c8e5426f28e677ffa85ba7ef5 Mon Sep 17 00:00:00 2001 From: Steven K Date: Mon, 19 Jun 2023 15:48:09 -0700 Subject: [PATCH] Bump all local versions to 11 Signed-off-by: Steven K --- .github/workflows/main.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5896e3f..de6c0d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,6 @@ jobs: cache-dependency-path: | setup.py requirements*.txt - - name: Install dependencies run: | python setup.py install @@ -35,7 +34,7 @@ jobs: pip install -r requirements_dev.txt --user - name: outdated - run: pip list --outdated --not-required --exclude=django --user | grep . && echo "There are outdated packages" && exit 1 || echo "All packages up to date" + run: pip list --outdated --not-required --user | grep . && echo "There are outdated packages" && exit 1 || echo "All packages up to date" black: name: Black @@ -49,7 +48,6 @@ jobs: cache-dependency-path: | setup.py requirements*.txt - - name: Install dependencies run: | python setup.py install @@ -72,7 +70,6 @@ jobs: cache-dependency-path: | setup.py requirements*.txt - - name: Install dependencies run: | python setup.py install @@ -103,7 +100,7 @@ jobs: pip install bandit - name: Bandit - run: bandit -r simulation -x simulation/tests -s B101 -f json -o report.json + run: bandit -r django_states -x django_states/tests -s B101 -f json -o report.json - name: Show report if: ${{ success() || failure() }} @@ -123,7 +120,7 @@ jobs: strategy: max-parallel: 4 matrix: - db: [ sqlite, mysql ] + db: [ sqlite, mariadb ] django-version: [ "~=4.2.0" ] python-version: [ "3.10" ] @@ -131,20 +128,21 @@ jobs: mariadb: image: mariadb:latest env: - MYSQL_ROOT_PASSWORD: password + MARIADB_ROOT_PASSWORD: password ports: - 3306:3306 options: >- - --health-cmd="mysqladmin ping" + --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - name: Verify MySQL connection from host - if: matrix.db == 'mysql' + if: matrix.db == 'mariadb' run: | mysql --host 127.0.0.1 --port 3306 -uroot -ppassword -e "SHOW DATABASES" 2>&1 > /dev/null + mysql --host 127.0.0.1 --port 3306 -uroot -ppassword -V - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} @@ -206,8 +204,9 @@ jobs: - name: Combine Report Coverage run: | - coverage combine coverage-*/.coverage - coverage xml + coverage combine coverage-*/.coverage + coverage report --precision=1 --sort=cover --skip-covered --skip-empty + coverage xml - name: Upload coverage to Codecov uses: codecov/codecov-action@v3