Skip to content

Commit d4e8ce0

Browse files
keillerakeillera
authored
Merge pull request #475 from keillera/update_python
Update python
2 parents 4afc73a + b3b866d commit d4e8ce0

23 files changed

+127
-126
lines changed

‎.circleci/config.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
references:
44
setup_remote_docker: &setup_remote_docker
55
setup_remote_docker:
6-
version: 18.09.3
6+
version: 20.10.14
77
docker_hub_authentication: &docker_hub_authentication
88
auth:
99
username: $DOCKERHUB_USER
@@ -55,15 +55,15 @@ orbs:
5555
jira: circleci/jira@1.0.5
5656

5757
executors:
58-
python3_6_1:
58+
python3_9_13:
5959
working_directory: ~/repo
6060
docker:
61-
- image: circleci/python:3.6.1
61+
- image: cimg/python:3.9.13
6262
<<: *docker_hub_authentication
6363
test:
6464
working_directory: ~/repo
6565
docker:
66-
- image: circleci/python:3.6.1
66+
- image: cimg/python:3.9.13
6767
<<: *docker_hub_authentication
6868
- image: bluszcz/bflocalstack-dynamodb-s3
6969
<<: *docker_hub_authentication
@@ -103,7 +103,6 @@ commands:
103103
- run:
104104
name: install dependencies
105105
command: |
106-
python3 -m venv venv
107106
. venv/bin/activate
108107
pip install -r << parameters.resource >>
109108
@@ -175,7 +174,7 @@ commands:
175174
176175
jobs:
177176
lint:
178-
executor: python3_6_1
177+
executor: python3_9_13
179178
steps:
180179
- prepare-python-resources:
181180
resource: 'requirements_test.txt'
@@ -238,7 +237,7 @@ jobs:
238237
options: '--target /handlers/search'
239238

240239
packaging:
241-
executor: python3_6_1
240+
executor: python3_9_13
242241
steps:
243242
- prepare-python-resources
244243

