Sync deploy-to-aws with main (#253)

.github/actions/setup/action.yaml

@@ -3,9 +3,9 @@ description: Set up Python, install Poetry and the dependencies
 runs:
  using: "composite"
  steps:
- - run: pipx install poetry==1.5.1
+ - run: pipx install poetry==1.7.0
  shell: bash
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@v5
  with:
  cache: poetry
  python-version: "3.9"

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
  name: Test
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - uses: ./.github/actions/setup
  - run: poetry run app format --check
  - run: poetry run app lint --check

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
  "recommendations": [
  "charliermarsh.ruff",
- "ms-python.black-formatter",
  "ms-python.python",
  "tamasfe.even-better-toml"
  ],

.vscode/settings.json

@@ -1,25 +1,21 @@
 {
  "[python]": {
  "editor.codeActionsOnSave": {
- "source.fixAll": true,
- "source.organizeImports": true
+ "source.fixAll": "explicit",
+ "source.organizeImports": "explicit"
  },
- "editor.defaultFormatter": "ms-python.black-formatter",
+ "editor.defaultFormatter": "charliermarsh.ruff",
  "editor.formatOnType": true
  },
- "black-formatter.importStrategy": "fromEnvironment",
  "files.insertFinalNewline": true,
  "files.trimFinalNewlines": true,
  "files.trimTrailingWhitespace": true,
  "python.analysis.autoImportCompletions": true,
- "python.formatting.provider": "black",
  "python.languageServer": "Pylance",
- "python.linting.mypyCategorySeverity.note": "Error",
- "python.linting.mypyEnabled": true,
  "python.testing.pytestArgs": [
- "--capture=no", "--verbose"
+ "--capture=no",
+ "--verbose"
  ],
  "python.testing.pytestEnabled": true,
- "python.testing.unittestEnabled": false,
- "ruff.importStrategy": "fromEnvironment"
+ "python.testing.unittestEnabled": false
 }

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.2
 FROM python:3.9.12-slim AS builder
 
-RUN --mount=type=cache,target=/root/.cache pip install poetry==1.3.1
+RUN --mount=type=cache,target=/root/.cache pip install poetry==1.7.0
 RUN poetry config virtualenvs.create false
 
 COPY poetry.lock pyproject.toml ./

app/app.py

@@ -3,6 +3,7 @@
 from types import TracebackType
 
 import atoti as tt
+from typing_extensions import Self
 
 from .config import Config
 from .load_tables import load_tables
@@ -34,7 +35,7 @@ def close(self) -> None:
  self._stop_refreshing_data()
  self.session.close()
 
- def __enter__(self) -> App:
+ def __enter__(self) -> Self:
  return self
 
  def __exit__(

app/config.py

@@ -53,7 +53,7 @@ class Config(BaseSettings):
  velib_data_base_path: Union[HttpUrl, DirectoryPath] = TypeAdapter(
  HttpUrl
  ).validate_python(
- "https://velib-metropole-opendata.smoove.pro/opendata/Velib_Metropole"
+ "https://velib-metropole-opendata.smovengo.cloud/opendata/Velib_Metropole"
  )
 
  @field_validator("user_content_storage")

app/util/reverse_geocode.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Iterable, Mapping, Set
+from collections.abc import Iterable, Mapping, Set as AbstractSet
 from datetime import timedelta
 from functools import wraps
 from io import StringIO
@@ -31,14 +31,16 @@
 
 
 def _cache(
- function: Callable[Concatenate[Set[_Coordinates], _P], _ReverseGeocodedCoordinates],
+ function: Callable[
+ Concatenate[AbstractSet[_Coordinates], _P], _ReverseGeocodedCoordinates
+ ],
  /,
-) -> Callable[Concatenate[Set[_Coordinates], _P], _ReverseGeocodedCoordinates]:
+) -> Callable[Concatenate[AbstractSet[_Coordinates], _P], _ReverseGeocodedCoordinates]:
  cache: _ReverseGeocodedCoordinates = {}
 
  @wraps(function)
  def function_wrapper(
- coordinates: Set[_Coordinates],
+ coordinates: AbstractSet[_Coordinates],
  /,
  *args: _P.args,
  **kwargs: _P.kwargs,
@@ -53,7 +55,7 @@ def function_wrapper(
 
 @_cache
 def _reverse_geocode(
- coordinates: Set[_Coordinates],
+ coordinates: AbstractSet[_Coordinates],
  /,
  *,
  reverse_geocoding_path: HttpUrl | Path,

cli/app.py

@@ -25,7 +25,9 @@ def build_docker(tag: str) -> None:
 
 @app.command(help="Format the project files.")
 def format(*, check: _CheckOption = False) -> None: # noqa: A001
- run_command(["black", *(["--check"] if check else []), "."], run_with_poetry=True)
+ run_command(
+ ["ruff", "format", *(["--check"] if check else []), "."], run_with_poetry=True
+ )
 
 
 @app.command(help="Lint the project files.")