Modernize app

Author: patrick91

.gitignore

@@ -1,53 +1,3 @@
-.DS_Store
-
-
-# Created by https://www.gitignore.io/api/macos,linux,python,windows
-# Edit at https://www.gitignore.io/?templates=macos,linux,python,windows
-
-### Linux ###
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-### macOS ###
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### Python ###
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -70,7 +20,6 @@ parts/
 sdist/
 var/
 wheels/
-pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -97,8 +46,10 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
+*.py,cover
 .hypothesis/
 .pytest_cache/
+cover/
 
 # Translations
 *.mo
@@ -108,6 +59,7 @@ coverage.xml
 *.log
 local_settings.py
 db.sqlite3
+db.sqlite3-journal
 
 # Flask stuff:
 instance/
@@ -120,6 +72,7 @@ instance/
 docs/_build/
 
 # PyBuilder
+.pybuilder/
 target/
 
 # Jupyter Notebook
@@ -130,10 +83,40 @@ profile_default/
 ipython_config.py
 
 # pyenv
-.python-version
-
-# celery beat schedule file
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
 celerybeat-schedule
+celerybeat.pid
 
 # SageMath parsed files
 *.sage.py
@@ -154,6 +137,9 @@ venv.bak/
 # Rope project settings
 .ropeproject
 
+# mkdocs documentation
+/site
+
 # mypy
 .mypy_cache/
 .dmypy.json
@@ -162,35 +148,18 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-### Python Patch ###
-.venv/
-
-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
+# pytype static type analyzer
+.pytype/
 
-# End of https://www.gitignore.io/api/macos,linux,python,windows
+# Cython debug symbols
+cython_debug/
 
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
 
+.ruff_cache/
 .vscode/

.pre-commit-config.yaml

@@ -1,41 +1,25 @@
 repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+  - repo: https://github.com/psf/black
+    rev: 23.7.0
     hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: check-yaml
-      - id: check-added-large-files
-      - id: check-ast
+      - id: black
 
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.280
     hooks:
-      - id: pyupgrade
+      - id: ruff
+        args: [--fix]
 
-  - repo: local
+  - repo: https://github.com/patrick91/pre-commit-alex
+    rev: aa5da9e54b92ab7284feddeaf52edf14b1690de3
     hooks:
-      - id: mypy
-        name: run mypy
-        language: system
-        entry: bash -c 'poetry run mypy "${@/backend\//./}"' --
-        types: [python]
-        files: ^backend/
-
-      - id: flake8
-        name: run flake8
-        language: system
-        entry: bash -c 'poetry run flake8 "${@/backend\//./}"' --
-        types: [python]
-
-      - id: isort
-        name: run isort
-        language: system
-        entry: bash -c 'poetry run isort "${@/backend\//./}"' --
-        types: [python]
+      - id: alex
 
-      - id: black
-        name: run black
-        language: system
-        entry: bash -c 'poetry run black "${@/backend\//./}"' --
-        types: [python]
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-merge-conflict
+      - id: end-of-file-fixer
+        exclude: ^tests/relay/snapshots
+      - id: check-toml

Dockerfile

@@ -1,14 +1,22 @@
-FROM tiangolo/uvicorn-gunicorn:python3.8
+FROM python:3.11-slim
 
-# Install Poetry
-RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \
-    cd /usr/local/bin && \
-    ln -s /opt/poetry/bin/poetry && \
-    poetry config virtualenvs.create false
+RUN apt-get update && apt-get install postgresql-client cmake -y
 
-# Copy using poetry.lock* in case it doesn't exist yet
-COPY ./pyproject.toml ./poetry.lock* /app/
+# install PDM
+RUN pip install -U pip setuptools wheel
+RUN pip install pdm
 
-RUN poetry install --no-root --no-dev
+# copy files
+COPY pyproject.toml pdm.lock /project/
+COPY . /project
 
-COPY . /app
+WORKDIR /project
+# TODO: improve caching
+
+RUN pdm install --prod --no-lock --no-editable -v
+
+RUN SECRET_KEY=secret pdm run python manage.py collectstatic --noinput
+
+EXPOSE 8080
+
+CMD ["pdm", "server"]

README.md

@@ -7,6 +7,6 @@ file checks (and more) on
 ## How to run
 
 ```shell
-poetry install
-poetry run task server
+pdm install
+pdm dev
 ```

app/github.py

@@ -31,23 +31,24 @@ def has_signature(comment: GithubComment, slug: str) -> bool:
     )
 
 
-def get_comments_link(pr_number: int, repo: typing.Optional[str] = None) -> str:
+def get_comments_link(pr_number: int, repo: str | None = None) -> str:
     url = (
         f"/repos/strawberry-graphql/{repo or 'strawberry'}/issues/{pr_number}/comments"
     )
 
     return API_BASE + url
 
 
-def get_labels_link(pr_number: int, repo: typing.Optional[str] = None) -> str:
+def get_labels_link(pr_number: int, repo: str | None = None) -> str:
     url = f"/repos/strawberry-graphql/{repo or 'strawberry'}/issues/{pr_number}/labels"
 
     return API_BASE + url
 
 
 def get_comments(
-    pr_number: int, repo: typing.Optional[str] = None
-) -> typing.List[GithubComment]:
+    pr_number: int,
+    repo: str | None = None,
+) -> list[GithubComment]:
     comments_link = get_comments_link(pr_number, repo=repo)
 
     response = httpx.get(comments_link)
@@ -56,8 +57,9 @@ def get_comments(
 
 
 def get_labels(
-    pr_number: int, repo: typing.Optional[str] = None
-) -> typing.List[GithubLabel]:
+    pr_number: int,
+    repo: str | None = None,
+) -> list[GithubLabel]:
     labels_link = get_labels_link(pr_number, repo=repo)
 
     response = httpx.get(labels_link)
@@ -66,8 +68,11 @@ def get_labels(
 
 
 def add_or_edit_comment(
-    pr_number: int, comment_template: str, slug: str, repo: typing.Optional[str] = None
-):
+    pr_number: int,
+    comment_template: str,
+    slug: str,
+    repo: str | None = None,
+) -> None:
     current_comments = get_comments(pr_number, repo=repo)
 
     previous_comment = next(
@@ -92,10 +97,12 @@ def add_or_edit_comment(
 
 
 def update_labels(
-    pr_number: int, release_info: typing.Optional[ReleaseInfo], repo: str | None = None
-):
+    pr_number: int,
+    release_info: ReleaseInfo | None,
+    repo: str | None = None,
+) -> None:
     labels_to_add = {"bot:has-release-file"}
-    labels_to_remove: typing.Set[str] = set()
+    labels_to_remove: set[str] = set()
 
     new_release_label = None