Merge pull request #171 from presidento/django52

Ensure Django 5.2 and Python 3.13 support

Author: andreyfedoseev

Dockerfile

@@ -2,6 +2,8 @@ FROM andreyfedoseev/django-static-precompiler:22.04-1
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
 RUN apt update && \
+    apt upgrade --yes && \
+    apt autoremove --yes && \
     apt install software-properties-common -y && \
     add-apt-repository ppa:deadsnakes/ppa -y && \
     apt install -y  \
@@ -15,18 +17,18 @@ RUN apt update && \
     python3.11-dev \
     python3.11-distutils \
     python3.12-dev \
-    python3.12-distutils \
+    python3.13-dev \
     python3-pip \
-    sqlite3
+    sqlite3 && \
+    apt clean
 ENV POETRY_HOME=/opt/poetry VIRTUAL_ENV=/opt/venv PATH=/opt/venv/bin:/opt/poetry/bin:$PATH
 RUN python3 -m venv $POETRY_HOME && \
     $POETRY_HOME/bin/pip install --upgrade pip && \
     $POETRY_HOME/bin/pip install poetry && \
     python3 -m venv $VIRTUAL_ENV
-RUN mkdir /app
-WORKDIR /app
-ADD poetry.lock pyproject.toml /app/
+WORKDIR /opt/app
+ADD . /opt/app/
 RUN poetry install --all-extras --no-root --no-interaction && \
-    pyright --version #  this is to force pyright to install its dependencies
-ADD . /app/
-RUN poetry install --all-extras --no-interaction
+    pyright --version && \
+    poetry install --all-extras --no-interaction && \
+    tox run --notest -- poetry install --all-extras

Makefile

@@ -1,6 +1,9 @@
 all:
 	docker compose build
 
+update-dependencies:
+	docker compose run --rm app poetry update
+
 shell:
 	docker compose run --rm app /bin/bash
 

docker-compose.yml

@@ -1,7 +1,6 @@
-version: '2'
 services:
   app:
     build: .
     entrypoint: []
     volumes:
-      - .:/app
+      - .:/opt/app

poetry.lock

@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Internet :: WWW/HTTP"
 ]
 packages = [
@@ -37,7 +38,7 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-Django = "^3.2.0"
+Django = ">=3.2.0"
 libsass = {version = "*", optional = true}
 watchdog = {version = "*", optional = true}
 
@@ -50,7 +51,7 @@ pytest-mock = "~3.11.1"
 watchdog = "~3.0.0"
 coverage = "~7.3.0"
 tox = "~4.9.0"
-pyright = "^1.1.323"
+pyright = "==1.1.323" # Freezed temporarily, version 1.1.400 crashes
 django-stubs = "~4.2.3"
 
 [tool.poetry.extras]

pyproject.toml

@@ -50,7 +50,7 @@ def get_full_source_path(self, source_path: str) -> str:
                 return full_path
 
         with contextlib.suppress(django.core.exceptions.SuspiciousOperation):
-            full_path = finders.find(norm_source_path, all=False)
+            full_path = finders.find(norm_source_path)
 
         if full_path is None:
             raise ValueError(f"Can't find staticfile named: {source_path}")

src/static_precompiler/compilers/base.py

@@ -35,8 +35,7 @@ def list_files(scanned_dirs: StrCollection) -> Iterable[str]:
         for dirname, _dirnames, filenames in os.walk(scanned_dir):
             for filename in filenames:
                 path = os.path.join(dirname, filename)[len(scanned_dir) :]
-                if path.startswith("/"):
-                    path = path[1:]
+                path = path.lstrip(r"\/")
                 yield path
 
 

src/static_precompiler/management/commands/compilestatic.py

@@ -10,7 +10,9 @@
 
 def clean_javascript(js):
     """Remove comments and all blank lines."""
-    return "\n".join(line for line in js.split("\n") if line.strip() and not line.startswith("//"))
+    text = "\n".join(line for line in js.split("\n") if line.strip() and not line.startswith("//"))
+    text = text.replace("\\r\\n", "\\n")
+    return text
 
 
 def test_is_supported():

tests/test_handlebars.py

@@ -1,17 +1,18 @@
 [tox]
+toxworkdir = ../.tox
 isolated_build = true
 envlist =
-    py38-django32,
+    py38-django32
     py39-django42
-    py310-django42
-    py311-django42
-    py312-django42
+    py310-django52
+    py311-django52
+    py312-django52
+    py313-django52
 
 [testenv]
 allowlist_externals = poetry
 deps =
-    django32: Django>=3.2,<4
-    django42: Django>=4.2,<4.3
-commands_pre =
-    poetry install --all-extras
+    django32: Django~=3.2.0
+    django42: Django~=4.2.0
+    django52: Django~=5.2.0
 commands = poetry run pytest --cov static_precompiler --cov-report xml --cov-append