From 7f8931bda3ab2ceb236ad03be974ab66f5f62c3e Mon Sep 17 00:00:00 2001 From: Victor San Kho Lin Date: Sun, 26 Feb 2023 10:51:25 +1100 Subject: [PATCH 1/2] Bumped next version 1.1.0rc1 * Added Python 3.11 support * Bumped GitHub Actions CI dependencies * Minor fixed test cases * Removed obsolete LGTM badges --- .github/workflows/prbuild.yml | 8 ++++---- README.md | 3 +-- tests/test_cli.py | 3 +++ tox.ini | 4 ++-- yawsso/__init__.py | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/prbuild.yml b/.github/workflows/prbuild.yml index e4abd68..da1f641 100644 --- a/.github/workflows/prbuild.yml +++ b/.github/workflows/prbuild.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10' ] + python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10', '3.11' ] steps: - name: Checkout code @@ -35,7 +35,7 @@ jobs: fetch-depth: 0 - name: TruffleHog OSS - uses: trufflesecurity/trufflehog@v3.4.3 + uses: trufflesecurity/trufflehog@v3.28.0 with: path: ./ base: ${{ github.event.repository.default_branch }} @@ -64,14 +64,14 @@ jobs: xvfb-run pytest --cov-report xml --cov=yawsso tests/ - name: Publish coverage to to Codecov - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 with: file: ./coverage.xml flags: unittests name: yawsso - name: Publish coverage to CodeClimate - uses: paambaati/codeclimate-action@v3.0.0 + uses: paambaati/codeclimate-action@v3.2.0 env: CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} with: diff --git a/README.md b/README.md index a0c7669..0ca8bde 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,6 @@ [![coveralls.io](https://coveralls.io/repos/github/victorskl/yawsso/badge.svg?branch=main)](https://coveralls.io/github/victorskl/yawsso?branch=main) [![codeclimate - Test Coverage](https://api.codeclimate.com/v1/badges/44dd1cbae44465118742/test_coverage)](https://codeclimate.com/github/victorskl/yawsso/test_coverage) [![codeclimate - Maintainability](https://api.codeclimate.com/v1/badges/44dd1cbae44465118742/maintainability)](https://codeclimate.com/github/victorskl/yawsso/maintainability) -[![lgtm - Language grade: Python](https://img.shields.io/lgtm/grade/python/g/victorskl/yawsso.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/victorskl/yawsso/context:python) -[![lgtm - Total alerts](https://img.shields.io/lgtm/alerts/g/victorskl/yawsso.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/victorskl/yawsso/alerts/) [![snyk](https://snyk.io/advisor/python/yawsso/badge.svg)](https://snyk.io/advisor/python/yawsso) [![kandi](https://img.shields.io/badge/kandi-X--Ray%20Report-ff69b4)](https://kandi.openweaver.com/python/victorskl/yawsso) [![PyPI - Downloads](https://img.shields.io/pypi/dm/yawsso?style=flat)](https://pypistats.org/packages/yawsso) @@ -94,6 +92,7 @@ yawsso -h - `awsbw -L -P dev` - `sqsmover -s main-dlq -d main-queue` - `ecs-cli ps --cluster my-cluster` + - `awscurl -H "Accept: application/json" --profile dev --region ap-southeast-2 "https://api..."` ## Additional Use Cases diff --git a/tests/test_cli.py b/tests/test_cli.py index 736afec..821ed1e 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -817,6 +817,7 @@ def test_login_command_default(self): when(cli.utils).Poll(contains('aws sso login'), ...).thenReturn(mock_poll) when(mock_poll).start(...).thenReturn(mock_poll) when(mock_poll).resolve(...).thenReturn(True) + when(os).getenv(...).thenReturn('default') with ArgvContext(program, '-t', 'login'): cli.main() cred = cli.utils.read_config(self.credentials.name) @@ -866,6 +867,7 @@ def test_login_command_export_vars(self): when(cli.utils).Poll(contains('aws sso login'), ...).thenReturn(mock_poll) when(mock_poll).start(...).thenReturn(mock_poll) when(mock_poll).resolve(...).thenReturn(True) + when(os).getenv(...).thenReturn('default') with ArgvContext(program, '-t', 'login', '-e'), self.assertRaises(SystemExit) as x: cli.main() self.assertEqual(x.exception.code, 0) @@ -883,6 +885,7 @@ def test_login_command_export_vars_2(self): when(cli.utils).Poll(contains('aws sso login'), ...).thenReturn(mock_poll) when(mock_poll).start(...).thenReturn(mock_poll) when(mock_poll).resolve(...).thenReturn(True) + when(os).getenv(...).thenReturn('default') with ArgvContext(program, '-t', '-e', 'login'), self.assertRaises(SystemExit) as x: cli.main() self.assertEqual(x.exception.code, 0) diff --git a/tox.ini b/tox.ini index 64bd76c..68999a6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] -envlist = py{36,37,38,39,310} +envlist = py{36,37,38,39,310,311} skip_missing_interpreters=True [testenv] -passenv = GITHUB_* COVERALLS_* +;passenv = GITHUB_* COVERALLS_* deps = .[test] commands = diff --git a/yawsso/__init__.py b/yawsso/__init__.py index ae7716f..9a5402c 100644 --- a/yawsso/__init__.py +++ b/yawsso/__init__.py @@ -4,7 +4,7 @@ from pathlib import Path # versioning follow PEP440 -__version__ = VERSION = '1.0.1' # pragma: no cover +__version__ = VERSION = '1.1.0rc1' # pragma: no cover PROGRAM = 'yawsso' # pragma: no cover From f0304e7ffc8bf5547981146669b509d6a969c1a3 Mon Sep 17 00:00:00 2001 From: Victor San Kho Lin Date: Sun, 26 Feb 2023 11:04:34 +1100 Subject: [PATCH 2/2] Dropped Python 3.6 support * Python 3.6 is EOL https://devguide.python.org/versions/ --- .github/workflows/prbuild.yml | 2 +- README.md | 2 +- setup.py | 2 +- tox.ini | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/prbuild.yml b/.github/workflows/prbuild.yml index da1f641..70c2ba5 100644 --- a/.github/workflows/prbuild.yml +++ b/.github/workflows/prbuild.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10', '3.11' ] + python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] steps: - name: Checkout code diff --git a/README.md b/README.md index 0ca8bde..7c040d0 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Yet Another AWS SSO - sync up AWS CLI v2 SSO login session to legacy CLI v1 cred ## Prerequisite -- Required `Python >= 3.6` +- Required `Python >= 3.7` - Required [AWS CLI v2](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html) - Assume you have already setup [AWS SSO](https://aws.amazon.com/single-sign-on/) for your organization diff --git a/setup.py b/setup.py index 4271bde..27a527c 100644 --- a/setup.py +++ b/setup.py @@ -54,5 +54,5 @@ "ggshield", ], }, - python_requires=">=3.6", + python_requires=">=3.7", ) diff --git a/tox.ini b/tox.ini index 68999a6..8848806 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{36,37,38,39,310,311} +envlist = py{37,38,39,310,311} skip_missing_interpreters=True [testenv]