feat: release v1.2.0 (#220)

* Added Dynamic Encoding Selection Based on Windows System Default

* Fixed dotnet output system dependent encoding

* Updated test_custom_make urllib3 Version

* Reformatted with black

* Rollback Changes to popen for Python 2 Support

* Added Doc Page for DotNet Output Encoding

* fix(ruby): use stdout stream to raise exceptions from bundler

- relevant error information is in stdout instead of stderr for bundler.

* chore: bump version to 1.1.0

* chore: Upgrade pytest to 6.1.1

* chore: Upgrade mock to 4.0.2

* chore: Upgrade parameterize to 0.7.4

* chore: Upgrade coverage to 5.3

* chore: Upgrade flake8 to 3.8.4

* chore: Upgrade pylint to 2.6.0

* Consider using Python 3 style super() without arguments (super-with-arguments)

* Implicit string concatenation found in assignment (implicit-str-concat)

* Consider explicitly re-raising using the 'from' keyword (raise-missing-from)

* Only install backports.tempfile for 2.7 & 3.6

* python 2 fallbacks (pylint & mock)

* Revert "Consider using Python 3 style super() without arguments (super-with-arguments)"

This reverts commit 44284ea.

* Revert "Consider explicitly re-raising using the 'from' keyword (raise-missing-from)"

This reverts commit cd7c16e.

* Disable rules that affecting Python 2

* Manage black version using requirement file (#207)

* chore: Manage black version in dev.txt

* chore: Update appveyor, use black in pip

* chore: Add pre-commit-config

* chore: Format with black 20.8b1

* chore: Add make pr2.7 for Python 2 that does not run black

* chore: Remove python patch version in AppVeyor to be more robust (#213)

* chore: Remove biased language (#212)

* fix: run GlobalToolInstallAction in a lock block and only once (#214)

* fix: run GlobalToolInstallAction in a lock block and only once

* chore: change field name and update unit tests

* chore: black formatting

* fix: change tests to use threadpool for py2

* chore: update assert call and change usage of Executor

* chore: bump version to 1.2.0 (#218)

Co-authored-by: Wilton Wang <[email protected]>
Co-authored-by: Sriram Madapusi Vasudevan <[email protected]>
Co-authored-by: Sriram Madapusi Vasudevan <[email protected]>
Co-authored-by: Sam Liu <[email protected]>
Co-authored-by: _sam <[email protected]>

Author: 4 people

.appveyor.yml

@@ -12,25 +12,25 @@ environment:
   matrix:
 
   - PYTHON: "C:\\Python27-x64"
-    PYTHON_VERSION: '2.7.18'
+    PYTHON_VERSION: '2.7'
     PYTHON_ARCH: '64'
     LINE_COVERAGE: '91'
     NEW_FLAKE8: 0
     JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
   - PYTHON: "C:\\Python36-x64"
-    PYTHON_VERSION: '3.6.10'
+    PYTHON_VERSION: '3.6'
     PYTHON_ARCH: '64'
     LINE_COVERAGE: '91'
     NEW_FLAKE8: 0
     JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
   - PYTHON: "C:\\Python37-x64"
-    PYTHON_VERSION: '3.7.7'
+    PYTHON_VERSION: '3.7'
     PYTHON_ARCH: '64'
     LINE_COVERAGE: '91'
     NEW_FLAKE8: 0
     JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
   - PYTHON: "C:\\Python38-x64"
-    PYTHON_VERSION: '3.8.2'
+    PYTHON_VERSION: '3.8'
     PYTHON_ARCH: '64'
     LINE_COVERAGE: '72'
     NEW_FLAKE8: 1
@@ -103,11 +103,6 @@ for:
       - sh: "sudo unzip -d /opt/gradle /tmp/gradle-*.zip"
       - sh: "PATH=/opt/gradle/gradle-5.5/bin:$PATH"
 
-      # Install black
-      - sh: "wget -O /tmp/black https://github.com/python/black/releases/download/19.10b0/black"
-      - sh: "chmod +x /tmp/black"
-      - sh: "/tmp/black --version"
-
     build_script:
       - "python -c \"import sys; print(sys.executable)\""
       - "LAMBDA_BUILDERS_DEV=1 pip install -e \".[dev]\""
@@ -119,5 +114,5 @@ for:
       # Runs only in Linux
       - "LAMBDA_BUILDERS_DEV=1 pytest -vv tests/integration"
 
-      # Validate Code was formatted with Black
-      - "/tmp/black --check setup.py tests aws_lambda_builders"
+      # Validate Code was formatted with Black, black is only supported in Python 3
+      - if [[ $PYTHON_VERSION = "3"* ]]; then black --check setup.py tests aws_lambda_builders; fi

.pre-commit-config.yaml

@@ -0,0 +1,9 @@
+# black is in dev.txt, so local repo is used here.
+repos:
+- repo: local
+  hooks:
+    - id: black
+      name: black
+      entry: black
+      language: system
+      types: [python]

.pylintrc

@@ -7,7 +7,7 @@
 # pygtk.require().
 #init-hook=
 
-# Add files or directories to the blacklist. They should be base names, not
+# Add files or directories to the ignore list. They should be base names, not
 # paths.
 ignore=compat.py, utils.py
 
@@ -60,7 +60,8 @@ confidence=
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
 # R0205,W0107,R1705,R1710,R1719,R1720,R1714 are all disable due to a forced upgrade to support python3.8
-disable=R0201,W0613,I0021,I0020,W1618,W1619,R0902,R0903,W0231,W0611,R0913,W0703,C0330,R0204,I0011,R0904,C0301, R0205,W0107,R1705,R1710,R1719,R1720,R1714
+# R1725,W0707 can be removed when we drop Python 2 support
+disable=R0201,W0613,I0021,I0020,W1618,W1619,R0902,R0903,W0231,W0611,R0913,W0703,C0330,R0204,I0011,R0904,C0301, R0205,W0107,R1705,R1710,R1719,R1720,R1714,R1725,W0707
 
 
 [REPORTS]

Makefile

@@ -28,3 +28,6 @@ black-check:
 
 # Verifications to run before sending a pull request
 pr: init dev black-check
+
+# Verifications to run before sending a pull request, skipping black check because black requires Python 3.6+
+pr2.7: init dev

aws_lambda_builders/__init__.py

@@ -1,5 +1,5 @@
 """
 AWS Lambda Builder Library
 """
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/workflows/custom_make/DESIGN.md

@@ -63,7 +63,7 @@ It is then the responsibility of the make target to make sure the artifacts are
   * We only care about certain build targets. so essentially this is a pluggable builder, but nothing beyond that at this point in time.
 
 * Which environment variables are usable in this makefile?
-  * There are a series of whitelisted environment variables that need to be defined and not be overriden within the Makefile to work. Currently that is just `$ARTIFACTS_DIR`
+  * There are a series of allowlisted environment variables that need to be defined and not be overridden within the Makefile to work. Currently that is just `$ARTIFACTS_DIR`
 
 * Can this be used even for runtimes that have builders associated with it? eg: python3.8?
   * Possibly, some changes would be needed be made to way the corresponding builder is picked up in sam cli. If we changed it such that there is a makefile we pick a makefile builder and if not fall back to the specified language builder.

aws_lambda_builders/workflows/dotnet_clipackage/actions.py

@@ -2,6 +2,7 @@
 Actions for .NET dependency resolution with CLI Package
 """
 
+import threading
 import os
 import logging
 
@@ -14,6 +15,8 @@
 
 
 class GlobalToolInstallAction(BaseAction):
+    __lock = threading.Lock()
+    __tools_installed = False
 
     """
     A Lambda Builder Action which installs the Amazon.Lambda.Tools .NET Core Global Tool
@@ -28,15 +31,30 @@ def __init__(self, subprocess_dotnet):
         self.subprocess_dotnet = subprocess_dotnet
 
     def execute(self):
-        try:
-            LOG.debug("Installing Amazon.Lambda.Tools Global Tool")
-            self.subprocess_dotnet.run(["tool", "install", "-g", "Amazon.Lambda.Tools", "--ignore-failed-sources"])
-        except DotnetCLIExecutionError as ex:
-            LOG.debug("Error installing probably due to already installed. Attempt to update to latest version.")
+        # run Amazon.Lambda.Tools update in sync block in case build is triggered in parallel
+        with GlobalToolInstallAction.__lock:
+            LOG.debug("Entered synchronized block for updating Amazon.Lambda.Tools")
+
+            # check if Amazon.Lambda.Tools updated recently
+            if GlobalToolInstallAction.__tools_installed:
+                LOG.info("Skipping to update Amazon.Lambda.Tools install/update, since it is updated recently")
+                return
+
             try:
-                self.subprocess_dotnet.run(["tool", "update", "-g", "Amazon.Lambda.Tools", "--ignore-failed-sources"])
+                LOG.debug("Installing Amazon.Lambda.Tools Global Tool")
+                self.subprocess_dotnet.run(["tool", "install", "-g", "Amazon.Lambda.Tools", "--ignore-failed-sources"])
+                GlobalToolInstallAction.__tools_installed = True
             except DotnetCLIExecutionError as ex:
-                raise ActionFailedError("Error configuring the Amazon.Lambda.Tools .NET Core Global Tool: " + str(ex))
+                LOG.debug("Error installing probably due to already installed. Attempt to update to latest version.")
+                try:
+                    self.subprocess_dotnet.run(
+                        ["tool", "update", "-g", "Amazon.Lambda.Tools", "--ignore-failed-sources"]
+                    )
+                    GlobalToolInstallAction.__tools_installed = True
+                except DotnetCLIExecutionError as ex:
+                    raise ActionFailedError(
+                        "Error configuring the Amazon.Lambda.Tools .NET Core Global Tool: " + str(ex)
+                    )
 
 
 class RunPackageAction(BaseAction):

aws_lambda_builders/workflows/python_pip/packager.py

@@ -157,7 +157,7 @@ class DependencyBuilder(object):
         "manylinux2010_x86_64",
         "manylinux2014_x86_64",
     }
-    _COMPATIBLE_PACKAGE_WHITELIST = {"sqlalchemy"}
+    _COMPATIBLE_PACKAGE_ALLOWLIST = {"sqlalchemy"}
 
     def __init__(self, osutils, runtime, pip_runner=None):
         """Initialize a DependencyBuilder.
@@ -291,9 +291,9 @@ def _download_dependencies(self, directory, requirements_filename):
         # Now there is still the case left over where the setup.py has been
         # made in such a way to be incompatible with python's setup tools,
         # causing it to lie about its compatibility. To fix this we have a
-        # manually curated whitelist of packages that will work, despite
+        # manually curated allowlist of packages that will work, despite
         # claiming otherwise.
-        compatible_wheels, incompatible_wheels = self._apply_wheel_whitelist(compatible_wheels, incompatible_wheels)
+        compatible_wheels, incompatible_wheels = self._apply_wheel_allowlist(compatible_wheels, incompatible_wheels)
         missing_wheels = deps - compatible_wheels
         LOG.debug("Final compatible: %s", compatible_wheels)
         LOG.debug("Final incompatible: %s", incompatible_wheels)
@@ -305,7 +305,7 @@ def _download_all_dependencies(self, requirements_filename, directory):
         # Download dependencies prefering wheel files but falling back to
         # raw source dependences to get the transitive closure over
         # the dependency graph. Return the set of all package objects
-        # which will serve as the master list of dependencies needed to deploy
+        # which will serve as the primary list of dependencies needed to deploy
         # successfully.
         self._pip.download_all_dependencies(requirements_filename, directory)
         deps = {Package(directory, filename) for filename in self._osutils.get_directory_contents(directory)}
@@ -365,11 +365,11 @@ def _is_compatible_wheel_filename(self, filename):
         # Don't know what we have but it didn't pass compatibility tests.
         return False
 
-    def _apply_wheel_whitelist(self, compatible_wheels, incompatible_wheels):
+    def _apply_wheel_allowlist(self, compatible_wheels, incompatible_wheels):
         compatible_wheels = set(compatible_wheels)
         actual_incompatible_wheels = set()
         for missing_package in incompatible_wheels:
-            if missing_package.name in self._COMPATIBLE_PACKAGE_WHITELIST:
+            if missing_package.name in self._COMPATIBLE_PACKAGE_ALLOWLIST:
                 compatible_wheels.add(missing_package)
             else:
                 actual_incompatible_wheels.add(missing_package)
@@ -550,7 +550,7 @@ def main(self, args, env_vars=None, shim=None):
 class PipRunner(object):
     """Wrapper around pip calls used by chalice."""
 
-    _LINK_IS_DIR_PATTERN = "Processing (.+?)\n" "  Link is a directory," " ignoring download_dir"
+    _LINK_IS_DIR_PATTERN = "Processing (.+?)\n  Link is a directory, ignoring download_dir"
 
     def __init__(self, python_exe, pip, osutils=None):
         if osutils is None:

requirements/dev.txt

@@ -1,19 +1,26 @@
-coverage==4.3.4
+coverage==5.3
 flake8==3.3.0; python_version < '3.8'
-flake8==3.7.9; python_version >= '3.8'
-pytest-cov==2.4.0
-# astroid > 2.0.4 is not compatible with pylint1.7
-astroid>=1.5.8,<2.1.0; python_version < '3.8'
-pylint==1.7.2; python_version < '3.8'
-pylint==2.4.4; python_version >= '3.8'
+flake8==3.8.4; python_version >= '3.8'
+pytest-cov==2.10.1
+
+# pylint 2 does not support Python 2. pylint 1.x requires astroid 1.x
+astroid~=1.6.0; python_version < '3.6'
+pylint~=1.9.5; python_version < '3.6'
+pylint~=2.6.0; python_version >= '3.6'
 isort>=4.2.5,<5; python_version < '3.8'
 
 # Test requirements
-pytest==3.0.7
-py==1.4.33
-mock==2.0.0
-parameterized==0.6.1
+pytest>=6.1.1; python_version >= '3.6'
+pytest~=4.6.11; python_version < '3.6' # pytest dropped python 2 support after 4.6.x
+mock==3.0.5; python_version < '3.6'
+mock==4.0.2; python_version >= '3.6'
+parameterized==0.7.4
 pathlib2==2.3.2; python_version<"3.4"
 futures==3.2.0; python_version<"3.2.3"
-# Py3.2 backport
-backports.tempfile==1.0
+
+# tempfile backport for < 3.6
+backports.tempfile==1.0; python_version<"3.7"
+
+
+# formatter
+black==20.8b1; python_version >= '3.6'

tests/functional/test_builder.py

@@ -59,4 +59,4 @@ def test_run_hello_workflow_with_exec_paths(self):
         with open(self.expected_filename, "r") as fp:
             contents = fp.read()
 
-        self.assertEquals(contents, self.expected_contents)
+        self.assertEqual(contents, self.expected_contents)