Permanently remove dependencies used for Python 2

We don't need anymore 'future' imports.
Explicitly said with which mode is open a file.
Replace smart_bytes by a methode how simulate file reading in tests.
Respect the universal newlines '\r\n' instead of '\n'.

Author: TheBuky

.gitignore

@@ -18,6 +18,7 @@ tests/node_modules/
 .DS_Store
 .idea
 .venv
+.vscode
 .project
 .pydevproject
 .ropeproject

.travis.yml

@@ -5,14 +5,14 @@ matrix:
   include:
     - env: TOXENV=pypy3-django22
       python: "pypy3"
-    - env: TOXENV=py35-django22
-      python: "3.5"
     - env: TOXENV=py36-django22
       python: "3.6"
     - env: TOXENV=py37-django22
       python: "3.7"
     - env: TOXENV=py38-django22
       python: "3.8"
+    - env: TOXENV=pypy3-django30
+      python: "pypy3"
     - env: TOXENV=py36-django30
       python: "3.6"
     - env: TOXENV=py37-django30
@@ -48,6 +48,6 @@ deploy:
   on:
     tags: true
     repo: jazzband/django-pipeline
-    condition: "$TOXENV = py36-django22"
+    condition: "$TOXENV = py36-django30"
 notifications:
   email: false

HISTORY.rst

@@ -3,6 +3,26 @@
 History
 =======
 
+2.0.0
+=====
+
+* **Definitely drop the support of Python 2**.
+* Drop support for Python 3.5 (not compatible with PEP 498).
+* Remove 'decorator.py' how was used for backward compatibility
+  between python 2 and 3 for metaclass inheritance on PipelineFormMedia.
+* Replace 'format' by 'fstring' (PEP 498: Literal String Interpolation).
+* Remove of old imports form 'django.utils.six' and these fixes (1.7.0).
+* Remove tests of uncovered versions of Python and Django.
+* Replace tests for Pypy by Pypy3.
+* Explicitly specify when files are read / writ in binary mode.
+* Deal with universal newlines of Python 3 for tests. When opening a file
+  as binary mode '\r\n' is used as linebreak instead of '\n'. Open file in
+  text mode for tests to let OS correctly interpret line breaks and remove
+  'smart_bytes' not anymore used.
+* Add method to simulate file reading for tests to correctly interpret
+  line breaks from given string.
+* Upgrade documentation version to 2.0.
+
 1.7.0
 =====
 

docs/conf.py

@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.6'
+version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.6.14'
+release = '2.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pipeline/collector.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 
 from collections import OrderedDict

pipeline/compilers/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import shutil
 import subprocess
@@ -8,7 +6,6 @@
 from django.contrib.staticfiles import finders
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.files.base import ContentFile
-from django.utils.encoding import smart_bytes
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompilerError
@@ -68,7 +65,7 @@ def compile_file(self, infile, outfile, outdated=False, force=False):
         raise NotImplementedError
 
     def save_file(self, path, content):
-        return self.storage.save(path, ContentFile(smart_bytes(content)))
+        return self.storage.save(path, ContentFile(content))
 
     def read_file(self, path):
         file = self.storage.open(path, 'rb')
@@ -121,7 +118,7 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
         try:
             # We always catch stdout in a file, but we may not have a use for it.
             temp_file_container = cwd or os.path.dirname(stdout_captured or "") or os.getcwd()
-            with NamedTemporaryFile(delete=False, dir=temp_file_container) as stdout:
+            with NamedTemporaryFile('wb', delete=False, dir=temp_file_container) as stdout:
                 compiling = subprocess.Popen(argument_list, cwd=cwd,
                                              stdout=stdout,
                                              stderr=subprocess.PIPE)
@@ -131,13 +128,13 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
             if compiling.returncode != 0:
                 stdout_captured = None  # Don't save erroneous result.
                 raise CompilerError(
-                    "{0!r} exit code {1}\n{2}".format(argument_list, compiling.returncode, stderr),
+                    f"{argument_list!r} exit code {compiling.returncode}\n{stderr}",
                     command=argument_list,
                     error_output=stderr)
 
             # User wants to see everything that happened.
             if self.verbose:
-                with open(stdout.name) as out:
+                with open(stdout.name, 'rb') as out:
                     print(out.read())
                 print(stderr)
         except OSError as e:

pipeline/compilers/coffee.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler
 

pipeline/compilers/es6.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler
 

pipeline/compilers/less.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from os.path import dirname
 
 from pipeline.conf import settings

pipeline/compilers/livescript.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from pipeline.conf import settings
 from pipeline.compilers import SubProcessCompiler