diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9fad53..36135de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,12 +16,12 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-alpha.5"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3b6b788..a2756dc 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Login to Docker Hub uses: docker/login-action@v1 @@ -32,6 +32,7 @@ jobs: with: context: . file: ./Dockerfile + platforms: linux/amd64,linux/arm64 push: true tags: fabfuel/ecs-deploy:${{ github.ref_name }} - @@ -41,5 +42,6 @@ jobs: with: context: . file: ./Dockerfile + platforms: linux/amd64,linux/arm64 push: true tags: fabfuel/ecs-deploy:latest diff --git a/Dockerfile b/Dockerfile index a282db7..fa3d669 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-alpine3.13 +FROM python:3.10-alpine ADD . /usr/src/app WORKDIR /usr/src/app diff --git a/ecs_deploy/__init__.py b/ecs_deploy/__init__.py index 2d30b8b..4fda84c 100644 --- a/ecs_deploy/__init__.py +++ b/ecs_deploy/__init__.py @@ -1 +1 @@ -VERSION = '1.14.1' +VERSION = '1.15.0' diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py index 20465eb..679fe93 100644 --- a/ecs_deploy/cli.py +++ b/ecs_deploy/cli.py @@ -645,7 +645,7 @@ def record_deployment(tag, api_key, app_id, region, revision, comment, user): if not revision or not api_key or not app_id: if api_key: - click.secho('Missing required parameters for recording New Relic deployment.' \ + click.secho('Missing required parameters for recording New Relic deployment. ' 'Please see https://github.com/fabfuel/ecs-deploy#new-relic') return False diff --git a/setup.py b/setup.py index 6b56adf..8d608ab 100644 --- a/setup.py +++ b/setup.py @@ -14,12 +14,11 @@ def readme(): dependencies = [ 'click>=7.1.2, <9', 'click-log==0.3.2', - 'botocore>=1.17.47', - 'boto3>=1.14.47', + 'botocore>=1.32.6', + 'boto3>=1.29.6', 'future', - 'requests', - 'dictdiffer==0.8.0', - 'awscli', + 'requests<2.30.0', + 'dictdiffer>=0.9.0', ] setup( diff --git a/tests/test_cli.py b/tests/test_cli.py index 3fdf914..96bff7b 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1003,8 +1003,11 @@ def test_record_deployment_without_apikey(Deployment): @patch('click.secho') @patch('ecs_deploy.newrelic.Deployment') def test_record_deployment_without_appid(Deployment, secho): - result = record_deployment('1.2.3', 'APIKEY',None, None, None, None, None) - secho.assert_any_call('Missing required parameters for recording New Relic deployment.Please see https://github.com/fabfuel/ecs-deploy#new-relic') + result = record_deployment('1.2.3', 'APIKEY', None, None, None, None, None) + secho.assert_any_call( + 'Missing required parameters for recording New Relic deployment. ' + 'Please see https://github.com/fabfuel/ecs-deploy#new-relic' + ) assert result is False