Merge pull request #141 from awslabs/develop

chore: Version 0.6.0 Release

Author: jfuss

.appveyor.yml

@@ -1,48 +1,130 @@
 version: 1.0.{build}
-image: Visual Studio 2017
+image:
+  - Visual Studio 2017
+  - Ubuntu
 
 environment:
   GOPATH: c:\gopath
   GOVERSION: 1.11
   GRADLE_OPTS: -Dorg.gradle.daemon=false
+  nodejs_version: "8.10.0"
 
   matrix:
 
   - PYTHON: "C:\\Python27-x64"
+    PYTHON_VERSION: '2.7.16'
+    PYTHON_ARCH: '64'
+    LINE_COVERAGE: '91'
+    NEW_FLAKE8: 0
+    JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
   - PYTHON: "C:\\Python36-x64"
+    PYTHON_VERSION: '3.6.8'
+    PYTHON_ARCH: '64'
+    LINE_COVERAGE: '91'
+    NEW_FLAKE8: 0
+    JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
   - PYTHON: "C:\\Python37-x64"
+    PYTHON_VERSION: '3.7.4'
+    PYTHON_ARCH: '64'
+    LINE_COVERAGE: '91'
+    NEW_FLAKE8: 0
+    JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
+  - PYTHON: "C:\\Python38-x64"
+    PYTHON_VERSION: '3.8.0'
+    PYTHON_ARCH: '64'
+    LINE_COVERAGE: '72'
+    NEW_FLAKE8: 1
+    JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
 
 
 build: off
 
-install:
-# To run Nodejs workflow integ tests
-- ps: Install-Product node 8.10
-
-- "set PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\bin;%PATH%"
-- "%PYTHON%\\python.exe -m pip install -r requirements/dev.txt"
-- "%PYTHON%\\python.exe -m pip install -e ."
-- "set PATH=C:\\Ruby25-x64\\bin;%PATH%"
-- "gem --version"
-- "gem install bundler -v 1.17.3"
-- "bundler --version"
-- "echo %PATH%"
-
-# setup go
-- rmdir c:\go /s /q
-- "choco install golang"
-- "choco install bzr"
-- "choco install dep"
-- setx PATH "C:\go\bin;C:\gopath\bin;C:\Program Files (x86)\Bazaar\;C:\Program Files\Mercurial;%PATH%;"
-- "go version"
-- "go env"
-
-# setup Gradle
-- "choco install gradle"
-
-# Echo final Path
-- "echo %PATH%"
-
-test_script:
-- "%PYTHON%\\python.exe -m pytest --cov aws_lambda_builders --cov-report term-missing tests/unit tests/functional"
-- "%PYTHON%\\python.exe -m pytest tests/integration"
+for:
+  -
+    matrix:
+      only:
+        - image: Visual Studio 2017
+
+    install:
+    # To run Nodejs workflow integ tests
+    - ps: Install-Product node 8.10
+
+    - "set PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\bin;%PATH%"
+    - "%PYTHON%\\python.exe -m pip install -r requirements/dev.txt"
+    - "%PYTHON%\\python.exe -m pip install -e ."
+    - "set PATH=C:\\Ruby25-x64\\bin;%PATH%"
+    - "gem --version"
+    - "gem install bundler -v 1.17.3"
+    - "bundler --version"
+    - "echo %PATH%"
+
+    # setup go
+    - rmdir c:\go /s /q
+    - "choco install golang"
+    - "choco install bzr"
+    - "choco install dep"
+    - setx PATH "C:\go\bin;C:\gopath\bin;C:\Program Files (x86)\Bazaar\;C:\Program Files\Mercurial;%PATH%;"
+    - "go version"
+    - "go env"
+
+    # setup Gradle
+    - "choco install gradle"
+
+    # Echo final Path
+    - "echo %PATH%"
+
+    test_script:
+    - "%PYTHON%\\python.exe -m pytest --cov aws_lambda_builders --cov-report term-missing tests/unit tests/functional"
+    - "%PYTHON%\\python.exe -m pytest tests/integration"
+
+  -
+    matrix:
+      only:
+        - image: Ubuntu
+
+    install:
+      - sh: "JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64"
+      - sh: "PATH=$JAVA_HOME/bin:$PATH"
+      - sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate"
+      - sh: "rvm use 2.5"
+      - sh: "nvm install ${nodejs_version}"
+      - sh: "npm install [email protected] -g"
+      - sh: "npm -v"
+      - sh: "echo $PATH"
+      - sh: "java --version"
+
+      # Install latest gradle
+      - sh: "sudo apt-get -y remove gradle"
+      - sh: "sudo apt-get install go-dep"
+      - sh: "wget https://services.gradle.org/distributions/gradle-5.5-bin.zip -P /tmp"
+      - sh: "sudo unzip -d /opt/gradle /tmp/gradle-*.zip"
+      - sh: "PATH=/opt/gradle/gradle-5.5/bin:$PATH"
+
+    build_script:
+      - "python -c \"import sys; print(sys.executable)\""
+      - "LAMBDA_BUILDERS_DEV=1 pip install -e \".[dev]\""
+
+    test_script:
+      - "LAMBDA_BUILDERS_DEV=1 pytest --cov aws_lambda_builders --cov-report term-missing --cov-fail-under ${LINE_COVERAGE} tests/unit tests/functional"
+      - "pylint --rcfile .pylintrc aws_lambda_builders"
+
+      # Runs only in Linux
+      - "LAMBDA_BUILDERS_DEV=1 pytest -vv tests/integration"
+
+  -
+    matrix:
+      only:
+        - OLD_FLAKE8: 1
+
+    test_script:
+      - "flake8 lambda_builders"
+      - "flake8 tests/unit tests/integration"
+
+  -
+    matrix:
+      only:
+        - NEW_FLAKE8: 0
+
+    test_script:
+      - "flake8 lambda_builders"
+      - "flake8 tests/unit tests/integration --extend-ignore=W504"

