Drop Python 2 / Django 1.11 (#369)

Code compatibility layers to support python, old django will be removed in a future commit / PR

.travis.yml

@@ -6,7 +6,6 @@ python:
   - 3.7
   - 3.6
   - 3.5
-  - 2.7
 
 env:
 
@@ -28,8 +27,7 @@ before_install:
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
-  - pip install -U setuptools tox virtualenv coveralls
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export TOX_ENV=py27; fi"
+  - pip install -U setuptools tox virtualenv coveralls>=2
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export TOX_ENV=py35; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export TOX_ENV=py36; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then export TOX_ENV=py37; fi"
@@ -40,17 +38,12 @@ install:
 script: COMMAND='coverage run --source=djangocms_installer' tox -e$TOX_ENV
 
 after_success:
+  - coverage report -m
   - codecov
   - coveralls
 
 matrix:
   exclude:
-  - python: 2.7
-    env: TEST='pep8'
-  - python: 2.7
-    env: TEST='isort'
-  - python: 2.7
-    env: TEST='docs'
   - python: 3.5
     env: TEST='pep8'
   - python: 3.5

README.rst

@@ -16,28 +16,8 @@ project.
 
 Refer to `django CMS Tutorial`_ on how to properly setup your first django CMS project.
 
-.. warning:: For all 1.2 RC django CMS 3.7 rc will be installed by default, **not** latest stable,
-             to ensure a smoother transition. Likewise "3.7", "stable" and "lts" selector will install
-             django CMS 3.7rc1
-
-.. warning:: Version 1.2 dropped support for Python 3.4, django CMS < 3.6 and Django < 1.11.
-             More 1.1.x versions may be released after 1.2 is out in case important bugfixes will
-             be needed.
-
-.. warning:: Due to some incompatibilities between psycopg2 2.8 and Django 2.1+ we ship with psycopg2 2.7
-             when PostgreSQL database is selected, this in turn trigger an outdated psycopg2 warning. To
-             silence it, add the following to your ``manage.py``:
-
-             .. code-block:: python
-
-                 import os
-                 import sys
-                 import warnings
-
-                 if __name__ == '__main__':
-                     warnings.filterwarnings(
-                         'ignore', r'The psycopg2.*release 2\.8', UserWarning, 'psycopg2')
-                     # ... rest of code ...
+.. warning:: Version 2.0 dropped support for Python 2.7, django CMS < 3.7 and Django < 2.2.
+             More 1.2.x versions may be released after 1.2 is out in case important bugfixes will be needed.
 
 Usage
 -----
@@ -88,15 +68,13 @@ Supported versions
 
 The current supported version matrix is the following:
 
-+----------------+-------------+-------------+---------------+--------------+--------------+
-|                | Django 1.11 | Django 2.0  | Django 2.1    | Django 2.2   | Django 3.0   |
-+----------------+-------------+-------------+---------------+--------------+--------------+
-| django CMS 3.6 | Supported   | Supported   | Supported     | Supported    | Supported    |
-+----------------+-------------+-------------+---------------+--------------+--------------+
-| django CMS 3.7 | Supported   | Supported   | Supported     | Supported    | Supported    |
-+----------------+-------------+-------------+---------------+--------------+--------------+
++----------------+--------------+--------------+
+|                |  Django 2.2  | Django 3.0   |
++----------------+--------------+--------------+
+| django CMS 3.7 | Supported    | Supported    |
++----------------+--------------+--------------+
 
-See `version 1.1`_ for older Django / django CMS versions support
+See `version 1.2`_ for older Django / django CMS versions support
 
 Any beta and develop version of Django and django CMS, by its very nature,
 it's not supported, while it still may work.
@@ -127,7 +105,7 @@ Please check that the ``.py`` extension is associated correctly with Python inte
     Python.File="C:\Windows\py.exe" "%1" %*
 
 
-.. _version 1.1: https://github.com/nephila/djangocms-installer/tree/release/1.1.x#supported-versions
+.. _version 1.2: https://github.com/nephila/djangocms-installer/tree/release/1.2.x#supported-versions
 .. _django CMS Tutorial: https://django-cms.readthedocs.io/en/latest/introduction/index.html
 .. _installer usage page: http://djangocms-installer.readthedocs.io/en/latest/usage.html
 

djangocms_installer/config/__init__.py

@@ -275,21 +275,14 @@ def parse(args):
             requirements.extend(data.REQUIREMENTS['cms-master'])
         elif LooseVersion(cms_version) >= LooseVersion('3.7'):
             requirements.extend(data.REQUIREMENTS['cms-3.7'])
-        elif LooseVersion(cms_version) >= LooseVersion('3.6'):
-            requirements.extend(data.REQUIREMENTS['cms-3.6'])
 
         if not args.no_db_driver:
-            if args.db_driver == 'psycopg2' and django_version in ('1.11', '2.0', '2.1'):
-                requirements.append('psycopg2<2.8')
-            else:
-                requirements.append(args.db_driver)
+            requirements.append(args.db_driver)
         if not args.no_plugins:
             if args.cms_version in ('rc', 'develop'):
                 requirements.extend(data.REQUIREMENTS['plugins-master'])
             elif LooseVersion(cms_version) >= LooseVersion('3.7'):
                 requirements.extend(data.REQUIREMENTS['plugins-3.7'])
-            elif LooseVersion(cms_version) >= LooseVersion('3.6'):
-                requirements.extend(data.REQUIREMENTS['plugins-3.6'])
             requirements.extend(data.REQUIREMENTS['filer'])
 
         # Django version check
@@ -304,12 +297,8 @@ def parse(args):
 
         if django_version == '2.2':
             requirements.extend(data.REQUIREMENTS['django-2.2'])
-        elif django_version == '2.1':
-            requirements.extend(data.REQUIREMENTS['django-2.1'])
-        elif django_version == '2.0':
-            requirements.extend(data.REQUIREMENTS['django-2.0'])
-        elif django_version == '1.11':
-            requirements.extend(data.REQUIREMENTS['django-1.11'])
+        elif django_version == '3.0':
+            requirements.extend(data.REQUIREMENTS['django-3.0'])
 
         requirements.extend(data.REQUIREMENTS['default'])
 

djangocms_installer/config/data.py

@@ -18,37 +18,24 @@
     **bust
 )
 DJANGOCMS_BETA = DJANGOCMS_RC
