Merge pull request #1570 from awslabs/develop

chore: 0.32.0 Release

appveyor-windows-build-java-inprocess.yml

@@ -55,4 +55,6 @@ install:
 test_script:
     # Reactivate virtualenv before running tests
     - "venv\\Scripts\\activate"
-    - "pytest -vv tests/integration/buildcmd/test_build_cmd.py -k test_building_java_in_process"
+    - "pytest -vv tests/integration/buildcmd/test_build_cmd.py -k test_building_java8_in_process"
+    - "SET JAVA_HOME=C:\\Program Files\\Java\\jdk11"
+    - "pytest -vv tests/integration/buildcmd/test_build_cmd.py -k test_building_java11_in_process"

appveyor-windows-build-python.yml

@@ -37,8 +37,13 @@ init:
 install:
 
     # Make sure the temp directory exists for Python to use.
+    # Install python3.8
+    - "choco install python3 --version 3.8.0"
+    - "C:\\Python38\\python.exe -m pip freeze"
+    - "refreshenv"
+
     - ps: "mkdir -Force D:\\tmp"
-    - "SET PATH=%PYTHON_HOME%;%PATH%"
+    - "SET PATH=%PYTHON_HOME%;%PATH%;C:\\Python37-x64;C:\\Python27-x64;C:\\Python38"
     - "echo %PYTHON_HOME%"
     - "echo %PATH%"
     - "python --version"

appveyor.yml

@@ -13,12 +13,14 @@ environment:
       PYTHON_VERSION: '3.6.8'
       PYTHON_ARCH: '64'
       NOSE_PARAMETERIZED_NO_WARN: 1
+      INSTALL_PY_37_PIP: 1
 
     - PYTHON_HOME: "C:\\Python37-x64"
       PYTHON_VERSION: '3.7.4'
       PYTHON_ARCH: '64'
       RUN_SMOKE: 1
       NOSE_PARAMETERIZED_NO_WARN: 1
+      INSTALL_PY_36_PIP: 1
 
 for:
   - 
@@ -98,6 +100,25 @@ for:
       - sh: "./aws_cli/bin/python -m pip install awscli"
       - sh: "PATH=$(echo $PWD'/aws_cli/bin'):$PATH"
 
+      - sh: "sudo apt-get -y install python3.6"
+      - sh: "sudo apt-get -y install python2.7"
+      - sh: "sudo apt-get -y install python3.7"
+      - sh: "sudo apt-get update"
+      - sh: "sudo apt-get -y install python3.8"
+
+      - sh: "which python3.8"
+      - sh: "which python3.6"
+      - sh: "which python3.7"
+      - sh: "which python2.7"
+
+      - sh: "PATH=$PATH:/usr/bin/python3.8:/usr/bin/python3.7"
+      - sh: "curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py"
+
+      - sh: "sudo apt-get -y install python3-distutils"
+      - sh: "python3.8 get-pip.py --user"
+      - ps: "If ($env:INSTALL_PY_37_PIP) {python3.7 get-pip.py --user}"
+      - ps: "If ($env:INSTALL_PY_36_PIP) {python3.6 get-pip.py --user}"
+
     build_script:
       - "python -c \"import sys; print(sys.executable)\""
       - "pip install -e \".[dev]\""
@@ -113,7 +134,10 @@ for:
       - sh: "pytest -vv tests/integration"
       - sh: "pytest -vv -n 4 tests/regression"
       - sh: "/tmp/black --check setup.py tests samcli scripts"
-      - sh: "python scripts/check-isolated-needs-update.py"
+
+      # Set JAVA_HOME to java11
+      - sh: "JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64"
+      - sh: "pytest -vv tests/integration/buildcmd/test_build_cmd.py -k test_building_java11_in_process"
 
       # Smoke tests run in parallel - it runs on both Linux & Windows
       # Presence of the RUN_SMOKE envvar will run the smoke tests

requirements/base.txt

@@ -11,6 +11,6 @@ dateparser~=0.7
 python-dateutil~=2.6, <2.8.1
 requests==2.22.0
 serverlessrepo==0.1.9
-aws_lambda_builders==0.5.0
+aws_lambda_builders==0.6.0
 # https://github.com/mhammond/pywin32/issues/1439
 pywin32 < 226; sys_platform == 'win32'

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "0.31.1"
+__version__ = "0.32.0"

samcli/commands/init/__init__.py

@@ -90,7 +90,7 @@
     help="Disable Cookiecutter prompting and accept default values defined template config",
 )
 @click.option(
-    "--extra_context",
+    "--extra-context",
     default=None,
     help="Override any custom parameters in the template's cookiecutter.json configuration e.g. "
     ""

samcli/lib/build/workflow_config.py

@@ -95,10 +95,12 @@ def get_workflow_config(runtime, code_dir, project_dir):
         "python2.7": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "python3.6": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "python3.7": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
+        "python3.8": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "nodejs4.3": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "nodejs6.10": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "nodejs8.10": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "nodejs10.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
+        "nodejs12.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "ruby2.5": BasicWorkflowSelector(RUBY_BUNDLER_CONFIG),
         "dotnetcore2.0": BasicWorkflowSelector(DOTNET_CLIPACKAGE_CONFIG),
         "dotnetcore2.1": BasicWorkflowSelector(DOTNET_CLIPACKAGE_CONFIG),
@@ -111,6 +113,12 @@ def get_workflow_config(runtime, code_dir, project_dir):
             JAVA_KOTLIN_GRADLE_CONFIG._replace(executable_search_paths=[code_dir, project_dir]),
             JAVA_MAVEN_CONFIG
         ]),
+        "java11": ManifestWorkflowSelector([
+            # Gradle builder needs custom executable paths to find `gradlew` binary
+            JAVA_GRADLE_CONFIG._replace(executable_search_paths=[code_dir, project_dir]),
+            JAVA_KOTLIN_GRADLE_CONFIG._replace(executable_search_paths=[code_dir, project_dir]),
+            JAVA_MAVEN_CONFIG
+        ]),
     }
 
     if runtime not in selectors_by_runtime:

samcli/local/common/runtime_template.py

@@ -14,7 +14,7 @@
 RUNTIME_DEP_TEMPLATE_MAPPING = {
     "python": [
         {
-            "runtimes": ["python3.7", "python3.6", "python2.7"],
+            "runtimes": ["python3.8", "python3.7", "python3.6", "python2.7"],
             "dependency_manager": "pip",
             "init_location": os.path.join(_templates, "cookiecutter-aws-sam-hello-python"),
             "build": True,
@@ -30,7 +30,7 @@
     ],
     "nodejs": [
         {
-            "runtimes": ["nodejs10.x", "nodejs8.10"],
+            "runtimes": ["nodejs12.x", "nodejs10.x", "nodejs8.10"],
             "dependency_manager": "npm",
             "init_location": os.path.join(_templates, "cookiecutter-aws-sam-hello-nodejs"),
             "build": True,
@@ -60,13 +60,13 @@
     ],
     "java": [
         {
-            "runtimes": ["java8"],
+            "runtimes": ["java11", "java8"],
             "dependency_manager": "maven",
             "init_location": os.path.join(_templates, "cookiecutter-aws-sam-hello-java-maven"),
             "build": True,
         },
         {
-            "runtimes": ["java8"],
+            "runtimes": ["java11", "java8"],
             "dependency_manager": "gradle",
             "init_location": os.path.join(_templates, "cookiecutter-aws-sam-hello-java-gradle"),
             "build": True,
@@ -75,10 +75,12 @@
 }
 
 RUNTIME_TO_DEPENDENCY_MANAGERS = {
+    "python3.8": ["pip"],
     "python3.7": ["pip"],
     "python3.6": ["pip"],
     "python2.7": ["pip"],
     "ruby2.5": ["bundler"],
+    "nodejs12.x": ["npm"],
     "nodejs10.x": ["npm"],
     "nodejs8.10": ["npm"],
     "nodejs6.10": ["npm"],
@@ -87,6 +89,7 @@
     "dotnetcore1.0": ["cli-package"],
     "go1.x": ["mod"],
     "java8": ["maven", "gradle"],
+    "java11": ["maven", "gradle"],
 }
 
 SUPPORTED_DEP_MANAGERS = {
@@ -99,17 +102,27 @@
     itertools.chain(*[c["runtimes"] for c in list(itertools.chain(*(RUNTIME_DEP_TEMPLATE_MAPPING.values())))])
 )
 
+# Order here should be a the group of the latest versions of runtimes followed by runtime groups
 INIT_RUNTIMES = [
-    "nodejs10.x",
-    "python3.7",
+    # latest of each runtime version
+    "nodejs12.x",
+    "python3.8",
     "ruby2.5",
     "go1.x",
-    "java8",
+    "java11",
     "dotnetcore2.1",
+    # older nodejs runtimes
+    "nodejs10.x",
     "nodejs8.10",
     "nodejs6.10",
+    # older python runtimes
+    "python3.7",
     "python3.6",
     "python2.7",
+    # older ruby runtimes
+    # older java runtimes
+    "java8",
+    # older dotnetcore runtimes
     "dotnetcore2.0",
     "dotnetcore1.0",
 ]