Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
- name: npm build
working-directory: ./frontend
run: npm run build
- name: Set up Python 3.11
- name: Set up Python 3.13
uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.13
cache: pip
- name: Install pipenv
run: pip install pipenv
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ repos:
# Python tools
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.4.2
rev: v0.9.6
hooks:
# Run the linter.
- id: ruff
Expand Down
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.13
1 change: 0 additions & 1 deletion .python_version

This file was deleted.

25 changes: 0 additions & 25 deletions Pipfile

This file was deleted.

1,172 changes: 0 additions & 1,172 deletions Pipfile.lock

This file was deleted.

6 changes: 1 addition & 5 deletions infrastructure/lambda_layers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,4 @@

## Preferred method: create lambda layers with docker

update requirements.txt

docker run -v "$PWD":/var/task "public.ecr.aws/sam/build-python3.11" /bin/sh -c "pip install -t python/lib/python3.11/site-packages/ -r requirements.txt ; exit"
zip -r --exclude="*.swp" --exclude=**__pycache__** --exclude="boto3*" --exclude="botocore*" --exclude="/venv*" layer_name.zip python
rm -R python
with docker running, use the ./build.sh file to build new layer zips
8 changes: 4 additions & 4 deletions infrastructure/lambda_layers/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ build_layer_from_requirements () {
# give the directory with the requirements.txt and it will build a zip
# with the same name as the directory
###
PY_VERSION=3.11
DOCKER_BUILD_IMAGE="public.ecr.aws/sam/build-python3.11:latest-x86_64"
PY_VERSION=3.13
DOCKER_BUILD_IMAGE="public.ecr.aws/sam/build-python3.13:latest-x86_64"
LAMBDA_LAYERS_DIR="."
LAYER_NAME=$1

Expand Down Expand Up @@ -52,8 +52,8 @@ build_layer_from_requirements () {
create_requirements_from_poetry () {
LAYER_NAME=$1
pushd "$LAYER_NAME" || exit
poetry lock
poetry export -f requirements.txt --output ./requirements.txt
uv lock --project pyproject.toml
uv export --project pyproject.toml --no-emit-project > requirements.txt
popd || exit
}

Expand Down
Binary file modified infrastructure/lambda_layers/default_layer.zip
Binary file not shown.
308 changes: 0 additions & 308 deletions infrastructure/lambda_layers/default_layer/poetry.lock

This file was deleted.

15 changes: 7 additions & 8 deletions infrastructure/lambda_layers/default_layer/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
[tool.poetry]
[project]
name = "pythonwa-default-layer"
version = "0.1.0"
description = ""
authors = ["Ben Fitzhardinge <ben@fitzhardinge.net>"]
readme = "README.md"
requires-python = ">=3.13"

[tool.poetry.dependencies]
python = "^3.11"
pydantic = "^2.7.1"
requests = "^2.31.0"
aws-lambda-typing = "^2.20.0"

dependencies = [
"pydantic~=2.10.6",
"requests~=2.32.3",
"aws-lambda-typing~=2.20.0",
]

[build-system]
requires = ["poetry-core"]
Expand Down
149 changes: 149 additions & 0 deletions infrastructure/lambda_layers/default_layer/uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified infrastructure/lambda_layers/markdown_layer.zip
Binary file not shown.
21 changes: 0 additions & 21 deletions infrastructure/lambda_layers/markdown_layer/poetry.lock

This file was deleted.

10 changes: 5 additions & 5 deletions infrastructure/lambda_layers/markdown_layer/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[tool.poetry]
[project]
name = "pyhthonwa-markdown-layer"
version = "0.1.0"
description = ""
authors = ["Ben Fitzhardinge <ben@fitzhardinge.net>"]
readme = "README.md"
requires-python = ">=3.13"

[tool.poetry.dependencies]
python = "^3.11"
markdown = "^3.6"
dependencies = [
"markdown~=3.6",
]


[build-system]
Expand Down
22 changes: 22 additions & 0 deletions infrastructure/lambda_layers/markdown_layer/uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading