Deprecate: Remove Python2.7 installation support

appveyor-windows.yml

@@ -25,6 +25,7 @@ environment:
   HOME: 'C:\Users\appveyor'
   HOMEDRIVE: 'C:'
   HOMEPATH: 'C:\Users\appveyor'
+  NOSE_PARAMETERIZED_NO_WARN: 1
 
 init:
   # Uncomment this for RDP

appveyor.yml

@@ -12,11 +12,13 @@ environment:
     - PYTHON_HOME: "C:\\Python36-x64"
       PYTHON_VERSION: '3.6.8'
       PYTHON_ARCH: '64'
+      NOSE_PARAMETERIZED_NO_WARN: 1
 
     - PYTHON_HOME: "C:\\Python37-x64"
       PYTHON_VERSION: '3.7.4'
       PYTHON_ARCH: '64'
       RUN_SMOKE: 1
+      NOSE_PARAMETERIZED_NO_WARN: 1
 
 for:
   - 
@@ -30,12 +32,16 @@ for:
       - "echo %PATH%"
       - "python --version"
       # Upgrade setuptools, wheel and virtualenv
+      - "SET PATH=%PYTHON_HOME%;%PATH%"
+      - "echo %PYTHON_HOME%"
+      - "echo %PATH%"
       - "python -m pip install --upgrade setuptools wheel virtualenv"
 
       # Create new virtual environment and activate it
       - "rm -rf venv"
       - "python -m virtualenv venv"
       - "venv\\Scripts\\activate"
+      - "python --version"
 
     build_script:
       # Activate virtualenv again on windows

pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools", "wheel"]  # PEP 508 specifications.
 
 [tool.black]
 line-length = 120
-target_version = ['py37', 'py27', 'py36']
+target_version = ['py37', 'py36']
 exclude = '''
 
 (
@@ -17,6 +17,7 @@ exclude = '''
     | dist
     | pip-wheel-metadata
     | samcli/local/init/templates
+    | tests/integration/testdata
   )/
 )
 '''

pytest.ini

@@ -1,5 +1,5 @@
 [pytest]
 env =
     AWS_DEFAULT_REGION = ap-southeast-1
-filterwarnings =
-    error
+#filterwarnings =
+#    error

requirements/base.txt

@@ -1,7 +1,5 @@
-six~=1.11.0
 chevron~=0.12
 click~=7.0
-enum34~=1.1.6; python_version<"3.4"
 Flask~=1.0.2
 boto3~=1.9, >=1.9.56
 PyYAML~=5.1
@@ -10,7 +8,6 @@ aws-sam-translator==1.15.1
 docker~=4.0
 dateparser~=0.7
 python-dateutil~=2.6
-pathlib2~=2.3.2; python_version<"3.4"
 requests==2.22.0
 serverlessrepo==0.1.9
 aws_lambda_builders==0.5.0

requirements/dev.txt

@@ -1,20 +1,11 @@
-coverage==4.3.4
-pytest-cov==2.4.0
-# astroid > 2.0.4 is not compatible with pylint1.7
-astroid>=1.5.8,<2.1.0
-pylint==1.7.2
+coverage==4.5.4
+pytest-cov==2.7.1
+pylint==2.3.1
 
 # Test requirements
-pytest==3.6.0
-py==1.5.1
-pluggy==0.6.0
-mock==2.0.0
-parameterized==0.6.1
-pathlib2==2.3.2; python_version<"3.4"
-futures==3.2.0; python_version<"3.2.3"
-# Py3.2 backport
-backports.tempfile==1.0
-pytest-xdist==1.20.0
-pytest-forked==1.0.2
+pytest==5.2.1
+parameterized==0.7.0
+pytest-xdist==1.30.0
+pytest-forked==1.1.3
 pytest-timeout==1.3.3
-pytest-rerunfailures==5.0
+pytest-rerunfailures==7.0

samcli/cli/command.py

@@ -4,7 +4,6 @@
 
 import logging
 import importlib
-import sys
 from collections import OrderedDict
 
 import click
@@ -24,13 +23,6 @@
     "samcli.commands.publish",
 ]
 
-DEPRECATION_NOTICE = (
-    "Deprecated : AWS SAM CLI no longer supports "
-    "installations on Python 2.7. "
-    "Install AWS SAM CLI via https://docs.aws.amazon.com/serverless-application-model/"
-    "latest/developerguide/serverless-sam-cli-install.html for continued support with new versions. \n"
-)
-
 
 class BaseCommand(click.MultiCommand):
     """
@@ -53,7 +45,7 @@ class BaseCommand(click.MultiCommand):
     will produce a command name "baz".
     """
 
-    def __init__(self, cmd_packages=None, *args, **kwargs):
+    def __init__(self, *args, cmd_packages=None, **kwargs):
         """
         Initializes the class, optionally with a list of available commands
 
@@ -69,9 +61,6 @@ def __init__(self, cmd_packages=None, *args, **kwargs):
         self._commands = {}
         self._commands = BaseCommand._set_commands(cmd_packages)
 
-        if sys.version_info.major == 2:
-            click.secho(DEPRECATION_NOTICE, fg="red", err=True)
-
     @staticmethod
     def _set_commands(package_names):
         """
@@ -109,18 +98,18 @@ def get_command(self, ctx, cmd_name):
         """
         if cmd_name not in self._commands:
             logger.error("Command %s not available", cmd_name)
-            return
+            return None
 
         pkg_name = self._commands[cmd_name]
 
         try:
             mod = importlib.import_module(pkg_name)
         except ImportError:
             logger.exception("Command '%s' is not configured correctly. Unable to import '%s'", cmd_name, pkg_name)
-            return
+            return None
 
         if not hasattr(mod, "cli"):
             logger.error("Command %s is not configured correctly. It must expose an function called 'cli'", cmd_name)
-            return
+            return None
 
         return mod.cli

samcli/cli/context.py

@@ -8,7 +8,7 @@
 import click
 
 
-class Context(object):
+class Context:
     """
     Top level context object for the CLI. Exposes common functionality required by a CLI, including logging,
     environment config parsing, debug logging etc.
@@ -98,6 +98,8 @@ def command_path(self):
         if click_core_ctx:
             return click_core_ctx.command_path
 
+        return None
+
     @staticmethod
     def get_current_context():
         """
@@ -129,6 +131,8 @@ def my_command_handler(ctx):
         if click_core_ctx:
             return click_core_ctx.find_object(Context) or click_core_ctx.ensure_object(Context)
 
+        return None
+
     def _refresh_session(self):
         """
         Update boto3's default session by creating a new session based on values set in the context. Some properties of

samcli/cli/global_config.py

@@ -6,13 +6,10 @@
 import logging
 import uuid
 import os
+from pathlib import Path
 
 import click
 
-try:
-    from pathlib import Path
-except ImportError:  # pragma: no cover
-    from pathlib2 import Path  # pragma: no cover
 
 LOG = logging.getLogger(__name__)
 
@@ -21,7 +18,7 @@
 TELEMETRY_ENABLED_KEY = "telemetryEnabled"
 
 
-class GlobalConfig(object):
+class GlobalConfig:
     """
     Contains helper methods for global configuration files and values. Handles
     configuration file creation, updates, and fetching in a platform-neutral way.

samcli/commands/_utils/template.py

@@ -3,14 +3,9 @@
 """
 
 import os
-import six
+import pathlib
 import yaml
 
-try:
-    import pathlib
-except ImportError:
-    import pathlib2 as pathlib
-
 from samcli.yamlhelper import yaml_parse, yaml_dump
 
 
@@ -218,7 +213,7 @@ def _resolve_relative_to(path, original_root, new_root):
     Updated path if the given path is a relative path. None, if the path is not a relative path.
     """
 
-    if not isinstance(path, six.string_types) or path.startswith("s3://") or os.path.isabs(path):
+    if not isinstance(path, str) or path.startswith("s3://") or os.path.isabs(path):
         # Value is definitely NOT a relative path. It is either a S3 URi or Absolute path or not a string at all
         return None
 

samcli/commands/build/build_context.py

@@ -5,11 +5,7 @@
 import logging
 import os
 import shutil
-
-try:
-    import pathlib
-except ImportError:
-    import pathlib2 as pathlib
+import pathlib
 
 from samcli.local.docker.manager import ContainerManager
 from samcli.commands.local.lib.sam_function_provider import SamFunctionProvider
@@ -21,7 +17,7 @@
 LOG = logging.getLogger(__name__)
 
 
-class BuildContext(object):
+class BuildContext:
 
     # Build directories need not be world writable.
     # This is usually a optimal permission for directories
@@ -150,7 +146,7 @@ def functions_to_build(self):
                 available_function_message = "{} not found. Possible options in your template: {}" \
                     .format(self._function_identifier, all_functions)
                 LOG.info(available_function_message)
-                raise FunctionNotFound("Unable to find a Function with name '%s'", self._function_identifier)
+                raise FunctionNotFound("Unable to find a Function with name '{}'".format(self._function_identifier))
 
             return [function]
 

samcli/commands/build/exceptions.py

@@ -7,4 +7,3 @@ class InvalidBuildDirException(UserException):
     """
     Value provided to --build-dir is invalid
     """
-    pass

samcli/commands/init/__init__.py

@@ -14,7 +14,7 @@
 
 
 @click.command(
-    "init", short_help="Init an AWS SAM application.", context_settings=dict(help_option_names=[u"-h", u"--help"])
+    "init", short_help="Init an AWS SAM application.", context_settings=dict(help_option_names=["-h", "--help"])
 )
 @click.option("-l", "--location", help="Template location (git, mercurial, http(s), zip, path)")
 @click.option(

samcli/commands/local/cli_common/invoke_context.py

@@ -5,6 +5,7 @@
 import errno
 import json
 import os
+from pathlib import Path
 
 import samcli.lib.utils.osutils as osutils
 from samcli.lib.utils.stream_writer import StreamWriter
@@ -18,16 +19,8 @@
 from .user_exceptions import InvokeContextException, DebugContextException
 from ..lib.sam_function_provider import SamFunctionProvider
 
-# This is an attempt to do a controlled import. pathlib is in the
-# Python standard library starting at 3.4. This will import pathlib2,
-# which is a backport of the Python Standard Library pathlib
-try:
-    from pathlib import Path
-except ImportError:
-    from pathlib2 import Path
 
-
-class InvokeContext(object):
+class InvokeContext:
     """
     Sets up a context to invoke Lambda functions locally by parsing all command line arguments necessary for the
     invoke.
@@ -350,11 +343,10 @@ def _get_debug_context(debug_port, debug_args, debugger_path):
             except OSError as error:
                 if error.errno == errno.ENOENT:
                     raise DebugContextException("'{}' could not be found.".format(debugger_path))
-                else:
-                    raise error
 
-            # We turn off pylint here due to https://github.com/PyCQA/pylint/issues/1660
-            if not debugger.is_dir():  # pylint: disable=no-member
+                raise error
+
+            if not debugger.is_dir():
                 raise DebugContextException("'{}' should be a directory with the debugger in it.".format(debugger_path))
             debugger_path = str(debugger)
 

samcli/commands/local/cli_common/options.py

@@ -1,14 +1,11 @@
 """
 Common CLI options for invoke command
 """
+from pathlib import Path
 
 import click
-from samcli.commands._utils.options import template_click_option, docker_click_options, parameter_override_click_option
 
-try:
-    from pathlib import Path
-except ImportError:
-    from pathlib2 import Path
+from samcli.commands._utils.options import template_click_option, docker_click_options, parameter_override_click_option
 
 
 def get_application_dir():