From 55ebe7c014c351e6d10ebc487530b154d947808d Mon Sep 17 00:00:00 2001 From: Filipe Pina Date: Sat, 21 Jan 2023 17:38:20 +0000 Subject: [PATCH] fix actions: allow make in tox and bump styling to 3.7 --- .github/workflows/test.yml | 4 ++-- Makefile | 4 ++-- tox.ini | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0c2e096..bb187f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.6 + - name: Set up Python 3.7 uses: actions/setup-python@v2 with: - python-version: 3.6 + python-version: 3.7 - name: Install tox run: pip install tox - name: Style check diff --git a/Makefile b/Makefile index 7163ef4..b0d3336 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ .PHONY: style style: - black --target-version=py36 \ + black --target-version=py37 \ --line-length=120 \ --skip-string-normalization \ notifications testapp setup.py .PHONY: style_check style_check: - black --target-version=py36 \ + black --target-version=py37 \ --line-length=120 \ --skip-string-normalization \ --check \ diff --git a/tox.ini b/tox.ini index e472987..791fadc 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist = py{39}-dj{22,30,32} [testenv] +allowlist_externals = make deps = dj22: Django==2.2.* dj30: Django==3.0.* @@ -14,7 +15,6 @@ extras = setenv = PYTHONPATH = {toxinidir} DJANGO_SETTINGS_MODULE = testapp.settings -whitelist_externals = make pip_pre = True commands = make coverage TEST_ARGS='{posargs:tests}' @@ -28,6 +28,6 @@ skip_install = true basepython = python3 commands = make style_check deps = - black>=19.10b0 + black==22.12.0 flake8 skip_install = true