.pylintrc

@@ -59,7 +59,8 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-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 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
 
 
 [REPORTS]

.travis.yml

@@ -16,7 +16,7 @@ integ-test:
 flake:
 	# Make sure code conforms to PEP8 standards
 	flake8 lambda_builders
-	flake8 tests/unit tests/integration
+	flake8 tests/unit tests/integration --extend-ignore=W504
 
 lint:
 	# Liner performs static analysis to catch latent bugs

Makefile

@@ -1,5 +1,5 @@
 """
 AWS Lambda Builder Library
 """
-__version__ = '0.5.0'
+__version__ = '0.6.0'
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/__init__.py

@@ -14,22 +14,25 @@ class GradleValidator(object):
     VERSION_STRING_WARNING = "%s failed to return a version string using the '-v' option. The workflow is unable to " \
                              "check that the version of the JVM used is compatible with AWS Lambda."
 
-    MAJOR_VERSION_WARNING = "%s is using a JVM with major version %s which is newer than 8 that is supported by AWS " \
+    MAJOR_VERSION_WARNING = "%s is using a JVM with major version %s which is newer than %s that is supported by AWS " \
                             "Lambda. The compiled function code may not run in AWS Lambda unless the project has " \
-                            "been configured to be compatible with Java 8 using 'targetCompatibility' in Gradle."
+                            "been configured to be compatible with Java %s using 'targetCompatibility' in Gradle."
 
-    def __init__(self, os_utils=None, log=None):
+    def __init__(self, runtime, os_utils=None, log=None):
         self.language = 'java'
         self._valid_binary_path = None
+        self._runtime = runtime
         self.os_utils = OSUtils() if not os_utils else os_utils
         self.log = LOG if not log else log
 
     def validate(self, gradle_path):
         jvm_mv = self._get_major_version(gradle_path)
 
+        language_version = self._runtime.replace('java', '')
+
         if jvm_mv:
-            if int(jvm_mv) > 8:
-                self.log.warning(self.MAJOR_VERSION_WARNING, gradle_path, jvm_mv)
+            if int(jvm_mv) > int(language_version):
+                self.log.warning(self.MAJOR_VERSION_WARNING, gradle_path, jvm_mv, language_version, language_version)
         else:
             self.log.warning(self.VERSION_STRING_WARNING, gradle_path)
 

aws_lambda_builders/workflows/java_gradle/gradle_validator.py

@@ -55,7 +55,7 @@ def get_resolvers(self):
         return [GradleResolver(executable_search_paths=self.executable_search_paths)]
 
     def get_validators(self):
-        return [GradleValidator(self.os_utils)]
+        return [GradleValidator(self.runtime, self.os_utils)]
 
     @property
     def build_output_dir(self):

aws_lambda_builders/workflows/java_gradle/workflow.py

@@ -14,22 +14,25 @@ class MavenValidator(object):
     VERSION_STRING_WARNING = "%s failed to return a version string using the '-v' option. The workflow is unable to " \
                              "check that the version of the JVM used is compatible with AWS Lambda."
 
-    MAJOR_VERSION_WARNING = "%s is using a JVM with major version %s which is newer than 8 that is supported by AWS " \
+    MAJOR_VERSION_WARNING = "%s is using a JVM with major version %s which is newer than %s that is supported by AWS " \
                             "Lambda. The compiled function code may not run in AWS Lambda unless the project has " \
-                            "been configured to be compatible with Java 8 using 'maven.compiler.target' in Maven."
+                            "been configured to be compatible with Java %s using 'maven.compiler.target' in Maven."
 
-    def __init__(self, os_utils=None, log=None):
+    def __init__(self, runtime, os_utils=None, log=None):
         self.language = 'java'
         self._valid_binary_path = None
+        self._runtime = runtime
         self.os_utils = OSUtils() if not os_utils else os_utils
         self.log = LOG if not log else log
 
     def validate(self, maven_path):
         jvm_mv = self._get_major_version(maven_path)
 
+        language_version = self._runtime.replace('java', '')
+
         if jvm_mv:
-            if int(jvm_mv) > 8:
-                self.log.warning(self.MAJOR_VERSION_WARNING, maven_path, jvm_mv)
+            if int(jvm_mv) > int(language_version):
+                self.log.warning(self.MAJOR_VERSION_WARNING, maven_path, jvm_mv, language_version, language_version)
         else:
             self.log.warning(self.VERSION_STRING_WARNING, maven_path)
 

aws_lambda_builders/workflows/java_maven/maven_validator.py

@@ -55,4 +55,4 @@ def get_resolvers(self):
         return [MavenResolver(executable_search_paths=self.executable_search_paths)]
 
     def get_validators(self):
-        return [MavenValidator(self.os_utils)]
+        return [MavenValidator(self.runtime, self.os_utils)]

aws_lambda_builders/workflows/java_maven/workflow.py

@@ -23,7 +23,7 @@ def pip_import_string(python_exe):
         return 'from pip import main'
     # Pip changed their import structure again in 19.3
     # https://github.com/pypa/pip/commit/09fd200
-    elif pip_major_version >= 19 and pip_minor_version >= 3:
+    elif (pip_major_version, pip_minor_version)  >= (19, 3):
         return 'from pip._internal.main import main'
     else:
         return 'from pip._internal import main'