Skip to content

Commit

Permalink
[deps] Added support for Django 3.2 and Django 4.0a #11
Browse files Browse the repository at this point in the history
Test dependencies:
- Bumped django-extensions~=3.1.0
- Bumped openwisp-utils to use latest master from GitHub

Closes #11
  • Loading branch information
harsh7in authored and pandafy committed Dec 24, 2021
1 parent 7897114 commit a643158
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Expand Up @@ -25,6 +25,12 @@ jobs:
- 3.9
django-version:
- django~=3.1.0
- django~=3.2.0
include:
- django-version: django~=4.0.0
python-version: 3.9
- django-version: django~=4.0.0
python-version: 3.8

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -71,3 +71,7 @@ Pipfile

# celery
tests/celerybeat*

# virtual env
/venv/

2 changes: 1 addition & 1 deletion .stylelintrc.json
Expand Up @@ -14,6 +14,6 @@
"except": ["first-nested"],
"ignore": ["after-comment", "inside-block"]
}],
"unit-whitelist": ["em", "rem", "%", "s", "px", "vh", "deg"]
"unit-allowed-list": ["em", "rem", "%", "s", "px", "vh", "deg"]
}
}
10 changes: 9 additions & 1 deletion setup.py
Expand Up @@ -35,7 +35,15 @@
include_package_data=True,
zip_safe=False,
install_requires=[],
extras_require={'test': ['openwisp-utils[qa]~=0.7', 'django-extensions~=3.0']},
extras_require={
'test': [
(
'openwisp-utils[qa]'
' @ https://github.com/openwisp/openwisp-utils/tarball/master'
),
'django-extensions~=3.1.0',
]
},
classifiers=[
'Development Status :: 3 - Alpha',
'Environment :: Web Environment',
Expand Down
6 changes: 3 additions & 3 deletions tests/urls.py
@@ -1,11 +1,11 @@
from django.conf import settings
from django.conf.urls import include, url
from django.conf.urls.static import static
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.urls import include, path

urlpatterns = [
url(r'^admin/', admin.site.urls),
path('admin/', admin.site.urls),
]

urlpatterns += staticfiles_urlpatterns()
Expand All @@ -14,4 +14,4 @@
if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS:
import debug_toolbar

urlpatterns += [url(r'^__debug__/', include(debug_toolbar.urls))]
urlpatterns += [path('^__debug__/', include(debug_toolbar.urls))]

0 comments on commit a643158

Please sign in to comment.