diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 33e84dd..6f252be 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,54 +13,12 @@ jobs: strategy: matrix: python-version: [3.8, 3.9, "3.10", "3.11"] - django-version: [22, 30, 31, 32, 40, 41, 42] + django-version: [32, 41, 42] exclude: - - python-version: 2.7 - django-version: 22 - - - python-version: 2.7 - django-version: 30 - - - python-version: 2.7 - django-version: 31 - - - python-version: 2.7 - django-version: 32 - - - python-version: 2.7 - django-version: 40 - - - python-version: 2.7 - django-version: 41 - - - python-version: 2.7 - django-version: 42 - - - python-version: 3.10 - django-version: 22 - - - python-version: 3.10 - django-version: 30 - - - python-version: 3.10 - django-version: 31 - - - python-version: 3.11 - django-version: 22 - - - python-version: 3.11 - django-version: 30 - - - python-version: 3.11 - django-version: 31 - - python-version: 3.11 django-version: 32 - - python-version: 3.11 - django-version: 40 - steps: - uses: actions/checkout@v4 - name: setup python diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c9a5bbf..ab8d6b7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,14 @@ Changelog ========= +Unreleased +~~~~~~~~~~~~~~~~ + +* Added Django 4.1 & 4.2 support +* Added Python 3.10 & 3.11 support +* Drop support for Python 2.7, 3.4, 3.5, 3.6 & 3.7 (EOL) +* Drop support for Django 1.8, 1.9, 1.10, 1.11, 2.2, 3.0 & 3.1 (EOL) + 0.9 (08.07.2021) ~~~~~~~~~~~~~~~~ * Added Django 3.1 and 3.2 support (Awais Qureshi) diff --git a/django_libsass.py b/django_libsass.py index 74ff249..12c74b5 100644 --- a/django_libsass.py +++ b/django_libsass.py @@ -1,18 +1,13 @@ import base64 import json -import re import os - -import django -from django.conf import settings -from django.contrib.staticfiles.finders import get_finders -if django.VERSION >= (1,10): - from django.templatetags.static import static as django_static -else: - from django.contrib.staticfiles.templatetags.staticfiles import static as django_static +import re import sass from compressor.filters.base import FilterBase +from django.conf import settings +from django.contrib.staticfiles.finders import get_finders +from django.templatetags.static import static as django_static def static(path): diff --git a/setup.py b/setup.py index dc285cc..9d8cc64 100644 --- a/setup.py +++ b/setup.py @@ -22,34 +22,19 @@ 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Framework :: Django', - 'Framework :: Django :: 1.8', - 'Framework :: Django :: 1.9', - 'Framework :: Django :: 1.10', - 'Framework :: Django :: 1.11', - 'Framework :: Django :: 2.0', - 'Framework :: Django :: 2.1', - 'Framework :: Django :: 2.2', - 'Framework :: Django :: 3.0', - 'Framework :: Django :: 3.1', 'Framework :: Django :: 3.2', - 'Framework :: Django :: 4.0', 'Framework :: Django :: 4.1', 'Framework :: Django :: 4.2', ], + python_requires='>=3.8', install_requires=[ "django-compressor>=1.3", "libsass>=0.7.0,<1", - "django-appconf==1.0.3 ; python_version<'3'", ], ) diff --git a/tests/urls.py b/tests/urls.py index fe62d41..29cb11c 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -15,19 +15,12 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ -import django -from tests.views import index +from django.urls import path -if django.VERSION >= (2, 0): - from django.urls import path +from tests.views import index - urlpatterns = [ - path('', index), - ] -else: - from django.conf.urls import url - urlpatterns = [ - url('^$', index), - ] +urlpatterns = [ + path('', index), +] diff --git a/tox.ini b/tox.ini index 5e00b26..c69a162 100644 --- a/tox.ini +++ b/tox.ini @@ -1,20 +1,10 @@ [tox] -envlist = django{18,19,110,111,20,21,22,30,31,32,40,41,42} +envlist = django{32,41,42} [testenv] commands = python runtests.py deps = - django18: Django>=1.8,<1.9 - django19: Django>=1.9,<1.10 - django110: Django>=1.10,<1.11 - django111: Django>=1.11,<2.0 - django20: Django>=2.0,<2.1 - django21: Django>=2.1,<2.2 - django22: Django>=2.2a1,<3.0 - django30: Django>=3.0,<3.1 - django31: Django>=3.1,<3.2 django32: Django>=3.2,<3.3 - django40: Django>=4.0,<4.1 django41: Django>=4.1,<4.2 django42: Django>=4.2,<5.0