diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84614ee..b5b5a72 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,40 +11,40 @@ jobs: TEST_BACKEND: ${{ matrix.backend }} strategy: matrix: - python-version: [3.9] - django-version: [3.2.7] - drf-version: [3.12.4] + python-version: ["3.10"] + django-version: [4.0.4] + drf-version: [3.13.1] variant: [''] backend: [threading, immediate, celery] include: - - python-version: 3.9 + - python-version: "3.10" django-version: 3.2.7 drf-version: 3.12.4 variant: wq.db backend: threading - - python-version: 3.9 - django-version: 3.2.7 - drf-version: 3.12.4 + - python-version: "3.10" + django-version: 4.0.4 + drf-version: 3.13.1 variant: reversion backend: threading + - python-version: "3.10" + django-version: 3.2.13 + drf-version: 3.13.1 + variant: '' + backend: threading - python-version: 3.9 - django-version: 2.2.24 - drf-version: 3.12.4 + django-version: 4.0.4 + drf-version: 3.13.1 variant: '' backend: threading - python-version: 3.8 - django-version: 3.2.7 - drf-version: 3.12.4 + django-version: 4.0.4 + drf-version: 3.13.1 variant: '' backend: threading - python-version: 3.7 - django-version: 3.2.7 - drf-version: 3.12.4 - variant: '' - backend: threading - - python-version: 3.6 - django-version: 3.2.7 - drf-version: 3.12.4 + django-version: 3.2.13 + drf-version: 3.13.1 variant: '' backend: threading services: @@ -71,7 +71,7 @@ jobs: run: python -m pip install celery redis - name: Install wq.db if: ${{ matrix.variant == 'wq.db' }} - run: python -m pip install wq.db --pre + run: python -m pip install wq.db pystache - name: Install reversion if: ${{ matrix.variant == 'reversion' }} run: python -m pip install django-reversion @@ -125,7 +125,7 @@ jobs: run: | cd packages/$PACKAGE npm run test - - uses: smartsquaregmbh/delete-old-packages@v0.3.1 + - uses: smartsquaregmbh/delete-old-packages@v0.4.0 if: github.event_name == 'push' with: keep: 5 diff --git a/data_wizard/admin.py b/data_wizard/admin.py index a7addd4..d9d2878 100644 --- a/data_wizard/admin.py +++ b/data_wizard/admin.py @@ -4,7 +4,7 @@ from .models import Run, RunLog, Identifier, Range, Record from django.urls import reverse from django.http import HttpResponseRedirect -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class FixedTabularInline(admin.TabularInline): diff --git a/data_wizard/signals.py b/data_wizard/signals.py index 5b78639..540f9a6 100644 --- a/data_wizard/signals.py +++ b/data_wizard/signals.py @@ -1,5 +1,5 @@ from django.dispatch import Signal -import_complete = Signal(providing_args=["run", "status"]) -new_metadata = Signal(providing_args=["run", "identifier"]) -progress = Signal(providing_args=["run", "status", "meta"]) +import_complete = Signal() +new_metadata = Signal() +progress = Signal() diff --git a/setup.py b/setup.py index 83de1a7..f6b6fc5 100644 --- a/setup.py +++ b/setup.py @@ -82,11 +82,13 @@ def readme(): "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Framework :: Django", "Framework :: Django :: 2.2", "Framework :: Django :: 3.0", "Framework :: Django :: 3.1", "Framework :: Django :: 3.2", + "Framework :: Django :: 4.0", "Topic :: Scientific/Engineering :: GIS", "Topic :: Database :: Database Engines/Servers", ], diff --git a/tests/urls.py b/tests/urls.py index aaf78b8..d96e97d 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.urls import include, path from django.conf import settings from django.contrib import admin from django import VERSION as DJANGO_VERSION @@ -6,15 +6,11 @@ if settings.WITH_WQDB: from wq.db import rest - wizard_urls = [url(r"^", include(rest.router.urls))] -elif DJANGO_VERSION[0] < 2: - wizard_urls = [ - url(r"^datawizard/", include("data_wizard.urls", "data_wizard")) - ] + wizard_urls = [path("", include(rest.router.urls))] else: - wizard_urls = [url(r"^datawizard/", include("data_wizard.urls"))] + wizard_urls = [path("datawizard/", include("data_wizard.urls"))] urlpatterns = [ - url(r"^admin/", admin.site.urls), + path("admin/", admin.site.urls), ] + wizard_urls