Merge 549d3c0 into 8ff69cb

.isort.cfg

@@ -4,7 +4,6 @@ indent='    '
 skip=src/pyscaffold/contrib,.tox,.venv,build,dist
 known_standard_library=StringIO,__builtin__
 known_setuptools=setuptools,pkg_resources
-known_compat=six
 known_test=pytest
 known_first_party=pyscaffold
 sections=FUTURE,STDLIB,COMPAT,SETUPTOOLS,TEST,THIRDPARTY,FIRSTPARTY,LOCALFOLDER

.travis.yml

@@ -8,29 +8,21 @@ matrix:
     - os: linux
       python: 3.4
       env: DISTRIB="ubuntu" TOX_PYTHON_VERSION="py34" COVERAGE="true"
-    - os: linux
-      env: DISTRIB="conda" PYTHON_VERSION="2.7" COVERAGE="false"
     - os: linux
       env: DISTRIB="conda" PYTHON_VERSION="3.4" COVERAGE="false"
     - os: linux
       env: DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="false"
     - os: linux
       env: DISTRIB="conda" PYTHON_VERSION="3.6" COVERAGE="false"
-    - os: osx
-      language: generic  # workaround for osx (travis-ci #7132)
-      env: PYTHON_VERSION="2.7" COVERAGE="false"
+    - os: linux
+      env: DISTRIB="conda" PYTHON_VERSION="3.7" COVERAGE="false"
     - os: osx
       language: generic  # workaround for osx (travis-ci #7132)
       env: PYTHON_VERSION="3.6" COVERAGE="false"
   allow_failures:
-    # Python2 does currently not work with reading setup.cfg
-    # TODO: Follow issue https://github.com/pypa/setuptools/issues/1136
-    - os: linux
-      env: DISTRIB="ubuntu" PYTHON_VERSION="2.7" COVERAGE="true"
+    # python=3.7 has currently a conflict with virtualenv in conda
     - os: linux
-      env: DISTRIB="conda" PYTHON_VERSION="2.7" COVERAGE="false"
-    - os: osx
-      env: PYTHON_VERSION="2.7" COVERAGE="false"
+      env: DISTRIB="conda" PYTHON_VERSION="3.7" COVERAGE="false"
 install:
   - source tests/travis_install.sh
 before_script:

AUTHORS.rst

@@ -17,3 +17,5 @@ Contributors
 * Pablo Aguiar <scorphus@gmail.com>
 * Vicky C Lau <vcl2@sfu.ca>
 * Reuven Podmazo <reuven.podmazo@gmail.com>
+* Juan Leni <jleni@users.noreply.github.com>
+* Anthony Sottile <asottile@umich.edu>

CHANGELOG.rst

@@ -8,6 +8,7 @@ Development version
 Version 3.1
 -----------
 
+- Officially dropped Python 2 support, issue #177
 - Moved ``entry_points`` and ``setup_requires`` to ``setup.cfg``, issue #176
 - Updated ``travis.yml`` template, issue #181
 - Set ``install_requires`` to setuptools>=31

docs/extensions.rst

@@ -262,7 +262,6 @@ extension which defines the ``define_awesome_files`` action:
 
     MY_AWESOME_FILE = """\
     # -*- coding: utf-8 -*-
-    from __future__ import print_function
 
     __author__ = "{author}"
     __copyright__ = "{author}"

setup.cfg

@@ -11,13 +11,12 @@ classifiers =
     Development Status :: 5 - Production/Stable
     Topic :: Utilities
     Programming Language :: Python
-# Uncomment below when setuptools issue is fixed
-#    Programming Language :: Python :: 2
-#    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Environment :: Console
     Intended Audience :: Developers
     License :: OSI Approved :: MIT License

src/pyscaffold/api/__init__.py

@@ -2,7 +2,6 @@
 """
 Exposed API for accessing PyScaffold via Python.
 """
-from __future__ import absolute_import
 
 import os
 from datetime import date, datetime

src/pyscaffold/api/helpers.py

@@ -2,11 +2,9 @@
 """
 Useful functions for manipulating the action list and project structure.
 """
-from __future__ import absolute_import
 
 from copy import deepcopy
 
-from ..contrib.six import string_types
 from ..exceptions import ActionNotFound
 from ..log import logger
 from ..structure import FileOp, define_structure
@@ -54,7 +52,7 @@ def ensure(struct, path, content=None, update_rule=None):
         Use an empty string as content to ensure a file is created empty.
     """
     # Ensure path is a list.
-    if isinstance(path, string_types):
+    if isinstance(path, str):
         path = path.split('/')
 
     # Walk the entire path, creating parents if necessary.
@@ -96,7 +94,7 @@ def reject(struct, path):
         dict: modified project tree representation
     """
     # Ensure path is a list.
-    if isinstance(path, string_types):
+    if isinstance(path, str):
         path = path.split('/')
 
     # Walk the entire path, creating parents if necessary.

src/pyscaffold/cli.py

@@ -2,7 +2,6 @@
 """
 Command-Line-Interface of PyScaffold
 """
-from __future__ import absolute_import, print_function
 
 import argparse
 import logging

src/pyscaffold/contrib/__init__.py

@@ -11,12 +11,10 @@
 Currently the contrib packages are:
 
 1) setuptools_scm v1.17.0
-2) six 1.11.0
-3) pytest-runner 3.0
+2) pytest-runner 3.0
 
 The packages/modules were just copied over.
 """
-from __future__ import division, print_function, absolute_import
 
 # Following dummy definitions are here in case PyScaffold version < 3
 # is still installed and setuptools checks the registered entry_points.