-DJANGOCMS_36 = 'django-cms>=3.6,<3.7'
+DJANGOCMS_37 = 'django-cms>=3.7,<3.8'
 
-if sys.version_info > (3, 0):
-    DJANGOCMS_37 = 'django-cms>=3.7,<3.8'
-else:
-    DJANGOCMS_37 = 'django-cms>=3.7,<3.7.2'
-
-if sys.version_info >= (3, 5):
-    DJANGOCMS_SUPPORTED = ('3.6', '3.7', 'stable', 'lts', 'develop', 'rc')
-    DJANGOCMS_STABLE = '3.7'
-    DJANGOCMS_LTS = '3.7'
-else:
-    DJANGOCMS_SUPPORTED = ('3.6', '3.7', 'stable', 'lts', 'develop', 'rc')
-    DJANGOCMS_STABLE = '3.7'
-    DJANGOCMS_LTS = '3.7'
+DJANGOCMS_SUPPORTED = ('3.7', 'stable', 'lts', 'develop', 'rc')
+DJANGOCMS_STABLE = '3.7'
+DJANGOCMS_LTS = '3.7'
 DJANGOCMS_DEFAULT = DJANGOCMS_STABLE
 
 DJANGO_DEVELOP = 'https://github.com/django/django/archive/master.zip?{bust}'.format(**bust)
 DJANGO_BETA = 'https://github.com/django/django/archive/master.zip?{bust}'.format(**bust)
 if sys.version_info >= (3, 6):
-    DJANGO_SUPPORTED = ('1.11', '2.0', '2.1', '2.2', '3.0', 'stable', 'lts')
+    DJANGO_SUPPORTED = ('2.2', '3.0', 'stable', 'lts')
     DJANGO_STABLE = '3.0'
     DJANGO_LTS = '2.2'
