Removes whitenoise patches and upgrades it to 6.8.1 (#8079)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a2cd88b8185e0930c52163b200ac4ca4eb76472..6614a9971012086be636a7eb2cb61ba7b3694f82 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -482,12 +482,6 @@ jobs:
         name: Install Python dependencies
         run: |
           pipenv --python ${{ steps.setup-python.outputs.python-version }} sync --dev
-      -
-        name: Patch whitenoise
-        run: |
-          curl --fail --silent --show-error --location --output 484.patch https://github.com/evansd/whitenoise/pull/484.patch
-          patch -d $(pipenv --venv)/lib/python3.11/site-packages --verbose -p2 < 484.patch
-          rm 484.patch
       -
         name: Install system dependencies
         run: |

diff --git a/Dockerfile b/Dockerfile
index 58748f2f46035332d649dc341df63756c63831d3..188fca577aea34b5636b98afc506f973af1346a9 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -239,10 +239,6 @@ RUN --mount=type=cache,target=/root/.cache/pip/,id=pip-cache \
     --output psycopg_c-3.2.2-cp312-cp312-linux_aarch64.whl  \
     https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.2/psycopg_c-3.2.2-cp312-cp312-linux_aarch64.whl \
     && python3 -m pip install --default-timeout=1000 --find-links . --requirement requirements.txt \
-  && echo "Patching whitenoise for compression speedup" \
-    && curl --fail --silent --show-error --location --output 484.patch https://github.com/evansd/whitenoise/pull/484.patch \
-    && patch -d /usr/local/lib/python3.12/site-packages --verbose -p2 < 484.patch \
-    && rm 484.patch \
   && echo "Installing NLTK data" \
     && python3 -W ignore::RuntimeWarning -m nltk.downloader -d "/usr/share/nltk_data" snowball_data \
     && python3 -W ignore::RuntimeWarning -m nltk.downloader -d "/usr/share/nltk_data" stopwords \

diff --git a/Pipfile b/Pipfile
index eff6a7b961d2e9d26b02f1208cfe345d24b9eef2..d3f3bf4b3675d5f1376c674306238efdf0b8b5f0 100644 (file)
--- a/Pipfile
+++ b/Pipfile
@@ -56,16 +56,17 @@ tqdm = "*"
 # See https://github.com/paperless-ngx/paperless-ngx/issues/5494
 uvicorn = {extras = ["standard"], version = "==0.25.0"}
 watchdog = "~=4.0"
-whitenoise = "~=6.7"
+whitenoise = "~=6.8"
 whoosh = "~=2.7"
 zxing-cpp = {version = "*", platform_machine = "== 'x86_64'"}
 
+
 [dev-packages]
 # Linting
 pre-commit = "*"
 ruff = "*"
-# Testing
 factory-boy = "*"
+# Testing
 pytest = "*"
 pytest-cov = "*"
 pytest-django = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
index 8ed6a6861443cdd7b999f95a73715302a1d605a9..b1ffdfa31b2839d96631933d460fb4ba5b3a488b 100644 (file)
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "584249cbeaf29659c975000b5e02b12e45d768d795e4a8ac36118e73bd7c0b8a"
+            "sha256": "3b615d0801cbb9ede6809ff8ecdd1ce1166bfefbc9e87b6fbfd26518b3425ec9"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -2406,12 +2406,12 @@
         },
         "whitenoise": {
             "hashes": [
-                "sha256:58c7a6cd811e275a6c91af22e96e87da0b1109e9a53bb7464116ef4c963bf636",
-                "sha256:a1ae85e01fdc9815d12fa33f17765bc132ed2c54fa76daf9e39e879dd93566f6"
+                "sha256:11042f39f1dcfbb3814726b9364703af6901706582d988e96494cfefdc3a89e2",
+                "sha256:196ba04ca0a80f4a3f99f88381864f218a28b5fb5b44d29feea484d501fa0ba3"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==6.7.0"
+            "markers": "python_version >= '3.9'",
+            "version": "==6.8.1"
         },
         "whoosh": {
             "hashes": [