Add support for Django 4.0; Drop support for Django 1.x and Python 3.5

Author: andreyfedoseev

Dockerfile

@@ -1,5 +1,10 @@
 FROM andreyfedoseev/django-static-precompiler:18.04
-RUN apt-get update && apt-get install -y python3-dev python3-pip sqlite3
+RUN apt-get update && \
+    apt-get install -y  \
+    python3.6-dev \
+    python3.8-dev \
+    python3-pip \
+    sqlite3
 RUN mkdir /app
 WORKDIR /app
 ADD requirements-*.txt /app/

README.rst

@@ -55,21 +55,22 @@ Use in Python
 Python compatibility
 ====================
 
-Python 3.5+ is required.
+Python 3.6+ is required.
 
 Django compatibility
 ====================
 
-========================= ==== ==== ==== ==== ==== ==== ==== ====
+========================= ==== ==== ==== ==== ==== ==== ==== ==== ====
 django-static-precompiler Django
-------------------------- ---------------------------------------
-version                   3.x  2.x  1.11 1.10 1.9  1.8  1.7  1.6
-========================= ==== ==== ==== ==== ==== ==== ==== ====
-2.0+                      \+   \+   \+   \+   \+
-1.7-1.8                        \+   \+   \+   \+   \+   \+
-1.6                                 \+   \+   \+   \+   \+
-1.5                                      \+   \+   \+   \+   \+
-1.1-1.4                                       \+   \+   \+   \+
-1.0                                                     \+   \+
-========================= ==== ==== ==== ==== ==== ==== ==== ====
+------------------------- --------------------------------------------
+version                   4.x  3.x  2.x  1.11 1.10 1.9  1.8  1.7  1.6
+========================= ==== ==== ==== ==== ==== ==== ==== ==== ====
+2.1+                      \+   \+   \+
+2.0                            \+   \+   \+   \+   \+
+1.7-1.8                             \+   \+   \+   \+   \+   \+
+1.6                                      \+   \+   \+   \+   \+
+1.5                                           \+   \+   \+   \+   \+
+1.1-1.4                                            \+   \+   \+   \+
+1.0                                                          \+   \+
+========================= ==== ==== ==== ==== ==== ==== ==== ==== ====
 

setup.py

@@ -6,7 +6,7 @@
 
 
 class PyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
+    user_options = [("pytest-args=", "a", "Arguments to pass to py.test")]
 
     def initialize_options(self):
         TestCommand.initialize_options(self)
@@ -20,6 +20,7 @@ def finalize_options(self):
     def run_tests(self):
         # import here, cause outside the eggs aren't loaded
         import pytest
+
         errno = pytest.main(self.pytest_args)
         sys.exit(errno)
 
@@ -29,8 +30,8 @@ def read(fname):
     return open(path, encoding="utf-8").read()
 
 
-README = read('README.rst')
-CHANGES = read('CHANGES.rst')
+README = read("README.rst")
+CHANGES = read("CHANGES.rst")
 
 
 version = ""
@@ -39,7 +40,7 @@ def read(fname):
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)
 
 if not version:
-    raise RuntimeError('Cannot find version information')
+    raise RuntimeError("Cannot find version information")
 
 
 setup(
@@ -50,35 +51,40 @@ def read(fname):
     author_email="andrey.fedoseev@gmail.com",
     url="https://github.com/andreyfedoseev/django-static-precompiler",
     description="Django template tags to compile all kinds of static files "
-                "(SASS, LESS, Stylus, CoffeeScript, Babel, LiveScript, Handlebars).",
+    "(SASS, LESS, Stylus, CoffeeScript, Babel, LiveScript, Handlebars).",
     long_description="\n\n".join([README, CHANGES]),
     classifiers=[
-        'Development Status :: 4 - Beta',
-        'Framework :: Django',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Topic :: Internet :: WWW/HTTP',
+        "Development Status :: 4 - Beta",
+        "Framework :: Django",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: BSD License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Topic :: Internet :: WWW/HTTP",
+    ],
+    keywords=[
+        "sass",
+        "scss",
+        "less",
+        "stylus",
+        "css",
+        "coffeescript",
+        "javascript",
+        "babel",
+        "livescript",
+        "handlebars",
     ],
-    keywords=["sass", "scss", "less", "stylus", "css", "coffeescript", "javascript", "babel", "livescript",
-              "handlebars"],
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     install_requires=[
-        "Django>=1.9",
+        "Django>=2.0",
     ],
     tests_require=[
         "pytest",
         "pytest-django",
         "pretend",
         "libsass",
     ],
-    extras_require={
-        'watch': ['watchdog'],
-        'libsass': ['libsass']
-    },
-    cmdclass={
-        "test": PyTest
-    },
+    extras_require={"watch": ["watchdog"], "libsass": ["libsass"]},
+    cmdclass={"test": PyTest},
 )

