From 8c36a3e04b297e7031e5b2dc43140ccaa636da55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 13:27:21 -0800 Subject: [PATCH 1/8] chore(deps): bump actions/setup-java from 3 to 4 (#268) --- .github/workflows/CI.yml | 2 +- .github/workflows/Regression.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 42179cf3..7ba6a46e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -71,7 +71,7 @@ jobs: aws-region: us-east-1 if: ${{ github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push'}} - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: corretto diff --git a/.github/workflows/Regression.yaml b/.github/workflows/Regression.yaml index fed3ac0e..9617b708 100644 --- a/.github/workflows/Regression.yaml +++ b/.github/workflows/Regression.yaml @@ -45,7 +45,7 @@ jobs: role-to-assume: ${{secrets.GDK_WORKFLOW_AWS_ROLE}} aws-region: us-east-1 - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: corretto From db8f54d9cf7b4bd6f318e32abffb1abc7b573a46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:55:44 -0500 Subject: [PATCH 2/8] chore(deps): bump actions/setup-python from 4 to 5 (#272) --- .github/workflows/CI.yml | 2 +- .github/workflows/Regression.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7ba6a46e..ae47ba5e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -35,7 +35,7 @@ jobs: uses: wagoid/commitlint-github-action@v5 if: matrix.os == 'ubuntu-latest' - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Python version diff --git a/.github/workflows/Regression.yaml b/.github/workflows/Regression.yaml index 9617b708..336993af 100644 --- a/.github/workflows/Regression.yaml +++ b/.github/workflows/Regression.yaml @@ -28,7 +28,7 @@ jobs: ref: ${{ matrix.gdk-version == 'HEAD' && github.ref || matrix.gdk-version }} fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install CLI and dependencies From 09170c60d053b59ac3ed3576dea418eede76ef7a Mon Sep 17 00:00:00 2001 From: patrzhan <139926810+patrzhan@users.noreply.github.com> Date: Wed, 10 Jan 2024 15:57:05 -0800 Subject: [PATCH 3/8] chore: update logging level for latest gtf release logs (#276) --- gdk/common/config/TestConfiguration.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gdk/common/config/TestConfiguration.py b/gdk/common/config/TestConfiguration.py index 08c26fe8..60fc18e9 100644 --- a/gdk/common/config/TestConfiguration.py +++ b/gdk/common/config/TestConfiguration.py @@ -29,12 +29,11 @@ def _set_gtf_config(self, test_config): if release_name is not None: self.gtf_version = release_name self.latest_gtf_version = release_name - logging.info("Discovered %s as latest GTF release name.", self.gtf_version) + logging.debug("Discovered %s as latest GTF release name.", self.gtf_version) else: - logging.info("Unable to get the latest GTF release name. Using %s as the default value.", self.gtf_version) - logging.debug("GTF release name was found to be None, so using default.") + logging.debug("GTF release name was found to be None. Using %s as the default value.", self.gtf_version) except Exception as e: - logging.info("Unable to get the latest GTF release name. Using %s as the default value.", self.gtf_version) + logging.debug("Unable to get the latest GTF release name. Using %s as the default value.", self.gtf_version) logging.debug("Exception information for GTF release name API call: %s", str(e)) self.gtf_version = (test_config.get("gtf_version") if "gtf_version" in test_config From e08c4bcc9d9674ea383d7d768eaaa3e3e0b164c4 Mon Sep 17 00:00:00 2001 From: patrzhan <139926810+patrzhan@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:14:35 -0800 Subject: [PATCH 4/8] chore: update readme and version number to 1.6.2 (#277) --- README.md | 2 +- gdk/_version.py | 2 +- uat/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b59d9f48..11f8410c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Please follow the [GDK CLI public documentation](https://docs.aws.amazon.com/gre To install the latest version of CLI using this git repository and pip, run the following command -`pip3 install git+https://github.com/aws-greengrass/aws-greengrass-gdk-cli.git@v1.6.1` +`pip3 install git+https://github.com/aws-greengrass/aws-greengrass-gdk-cli.git@v1.6.2` Run `gdk --help` to check if the cli tool is successfully installed. diff --git a/gdk/_version.py b/gdk/_version.py index f49459c7..51bbb3f2 100644 --- a/gdk/_version.py +++ b/gdk/_version.py @@ -1 +1 @@ -__version__ = "1.6.1" +__version__ = "1.6.2" diff --git a/uat/README.md b/uat/README.md index 1b8547bf..ac2026ed 100644 --- a/uat/README.md +++ b/uat/README.md @@ -16,7 +16,7 @@ End-to-end setup uses `pytest` and expects test dependencies to be installed. To install the latest version of CLI using this git repository and pip, run the following command ```shell -git clone https://github.com/aws-greengrass/aws-greengrass-gdk-cli.git@v1.6.1 +git clone https://github.com/aws-greengrass/aws-greengrass-gdk-cli.git@v1.6.2 cd aws-greengrass-gdk-cli ``` From 3545476003eb5b9a2907e05794352db4b908f94e Mon Sep 17 00:00:00 2001 From: Ken Mijime Date: Sat, 13 Jan 2024 01:15:19 +0100 Subject: [PATCH 5/8] fix(setuptools): exclude test related packages from build (#278) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 12a39230..0ae9c41f 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ def get_version(rel_path): long_description=long_description, long_description_content_type="text/markdown", license=license, - packages=find_packages(), + packages=find_packages(include=["gdk"]), entry_points=entry_points, classifiers=classifiers, install_requires=get_requirements(), From 439da5d436dbf047f96edaad1b899b403ae604da Mon Sep 17 00:00:00 2001 From: patrzhan <139926810+patrzhan@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:05:05 -0800 Subject: [PATCH 6/8] fix: include packages from subdirectories of gdk (#279) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0ae9c41f..774e2207 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ def get_version(rel_path): long_description=long_description, long_description_content_type="text/markdown", license=license, - packages=find_packages(include=["gdk"]), + packages=find_packages(include=["gdk", "gdk.*"]), entry_points=entry_points, classifiers=classifiers, install_requires=get_requirements(), From a662a92947558b78365de59af9af0358dcb6d041 Mon Sep 17 00:00:00 2001 From: patrzhan <139926810+patrzhan@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:26:30 -0800 Subject: [PATCH 7/8] chore: add cli and dependencies installation to CI steps (#280) Co-authored-by: Michael Dombrowski --- .github/workflows/CI.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ae47ba5e..50137b68 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -38,10 +38,14 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - name: Python version + - name: Install CLI and dependencies run: | python -VV python -m pip install --upgrade pip + # Perform clean install without test dependencies to ensure none of test dependencies + # have been used in the gdk codebase. + pip install . + gdk --help - name: Lint with flake8 run: | pip install flake8 From 0f42d3e20ca6c20a29ce828c859bb0d26e9807ea Mon Sep 17 00:00:00 2001 From: patrzhan <139926810+patrzhan@users.noreply.github.com> Date: Tue, 16 Jan 2024 16:31:57 -0800 Subject: [PATCH 8/8] chore: bump versions used during regression workflow (#281) --- .github/workflows/Regression.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Regression.yaml b/.github/workflows/Regression.yaml index 336993af..119b59f7 100644 --- a/.github/workflows/Regression.yaml +++ b/.github/workflows/Regression.yaml @@ -14,7 +14,7 @@ jobs: strategy: max-parallel: 6 matrix: - gdk-version: [ HEAD, v1.6.0, v1.5.0] + gdk-version: [ HEAD, v1.6.2, v1.6.1] python-version: [3.7, 3.8, 3.x] os: [windows-latest, ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }}