Skip to content

Commit

Permalink
Merge pull request #115 from hotosm/build/python3.11
Browse files Browse the repository at this point in the history
Upgrade backend to Python 3.11 + fix template dir permissions
  • Loading branch information
spwoodcock authored Aug 2, 2024
2 parents 39acb6e + 5bae5d9 commit fbc98eb
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 6 deletions.
16 changes: 16 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"frontend":
- "src/frontend/**/*"
"backend":
- "src/backend/**/*"
"devops":
- ".github/**/*"
- "docker-*.yml"
- "**/Dockerfile"
- "**/*.dockerfile"
- "**/*entrypoint.sh"
"migration":
- "src/backend/app/migrations/**/*"
"docs":
- "docs/**/*"
- "mkdocs.yml"
- "README.md"
14 changes: 14 additions & 0 deletions .github/workflows/pr_label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 🏷️ PR Label

on:
pull_request_target:

jobs:
pr-label:
runs-on: ubuntu-latest

steps:
- uses: actions/labeler@v5
# Uses .github/labeler.yml definitions
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion src/backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ARG for the base image
ARG PYTHON_BASE=3.10-slim-bookworm
ARG PYTHON_BASE=3.11-slim-bookworm

# Base build stage with dependencies required to build Python wheels
FROM python:$PYTHON_BASE AS build
Expand Down
1 change: 1 addition & 0 deletions src/backend/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ wait_for_minio() {
get_frontend_index_html() {
echo "Downloading index.html from object storage.."
curl --fail --create-dirs ${S3_ENDPOINT}/${FRONTEND_BUCKET_NAME}/index.html --output /project/src/backend/templates/index.html || echo "Failed to download index.html... Please retry manually for now...."
chmod -R 777 /project/src/backend/templates
}

# Start wait in background with tmp log files
Expand Down
4 changes: 0 additions & 4 deletions src/backend/pdm.lock

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

2 changes: 1 addition & 1 deletion src/backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies = [
"python-slugify>=8.0.4",
"drone-flightplan>=0.1.2",
]
requires-python = ">=3.10"
requires-python = ">=3.11"
license = {text = "GPL-3.0-only"}

[project.optional-dependencies]
Expand Down

0 comments on commit fbc98eb

Please sign in to comment.