Merge pull request #19 from thorgate/django-30

Allow usage with django 3.0
thorgate · May 20, 2020 · 3a457b0 · 3a457b0
2 parents 22d492b + 0470570
commit 3a457b0
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,13 +13,18 @@ env:
   - DJANGO=2.0
   - DJANGO=2.1
   - DJANGO=2.2
+  - DJANGO=3.0
 
 matrix:
   exclude:
     - python: "3.4"
       env: DJANGO=2.1
     - python: "3.4"
       env: DJANGO=2.2
+    - python: "3.4"
+      env: DJANGO=3
+    - python: "3.5"
+      env: DJANGO=3
     - python: "3.7"
       env: DJANGO=1.8
     - python: "3.7"

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -2,6 +2,12 @@
 History
 =======
 
+0.7.7 (unreleased)
+------------------
+
+* Allow usage with Django 3.0 and above
+
+
 0.7.6 (2020-04-14)
 ------------------
 

diff --git a/docs/usage.rst b/docs/usage.rst
@@ -25,7 +25,7 @@ To use them, add to your Django settings::
     ]
 
 Note that you need to have clean-css and uglify-js npm packages installed and in $PATH.
-Django Compressor versions 1.4 to 2.0 (inclusive) are supported.
+Django Compressor versions 1.4 to 2.4 (inclusive) are supported.
 
 
 Health-check endpoint

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -8,6 +8,6 @@ Sphinx==1.5.1
 
 pytest==2.8.5
 pytest-django==2.9.1
-django_compressor==2.0
+django_compressor==2.4
 hashids==1.2.0
 python-redis-lock>=3.2.0,<4.0.0
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -4,6 +4,6 @@ coveralls==1.1
 pytest-cov==2.4.0
 pytest-django==2.9.1
 python-redis-lock==3.2.0
-django_compressor==2.0
+django_compressor==2.4
 hashids==1.2.0
 flake8==2.5.1
diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@
     },
     include_package_data=True,
     install_requires=[
-        'django>=1.8,!=2.1.0,!=2.1.1,!=2.1.2,!=2.1.3,!=2.1.4,!=2.1.5,<3.0',
+        'django>=1.8,!=2.1.0,!=2.1.1,!=2.1.2,!=2.1.3,!=2.1.4,!=2.1.5',
     ],
     extras_require={
         'model-hash': [
@@ -75,5 +75,6 @@
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
 )
diff --git a/tg_utils/__init__.py b/tg_utils/__init__.py
@@ -2,4 +2,4 @@
 
 __author__ = 'Thorgate'
 __email__ = '[email protected]'
-__version__ = '0.7.6'
+__version__ = '0.7.7'
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{34,35,36}-django{18,111,20},py{35,36,37}-django{20,21,22}
+envlist = py{34,35,36}-django{18,111,20},py{35,36,37}-django{20,21,22},py{36,37}-django30
 
 [travis:env]
 DJANGO =
@@ -8,6 +8,7 @@ DJANGO =
     2.0: django20
     2.1: django21
     2.2: django22
+    3.0: django30
 
 [testenv]
 setenv =
@@ -20,6 +21,7 @@ deps =
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
     django22: Django>=2.2,<2.3
+    django30: Django>=3.0,<4
     -r{toxinidir}/requirements_test.txt
 
 [testenv:py36-django22]