Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IT-3817] update python version #57

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/actions/sam-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@ runs:
# Convert Pipfile.lock to requirements.txt for sam
- uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.11
- run: pip install -U pipenv
shell: bash
- run: pipenv install --dev
shell: bash
- run: pipenv requirements > requirements.txt
shell: bash

# Install aws-sam-cli
- uses: aws-actions/setup-sam@v2
with:
use-installer: true

# Use a lambda-like docker container to build the lambda artifact
- run: sam build --use-container
shell: bash
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.11
- uses: pre-commit/[email protected]

# This project doesn't have any tests
Expand All @@ -24,7 +24,7 @@ jobs:
# - name: Set up Python
# uses: actions/setup-python@v4
# with:
# python-version: 3.8
# python-version: 3.11
# - run: pip install -U pipenv
# - run: pipenv install --dev
# - run: pipenv run python3 -m pytest tests/ -vv
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,6 @@ dmypy.json

# generated dynamically from Pipfile
requirements.txt

# mac files
.DS_Store
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v5.0.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-ast
- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
rev: v1.35.1
hooks:
- id: yamllint
- repo: https://github.com/awslabs/cfn-python-lint
rev: v0.54.4
rev: v1.18.1
hooks:
- id: cfn-python-lint
files: template\.(json|yml|yaml)$
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.1.10
rev: v1.5.5
hooks:
- id: remove-tabs
5 changes: 3 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ verify_ssl = true

[dev-packages]
boto3 = "~=1.17"
aws-sam-cli = "~=1.126"

[packages]
synapseclient = ">=2.1,<3"
pyyaml = ">=5.4,<6"
pyyaml = "~=6.0"

[requires]
python_version = "3.8"
python_version = "3.11"
1,884 changes: 1,529 additions & 355 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:20.04

RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
python3.8 \
python3.11 \
python3-pip \
openslide-tools \
python3-openslide
Expand Down
2 changes: 1 addition & 1 deletion template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Resources:
Properties:
CodeUri: s3_synapse_sync/
Handler: lambda_function.lambda_handler
Runtime: python3.8
Runtime: python3.11
Role: !GetAtt FunctionRole.Arn
Environment:
Variables:
Expand Down
Loading