Skip to content

Commit

Permalink
Merge branch 'release/1.15.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
fabfuel committed Jun 30, 2024
2 parents d64b3a2 + f4b4c38 commit e277e47
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,6 +32,7 @@ jobs:
with:
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: fabfuel/ecs-deploy:${{ github.ref_name }}
-
Expand All @@ -41,5 +42,6 @@ jobs:
with:
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: fabfuel/ecs-deploy:latest
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-alpine3.13
FROM python:3.10-alpine

ADD . /usr/src/app
WORKDIR /usr/src/app
Expand Down
2 changes: 1 addition & 1 deletion ecs_deploy/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = '1.14.1'
VERSION = '1.15.0'
2 changes: 1 addition & 1 deletion ecs_deploy/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
7 changes: 5 additions & 2 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit e277e47

Please sign in to comment.