@@ -254,31 +253,31 @@ jobs:
254253
- deploy/*
255254

256255
deploy-function:
257-
executor: python3_6_1
256+
executor: python3_9_13
258257
steps:
259258
- deploy-resources:
260259
target: 'function'
261260

262261
deploy-function02:
263-
executor: python3_6_1
262+
executor: python3_9_13
264263
steps:
265264
- deploy-resources:
266265
target: 'function02'
267266

268267
deploy-api:
269-
executor: python3_6_1
268+
executor: python3_9_13
270269
steps:
271270
- deploy-resources:
272271
target: 'api'
273272

274273
deploy-permission:
275-
executor: python3_6_1
274+
executor: python3_9_13
276275
steps:
277276
- deploy-resources:
278277
target: 'permission'
279278

280279
deploy-alarms:
281-
executor: python3_6_1
280+
executor: python3_9_13
282281
steps:
283282
- deploy-resources:
284283
target: 'apialarms'
@@ -317,7 +316,7 @@ jobs:
317316
fi
318317
319318
fix-api:
320-
executor: python3_6_1
319+
executor: python3_9_13
321320
steps:
322321
- prepare-python-resources
323322

@@ -334,7 +333,7 @@ jobs:
334333
./fix_configurations.sh
335334
336335
notify-to-slack-for-approval:
337-
executor: python3_6_1
336+
executor: python3_9_13
338337
steps:
339338
- slack/approval:
340339
message: "本番環境へのデプロイを承認してください"

‎.python-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.1
1+
3.9.13

‎Dockerfile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
FROM amazonlinux:2018.03.0.20180424
2-
1+
FROM amazon/aws-lambda-python:3.9.2022.07.19.14
32

43
WORKDIR /workdir
54
COPY requirements.txt ./
6-
RUN yum install -y gcc python36 python36-devel
75

8-
ENTRYPOINT ["pip-3.6", "install", "-r", "requirements.txt", "-t", "./vendor-package"]
6+
ENTRYPOINT ["pip", "install", "-r", "requirements.txt", "-t", "./vendor-package"]

‎api-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Parameters:
130130

131131
Globals:
132132
Function:
133-
Runtime: python3.6
133+
Runtime: python3.9
134134
Timeout: 300
135135
MemorySize: 3008
136136
Tracing: Active

‎cognito-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Parameters:
2222

2323
Globals:
2424
Function:
25-
Runtime: python3.6
25+
Runtime: python3.9
2626
Timeout: 15
2727
MemorySize: 256
2828
Environment:

‎function-template.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Resources:
128128
Handler: handler.lambda_handler
129129
MemorySize: 3008
130130
Role: !GetAtt LambdaRole.Arn
131-
Runtime: python3.6
131+
Runtime: python3.9
132132
Timeout: 300
133133
TracingConfig:
134134
Mode: "Active"
@@ -152,7 +152,7 @@ Resources:
152152
Handler: handler.lambda_handler
153153
MemorySize: 3008
154154
Role: !GetAtt LambdaRole.Arn
155-
Runtime: python3.6
155+
Runtime: python3.9
156156
Timeout: 300
157157
TracingConfig:
158158
Mode: "Active"
@@ -170,7 +170,7 @@ Resources:
170170
Handler: handler.lambda_handler
171171
MemorySize: 3008
172172
Role: !GetAtt LambdaRole.Arn
173-
Runtime: python3.6
173+
Runtime: python3.9
174174
Timeout: 300
175175
TracingConfig:
176176
Mode: "Active"
@@ -187,7 +187,7 @@ Resources:
187187
Handler: handler.lambda_handler
188188
MemorySize: 3008
189189
Role: !GetAtt LambdaRole.Arn
190-
Runtime: python3.6
190+
Runtime: python3.9
191191
Timeout: 300
192192
TracingConfig:
193193
Mode: "Active"
@@ -201,7 +201,7 @@ Resources:
201201
Handler: handler.lambda_handler
202202
MemorySize: 3008
203203
Role: !GetAtt LambdaRole.Arn
204-
Runtime: python3.6
204+
Runtime: python3.9
205205
Timeout: 300
206206
TracingConfig:
207207
Mode: "Active"
@@ -217,7 +217,7 @@ Resources:
217217
Handler: handler.lambda_handler
218218
MemorySize: 3008
219219
Role: !GetAtt LambdaRole.Arn
220-
Runtime: python3.6
220+
Runtime: python3.9
221221
Timeout: 300
222222
TracingConfig:
223223
Mode: "Active"
@@ -231,7 +231,7 @@ Resources:
231231
Handler: handler.lambda_handler
232232
MemorySize: 3008
233233
Role: !GetAtt LambdaRole.Arn
234-
Runtime: python3.6
234+
Runtime: python3.9
235235
Timeout: 300
236236
TracingConfig:
237237
Mode: "Active"
@@ -259,7 +259,7 @@ Resources:
259259
Handler: handler.lambda_handler
260260
MemorySize: 3008
261261
Role: !GetAtt LambdaRole.Arn
262-
Runtime: python3.6
262+
Runtime: python3.9
263263
Timeout: 300
264264
TracingConfig:
265265
Mode: "Active"
@@ -274,7 +274,7 @@ Resources:
274274
Handler: handler.lambda_handler
275275
MemorySize: 3008
276276
Role: !GetAtt LambdaRole.Arn
277-
Runtime: python3.6
277+
Runtime: python3.9
278278
Timeout: 300
279279
TracingConfig:
280280
Mode: "Active"
@@ -296,7 +296,7 @@ Resources:
296296
Handler: handler.lambda_handler
297297
MemorySize: 3008
298298
Role: !GetAtt LambdaRole.Arn
299-
Runtime: python3.6
299+
Runtime: python3.9
300300
Timeout: 300
301301
TracingConfig:
302302
Mode: "Active"
@@ -312,7 +312,7 @@ Resources:
312312
Handler: handler.lambda_handler
313313
MemorySize: 3008
314314
Role: !GetAtt LambdaRole.Arn
315-
Runtime: python3.6
315+
Runtime: python3.9
316316
Timeout: 300
317317
TracingConfig:
318318
Mode: "Active"
@@ -330,7 +330,7 @@ Resources:
330330
Handler: handler.lambda_handler
331331
MemorySize: 3008
332332
Role: !GetAtt LambdaRole.Arn
333-
Runtime: python3.6
333+
Runtime: python3.9
334334
Timeout: 300
335335
TracingConfig:
336336
Mode: "Active"
@@ -345,7 +345,7 @@ Resources:
345345
AUTHLETE_API_KEY: !Ref AuthleteApiKey
346346
AUTHLETE_API_SECRET: !Ref AuthleteApiSecret
347347
MemorySize: 3008
348-
Runtime: python3.6
348+
Runtime: python3.9
349349
Timeout: 300
350350
TracingConfig:
351351
Mode: "Active"
@@ -360,7 +360,7 @@ Resources:
360360
AUTHLETE_API_KEY: !Ref AuthleteApiKey
361361
AUTHLETE_API_SECRET: !Ref AuthleteApiSecret
362362
MemorySize: 3008
363-
Runtime: python3.6
363+
Runtime: python3.9
364364
Timeout: 300
365365
TracingConfig:
366366
Mode: "Active"
@@ -375,7 +375,7 @@ Resources:
375375
AUTHLETE_API_KEY: !Ref AuthleteApiKey
376376
AUTHLETE_API_SECRET: !Ref AuthleteApiSecret
377377
MemorySize: 3008
378-
Runtime: python3.6
378+
Runtime: python3.9
379379
Timeout: 300
380380
TracingConfig:
381381
Mode: "Active"
@@ -390,7 +390,7 @@ Resources:
390390
AUTHLETE_API_KEY: !Ref AuthleteApiKey
391391
AUTHLETE_API_SECRET: !Ref AuthleteApiSecret
392392
MemorySize: 3008
393-
Runtime: python3.6
393+
Runtime: python3.9
394394
Timeout: 300
395395
TracingConfig:
396396
Mode: "Active"
@@ -405,7 +405,7 @@ Resources:
405405
AUTHLETE_API_KEY: !Ref AuthleteApiKey
406406
AUTHLETE_API_SECRET: !Ref AuthleteApiSecret
407407
MemorySize: 3008
408-
Runtime: python3.6
408+
Runtime: python3.9
409409
Timeout: 300
410410
TracingConfig:
411411
Mode: "Active"
@@ -420,7 +420,7 @@ Resources:
420420
AUTHLETE_API_KEY: !Ref AuthleteApiKey
421421
AUTHLETE_API_SECRET: !Ref AuthleteApiSecret
422422
MemorySize: 3008
423-
Runtime: python3.6
423+
Runtime: python3.9
424424
Timeout: 300
425425
TracingConfig:
426426
Mode: "Active"
@@ -435,7 +435,7 @@ Resources:
435435
AUTHLETE_API_KEY: !Ref AuthleteApiKey
436436
AUTHLETE_API_SECRET: !Ref AuthleteApiSecret
437437
MemorySize: 3008
438-
Runtime: python3.6
438+
Runtime: python3.9
439439
Timeout: 300
440440
TracingConfig:
441441
Mode: "Active"
@@ -450,7 +450,7 @@ Resources:
450450
AUTHLETE_API_KEY: !Ref AuthleteApiKey
451451
AUTHLETE_API_SECRET: !Ref AuthleteApiSecret
452452
MemorySize: 3008
453-
Runtime: python3.6
453+
Runtime: python3.9
454454
Timeout: 300
455455
TracingConfig:
456456
Mode: "Active"

0 commit comments

Comments
 (0)