static_precompiler/compilers/base.py

@@ -201,7 +201,7 @@ def compile_lazy(self, source_path):
 
         :returns: str
         """
-        return encoding.force_text(self.compile(source_path))
+        return encoding.force_str(self.compile(source_path))
 
     compile_lazy = functional.lazy(compile_lazy, str)
 

static_precompiler/tests/test_base_compiler.py

@@ -196,12 +196,12 @@ def test_compile_lazy(monkeypatch):
     # noinspection PyUnresolvedReferences
     assert compiler.compile.calls == []
 
-    assert encoding.force_text(lazy_compiled) == "dummy.coffee"
+    assert encoding.force_str(lazy_compiled) == "dummy.coffee"
 
     # noinspection PyUnresolvedReferences
     assert compiler.compile.calls == [pretend.call("dummy.coffee")]
 
-    assert compiler.compile(encoding.force_text("foo")).startswith(encoding.force_text("")) is True
+    assert compiler.compile(encoding.force_str("foo")).startswith(encoding.force_str("")) is True
     assert compiler.compile(encoding.force_bytes("foo")).startswith(encoding.force_bytes("")) is True
 
 

static_precompiler/tests/test_coffeescript.py

@@ -8,7 +8,7 @@
 
 
 def clean_javascript(js):
-    """ Remove comments and all blank lines. """
+    """Remove comments and all blank lines."""
     return "\n".join(line for line in js.split("\n") if line.strip() and not line.startswith("//"))
 
 

static_precompiler/tests/test_handlebars.py

@@ -8,7 +8,7 @@
 
 
 def clean_javascript(js):
-    """ Remove comments and all blank lines. """
+    """Remove comments and all blank lines."""
     return "\n".join(line for line in js.split("\n") if line.strip() and not line.startswith("//"))
 
 

static_precompiler/tests/test_livescript.py

@@ -8,7 +8,7 @@
 
 
 def clean_javascript(js):
-    """ Remove comments and all blank lines. """
+    """Remove comments and all blank lines."""
     return "\n".join(line for line in js.split("\n") if line.strip() and not line.startswith("//"))
 
 

static_precompiler/utils.py

@@ -23,16 +23,16 @@ def normalize_path(posix_path):
 
 
 def read_file(path):
-    """ Return the contents of a file as unicode. """
+    """Return the contents of a file as unicode."""
     with open(path, encoding=get_file_encoding()) as file_object:
         return file_object.read()
 
 
 def write_file(content, path):
-    """ Write unicode content to a file. """
+    """Write unicode content to a file."""
 
     # Convert to unicode
-    content = encoding.force_text(content)
+    content = encoding.force_str(content)
 
     with open(path, "w+", encoding=get_file_encoding()) as file_object:
         file_object.write(content)

tox.ini

@@ -1,26 +1,22 @@
 [tox]
 envlist =
-    py36-django19,
-    py36-django110,
-    py36-django111,
     py36-django20,
     py36-django21,
     py36-django22,
     py36-django30,
     py36-django31,
+    py38-django40
 
 [testenv]
 passenv = GEM_PATH
 deps =
     -rrequirements-test.txt
-    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.2,<3.0
     django30: Django>=3.0,<3.1
     django31: Django>=3.1,<4
+    django40: Django>=4.0,<4.1
 commands = py.test static_precompiler --cov static_precompiler --cov-report xml --cov-append
 setenv =
     PYTHONPATH = {toxinidir}