-elif (3, 6) > sys.version_info >= (3, 5):
-    DJANGO_SUPPORTED = ('1.11', '2.0', '2.1', '2.2', 'stable', 'lts')
+else:
+    DJANGO_SUPPORTED = ('2.2', 'stable', 'lts')
     DJANGO_STABLE = '2.2'
     DJANGO_LTS = '2.2'
-else:
-    DJANGO_SUPPORTED = ('1.11', 'stable', 'lts')
-    DJANGO_STABLE = '1.11'
-    DJANGO_LTS = '1.11'
+
 DJANGO_DEFAULT = DJANGO_STABLE
 
 CMS_VERSION_MATRIX = {
@@ -66,14 +53,12 @@
     'develop': DJANGO_STABLE
 }
 VERSION_MATRIX = {
-    '3.6': ('1.11', '2.1'),
-    '3.7': ('1.11', '3.0'),
-    DJANGOCMS_BETA: ('1.11', '3.0'),
-    DJANGOCMS_RC: ('1.11', '3.0'),
-    DJANGOCMS_DEVELOP: ('1.11', '2.2', '3.0'),
+    '3.7': ('2.2', '3.0'),
+    DJANGOCMS_BETA: ('2.2', '3.0'),
+    DJANGOCMS_RC: ('2.2', '3.0'),
+    DJANGOCMS_DEVELOP: ('2.2', '3.0'),
 }
 PACKAGE_MATRIX = {
-    '3.6': DJANGOCMS_36,
     '3.7': DJANGOCMS_37,
     DJANGOCMS_RC: DJANGOCMS_RC,
     DJANGOCMS_BETA: DJANGOCMS_BETA,
@@ -87,22 +72,6 @@
         'six',
         'pytz',
     ],
-    'django-1.11': [
-        'django-classy-tags>=0.9',
-        'django-sekizai>=1.0',
-        'django-mptt>0.9',
-        'django-formtools>=2.1,<2.2',
-    ],
-    'django-2.0': [
-        'django-classy-tags>=0.9',
-        'django-sekizai>=1.0',
-        'django-mptt>0.9',
-    ],
-    'django-2.1': [
-        'django-classy-tags>=0.9',
-        'django-sekizai>=1.0',
-        'django-mptt>0.9',
-    ],
     'django-2.2': [
         'django-classy-tags>=0.9',
         'django-sekizai>=1.0',
@@ -113,13 +82,6 @@
         'django-sekizai>=1.0',
         'django-mptt>0.9',
     ],
-    'reversion-django-1.11': [
-        'django-reversion>=2.0,<2.1',
-    ],
-    'cms-3.6': [
-        'djangocms-admin-style>=1.5,<1.6',
-        'django-treebeard>=4.0,<5.0',
-    ],
     'cms-3.7': [
         'djangocms-admin-style>=1.5,<1.6',
         'django-treebeard>=4.0,<5.0',
@@ -128,18 +90,6 @@
         'https://github.com/divio/djangocms-admin-style/archive/master.zip?{bust}'.format(**bust),
         'django-treebeard>=4.0,<5.0',
     ],
