Following the Python and Django roadmap, removing all versions not supported anymore in 2020

Author: TheBuky

.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=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=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-django22"
 notifications:
   email: false

pipeline/collector.py

@@ -7,10 +7,6 @@
 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 +57,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

@@ -9,11 +9,6 @@
 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
@@ -114,7 +109,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)
@@ -148,7 +143,7 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
         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/compressors/__init__.py

@@ -10,10 +10,6 @@
 
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.utils.encoding import smart_bytes, force_text
-try:
-    from django.utils.six import string_types
-except ImportError:
-    string_types = (str,)
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompressorError
@@ -241,7 +237,7 @@ class SubProcessCompressor(CompressorBase):
     def execute_command(self, command, content):
         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)

pipeline/conf.py

@@ -8,10 +8,6 @@
 from django.conf import settings as _settings
 from django.core.signals import setting_changed
 from django.dispatch import receiver
-try:
-    from django.utils.six import string_types
-except ImportError:
-    string_types = (str,)
 
 
 DEFAULTS = {
@@ -101,7 +97,7 @@ def __init__(self, wrapped_settings):
     def __getitem__(self, key):
         value = self.settings[key]
         if key.endswith(("_BINARY", "_ARGUMENTS")):
-            if isinstance(value, string_types):
+            if isinstance(value, (str,)):
                 return tuple(shlex.split(value, posix=(os.name == 'posix')))
             return tuple(value)
         return value

pipeline/forms.py

@@ -4,12 +4,6 @@
 
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.utils.functional import cached_property
-try:
-    from django.utils.six import iteritems, add_metaclass
-except ImportError:
-    from .decorator import add_metaclass
-    def iteritems(dictionary):
-        return dictionary.items()
 
 from .collector import default_collector
 from .conf import settings
@@ -173,7 +167,7 @@ def _get_css_files(cls, extra_files):
                                   media_type='css',
                                   extra_files=extra_files.get(media_target,
                                                               [])))
-            for media_target, media_packages in iteritems(css_packages)
+            for media_target, media_packages in css_packages.items()
         )
 
     def _get_js_files(cls, extra_files):
@@ -238,8 +232,7 @@ def _get_media_files(cls, packager, media_packages, media_type,
         return source_files
 
 
-@add_metaclass(PipelineFormMediaMetaClass)
-class PipelineFormMedia(object):
+class PipelineFormMedia(object, metaclass=PipelineFormMediaMetaClass):
     """Base class for form or widget Media classes that use Pipeline packages.
 
     Forms or widgets that need custom CSS or JavaScript media on a page can

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='django-pipeline',
-    version='1.7.0',
+    version='2.0.0',
     description='Pipeline is an asset packaging library for Django.',
     long_description=io.open('README.rst', encoding='utf-8').read() + '\n\n' +
         io.open('HISTORY.rst', encoding='utf-8').read(),
@@ -24,21 +24,18 @@
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: Implementation :: PyPy',
+        'Programming Language :: Python :: Implementation :: PyPy3',
         'Topic :: Utilities',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Internet :: WWW/HTTP',

tox.ini

@@ -1,26 +1,20 @@
 [tox]
 envlist =
-  {py27,pypy,py34}-django{111}
-  py35-django{20,22,111,-master}
-  py36-django{111,22,-master}
-  py37-django{111,22,-master}
+  {pypy3,py35}-django{22}
+  py36-django{22,30,-master}
+  py37-django{22,30,-master}
   py38-django{22,30,-master}
   docs
 
 [testenv]
 basepython =
-  py27: python2.7
-  pypy: pypy
-  py34: python3.4
+  pypy3: pypy3
   py35: python3.5
   py36: python3.6
   py37: python3.7
   py38: python3.8
 deps =
-  py{27,py}: mock
-  py{27,py}: futures
-  django111: Django>=1.11,<1.12
-  django20: Django>=2.0,<2.2
+  pypy3: mock
   django22: Django>=2.2.1,<2.3
   django30: Django>=3.0
   django-master: https://github.com/django/django/archive/master.tar.gz
@@ -39,7 +33,7 @@ commands =
 whitelist_externals = npm
 
 [testenv:docs]
-basepython = python2.7
+basepython = python3.6
 changedir = docs
 deps = sphinx
 commands =