From 519e6647f2285e7f7671a7c2230a08700acff794 Mon Sep 17 00:00:00 2001 From: Steven K Date: Tue, 4 Apr 2023 10:13:12 -0700 Subject: [PATCH] Updated with latest black and Django 4.2 support Signed-off-by: Steven K --- .github/workflows/main.yml | 8 ++++---- datatableview/views/base.py | 1 - demo_app/example_app/migrations/0001_initial.py | 1 - .../example_app/migrations/0002_entry_is_published.py | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2b0932..e2b9d31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -119,12 +119,12 @@ jobs: tests: name: Python ${{ matrix.python-version }} / ${{ matrix.db }} / Django ${{ matrix.django-version}} runs-on: ubuntu-latest - continue-on-error: ${{ matrix.django-version == '~=4.2' }} + continue-on-error: ${{ matrix.django-version == '~=4.2.0' }} strategy: max-parallel: 4 matrix: db: [ sqlite, mysql ] - django-version: ["<4.2", "~=4.2" ] + django-version: ["~=4.1.0", "~=4.2.0" ] python-version: [ "3.10" ] services: @@ -160,8 +160,8 @@ jobs: run: | python setup.py install python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r requirements_dev.txt + pip install -r requirements.txt --retries 3 + pip install -r requirements_dev.txt --retries 3 pip uninstall -y Django pip install Django${{ matrix.django-version }} diff --git a/datatableview/views/base.py b/datatableview/views/base.py index 3b139aa..d89dcb4 100644 --- a/datatableview/views/base.py +++ b/datatableview/views/base.py @@ -17,7 +17,6 @@ class DatatableJSONResponseMixin(object): def dispatch(self, request, *args, **kwargs): - try: is_ajax = request.headers.get("x-requested-with") == "XMLHttpRequest" except AttributeError: diff --git a/demo_app/example_app/migrations/0001_initial.py b/demo_app/example_app/migrations/0001_initial.py index 1441d33..5c336bb 100644 --- a/demo_app/example_app/migrations/0001_initial.py +++ b/demo_app/example_app/migrations/0001_initial.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - initial = True dependencies = [] diff --git a/demo_app/example_app/migrations/0002_entry_is_published.py b/demo_app/example_app/migrations/0002_entry_is_published.py index dd4de4e..11c46c2 100644 --- a/demo_app/example_app/migrations/0002_entry_is_published.py +++ b/demo_app/example_app/migrations/0002_entry_is_published.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("example_app", "0001_initial"), ]