-    'plugins-3.6': [
-        'djangocms-text-ckeditor>=3.7,<4.0',
-        'djangocms-link>=2.5,<2.7',
-        'djangocms-icon>=1.4,<1.6',
-        'djangocms-style>=2.2,<2.4',
-        'djangocms-googlemap>=1.3,<1.5',
-        'djangocms-snippet>=2.2,<2.4',
-        'djangocms-video>=2.1,<2.4',
-        'djangocms-file>=2.3,<2.5',
-        'djangocms-picture>=2.3,<2.5',
-        'djangocms-bootstrap4>=1.5,<1.7',
-    ],
     'plugins-3.7': [
         'djangocms-text-ckeditor>=3.7,<4.0',
         'djangocms-link>=2.5,<2.7',

djangocms_installer/django/__init__.py

@@ -10,17 +10,13 @@
 import textwrap
 from copy import copy, deepcopy
 from distutils.version import LooseVersion
+from shlex import quote as shlex_quote
 
 from six import iteritems
 
 from ..config import data, get_settings
 from ..utils import chdir, format_val
 
-try:
-    from shlex import quote as shlex_quote
-except ImportError:
-    from pipes import quote as shlex_quote
-
 
 def create_project(config_data):
     """
@@ -122,7 +118,7 @@ def patch_settings(config_data):
     current_django_version = LooseVersion(django.__version__)
     declared_django_version = LooseVersion(config_data.django_version)
 
-    if not os.path.exists(config_data.settings_path):
+    if not os.path.exists(config_data.settings_path):  # pragma: no cover
         sys.stderr.write(
             'Error while creating target project, '
             'please check the given configuration: {0}\n'.format(config_data.settings_path)
@@ -194,10 +190,7 @@ def patch_settings(config_data):
         item_re = re.compile(r'{0} = [^\]]+\]'.format(item), re.DOTALL | re.MULTILINE)
         original = item_re.sub('', original)
     # TEMPLATES is special, so custom regexp needed
-    if declared_django_version >= LooseVersion('2.0'):
-        item_re = re.compile(r'TEMPLATES = .+\},\n\s+\},\n]$', re.DOTALL | re.MULTILINE)
-    else:
-        item_re = re.compile(r'TEMPLATES = .+\]$', re.DOTALL | re.MULTILINE)
+    item_re = re.compile(r'TEMPLATES = .+\},\n\s+\},\n]$', re.DOTALL | re.MULTILINE)
     original = item_re.sub('', original)
     # DATABASES is a dictionary, so different regexp needed
     item_re = re.compile(r'DATABASES = [^\}]+\}[^\}]+\}', re.DOTALL | re.MULTILINE)
@@ -363,7 +356,7 @@ def setup_database(config_data):
             sys.stdout.write('Creating admin user\n')
             if config_data.noinput:
                 create_user(config_data)
-            else:
+            else:  # pragma: no cover
                 subprocess.check_call(' '.join(
                     [sys.executable, '-W', 'ignore', 'manage.py', 'createsuperuser']
                 ), shell=True, stderr=subprocess.STDOUT)

djangocms_installer/install/__init__.py

@@ -97,7 +97,7 @@ def requirements(req_file, pip_options='', is_file=False, verbose=False):
         subprocess.check_output(['python', '-msite'], stderr=subprocess.STDOUT)
         output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
         sys.stdout.write(output.decode('utf-8'))
-    except Exception as e:
+    except Exception as e:  # pragma: no cover
         logger.error('cmd : %s :%s' % (e.cmd, e.output))
         raise
 
@@ -124,7 +124,7 @@ def cleanup_directory(config_data):
     """
     if os.path.exists(config_data.project_directory):
         choice = False
-        if config_data.noinput is False and not config_data.verbose:
+        if config_data.noinput is False and not config_data.verbose:  # pragma: no cover
             choice = query_yes_no(
                 'The installation failed.\n'
                 'Do you want to clean up by removing {0}?\n'

djangocms_installer/utils.py

@@ -102,25 +102,22 @@ def less_than_version(value):
     if len(items) == 1:
         items.append(0)
     items[1] += 1
-    if value == '1.11':
-        return '2.0'
-    else:
-        return '.'.join(map(str, items))
+    return '.'.join(map(str, items))
 
 
 class chdir(object):
     """
     Context manager for changing the current working directory
     """
-    def __init__(self, newPath):
-        self.newPath = newPath
+    def __init__(self, new_path):
+        self.new_path = new_path
 
     def __enter__(self):
-        self.savedPath = os.getcwd()
-        os.chdir(self.newPath)
+        self.saved_path = os.getcwd()
+        os.chdir(self.new_path)
 
     def __exit__(self, etype, value, traceback):
-        os.chdir(self.savedPath)
+        os.chdir(self.saved_path)
 
 
 def format_val(val):

requirements-test.txt

@@ -3,4 +3,4 @@ flake8
 tox
 mock
 pillow
-coverage<5.0
+coverage>=5