Merge pull request #718 from jazzband/dropping-python2-support

Dropping python2 support

Author: Buky

.gitignore

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

.travis.yml

@@ -3,22 +3,16 @@ sudo: True
 dist: xenial
 matrix:
   include:
-    - env: TOXENV=py27-django111
-      python: "2.7"
-    - env: TOXENV=pypy-django111
-      python: "pypy"
-    - env: TOXENV=py35-django111
-      python: "3.5"
-    - env: TOXENV=py36-django111
-      python: "3.6"
-    - env: TOXENV=py36-django20
-      python: "3.6"
-    - env: TOXENV=py35-django22
-      python: "3.5"
+    - env: TOXENV=pypy3-django22
+      python: "pypy3"
     - 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
@@ -32,7 +26,7 @@ matrix:
     - env: TOXENV=py38-django-master
       python: "3.8-dev"
     - env: TOXENV=docs
-      python: "2.7"
+      python: "3.6"
   allow_failures:
     - env: TOXENV=py36-django-master
     - env: TOXENV=py37-django-master
@@ -54,6 +48,6 @@ deploy:
   on:
     tags: true
     repo: jazzband/django-pipeline
-    condition: "$TOXENV = py27-django111"
+    condition: "$TOXENV = py36-django30"
 notifications:
   email: false

HISTORY.rst

@@ -3,6 +3,21 @@
 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 / write in binary mode.
+* Set opening files for tests  to deal with universal newlines.
+* Upgrade documentation version to 2.0 to follow the project version.
+
 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,17 +1,10 @@
-from __future__ import unicode_literals
-
 import os
 
 from collections import OrderedDict
 
 import django
 from django.contrib.staticfiles import finders
 from django.contrib.staticfiles.storage import staticfiles_storage
-try:
-    from django.utils.six import iterkeys
-except ImportError:
-    iterkeys = iter
-
 
 from pipeline.finders import PipelineFinder
 
@@ -61,7 +54,7 @@ def collect(self, request=None, files=[]):
                 if files and len(files) == len(found_files):
                     break
 
-        return iterkeys(found_files)
+        return found_files.keys()
 
     def copy_file(self, path, prefixed_path, source_storage):
         # Delete the target file if needed or break

pipeline/compilers/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import shutil
 import subprocess
@@ -8,12 +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
-try:
-   from django.utils.six import string_types, text_type
-except ImportError:
-    string_types = (str,)
-    text_type = str
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompilerError
@@ -73,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')
@@ -114,7 +106,7 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
         """
         argument_list = []
         for flattening_arg in command:
-            if isinstance(flattening_arg, string_types):
+            if isinstance(flattening_arg, (str,)):
                 argument_list.append(flattening_arg)
             else:
                 argument_list.extend(flattening_arg)
@@ -126,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)
@@ -136,19 +128,19 @@ 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:
             stdout_captured = None  # Don't save erroneous result.
             raise CompilerError(e, command=argument_list,
-                                error_output=text_type(e))
+                                error_output=str(e))
         finally:
             # Decide what to do with captured stdout.
             if stdout:

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