Skip to content

Commit e277e47

Browse files
committed
Merge branch 'release/1.15.0'
2 parents d64b3a2 + f4b4c38 commit e277e47

File tree

7 files changed

+18
-14
lines changed

7 files changed

+18
-14
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-alpha.5"]
19+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v2
24+
uses: actions/setup-python@v4
2525
with:
2626
python-version: ${{ matrix.python-version }}
2727
- name: Install dependencies

.github/workflows/docker.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
-
1818
name: Checkout
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020
-
2121
name: Login to Docker Hub
2222
uses: docker/login-action@v1
@@ -32,6 +32,7 @@ jobs:
3232
with:
3333
context: .
3434
file: ./Dockerfile
35+
platforms: linux/amd64,linux/arm64
3536
push: true
3637
tags: fabfuel/ecs-deploy:${{ github.ref_name }}
3738
-
@@ -41,5 +42,6 @@ jobs:
4142
with:
4243
context: .
4344
file: ./Dockerfile
45+
platforms: linux/amd64,linux/arm64
4446
push: true
4547
tags: fabfuel/ecs-deploy:latest

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.8-alpine3.13
1+
FROM python:3.10-alpine
22

33
ADD . /usr/src/app
44
WORKDIR /usr/src/app

ecs_deploy/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = '1.14.1'
1+
VERSION = '1.15.0'

ecs_deploy/cli.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ def record_deployment(tag, api_key, app_id, region, revision, comment, user):
645645

646646
if not revision or not api_key or not app_id:
647647
if api_key:
648-
click.secho('Missing required parameters for recording New Relic deployment.' \
648+
click.secho('Missing required parameters for recording New Relic deployment. '
649649
'Please see https://github.com/fabfuel/ecs-deploy#new-relic')
650650
return False
651651

setup.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ def readme():
1414
dependencies = [
1515
'click>=7.1.2, <9',
1616
'click-log==0.3.2',
17-
'botocore>=1.17.47',
18-
'boto3>=1.14.47',
17+
'botocore>=1.32.6',
18+
'boto3>=1.29.6',
1919
'future',
20-
'requests',
21-
'dictdiffer==0.8.0',
22-
'awscli',
20+
'requests<2.30.0',
21+
'dictdiffer>=0.9.0',
2322
]
2423

2524
setup(

tests/test_cli.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,11 @@ def test_record_deployment_without_apikey(Deployment):
10031003
@patch('click.secho')
10041004
@patch('ecs_deploy.newrelic.Deployment')
10051005
def test_record_deployment_without_appid(Deployment, secho):
1006-
result = record_deployment('1.2.3', 'APIKEY',None, None, None, None, None)
1007-
secho.assert_any_call('Missing required parameters for recording New Relic deployment.Please see https://github.com/fabfuel/ecs-deploy#new-relic')
1006+
result = record_deployment('1.2.3', 'APIKEY', None, None, None, None, None)
1007+
secho.assert_any_call(
1008+
'Missing required parameters for recording New Relic deployment. '
1009+
'Please see https://github.com/fabfuel/ecs-deploy#new-relic'
1010+
)
10081011
assert result is False
10091012

10101013

0 commit comments

Comments
 (0)