From a565cf7aef515e6a4a56fde3da6579433fd9362d Mon Sep 17 00:00:00 2001 From: Christopher Broderick Date: Thu, 21 Aug 2025 17:37:05 +0100 Subject: [PATCH 1/3] Remove redundant verbiage. --- demodesk/README.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/demodesk/README.rst b/demodesk/README.rst index 69e31da8..db5a370c 100644 --- a/demodesk/README.rst +++ b/demodesk/README.rst @@ -55,11 +55,6 @@ before running:: make rundemo -*NOTE ON DJANGO VERISON* - -The demo project was configured with Django 2.2 in mind. -Django 3.2 LTS is highly recommended. -Django 1.11 is NOT supported. *NOTE ON ATTACHMENTS* From 86dd6805a4d4fd87e3c6b63b93d36482404b7d12 Mon Sep 17 00:00:00 2001 From: Christopher Broderick Date: Thu, 21 Aug 2025 17:37:44 +0100 Subject: [PATCH 2/3] Remove redundant files --- constraints-Django32.txt | 2 -- constraints-Django4.txt | 1 - constraints-Django5.txt | 1 - requirements-dev.txt | 5 ----- requirements-no-pinax.txt | 13 ------------- requirements-testing.txt | 11 ----------- requirements.txt | 16 ---------------- 7 files changed, 49 deletions(-) delete mode 100644 constraints-Django32.txt delete mode 100644 constraints-Django4.txt delete mode 100644 constraints-Django5.txt delete mode 100644 requirements-dev.txt delete mode 100644 requirements-no-pinax.txt delete mode 100644 requirements-testing.txt delete mode 100644 requirements.txt diff --git a/constraints-Django32.txt b/constraints-Django32.txt deleted file mode 100644 index 0a12b5b3..00000000 --- a/constraints-Django32.txt +++ /dev/null @@ -1,2 +0,0 @@ -Django >=3.2,<4 - diff --git a/constraints-Django4.txt b/constraints-Django4.txt deleted file mode 100644 index 0f9b0d77..00000000 --- a/constraints-Django4.txt +++ /dev/null @@ -1 +0,0 @@ -Django >=4.2,<5 diff --git a/constraints-Django5.txt b/constraints-Django5.txt deleted file mode 100644 index a4769e29..00000000 --- a/constraints-Django5.txt +++ /dev/null @@ -1 +0,0 @@ -Django >=5,<6 diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index 973bf2e3..00000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,5 +0,0 @@ -tox -ruff -pycodestyle -isort -freezegun diff --git a/requirements-no-pinax.txt b/requirements-no-pinax.txt deleted file mode 100644 index fd08c940..00000000 --- a/requirements-no-pinax.txt +++ /dev/null @@ -1,13 +0,0 @@ -Django>=3.2 -django-bootstrap4-form -celery -django-celery-beat -email-reply-parser -akismet -markdown -beautifulsoup4 -lxml -pytz -six -djangorestframework -django-model-utils diff --git a/requirements-testing.txt b/requirements-testing.txt deleted file mode 100644 index a46716c1..00000000 --- a/requirements-testing.txt +++ /dev/null @@ -1,11 +0,0 @@ -pysocks -pycodestyle -coverage -argparse -pbr -mock -freezegun -isort -numpy -factory_boy -faker \ No newline at end of file diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 322c9d03..00000000 --- a/requirements.txt +++ /dev/null @@ -1,16 +0,0 @@ -Django>=3.2 -django-bootstrap4-form -celery -email-reply-parser -akismet -markdown -beautifulsoup4 -lxml -pytz -pinax_teams -djangorestframework -django-model-utils -django-cleanup -oauthlib -requests_oauthlib -requests From b3c9db15ec9dea91861063465d5f1e76208d9069 Mon Sep 17 00:00:00 2001 From: Christopher Broderick Date: Thu, 21 Aug 2025 17:47:40 +0100 Subject: [PATCH 3/3] Make the pyproject.toml file available to docker build script --- standalone/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/Dockerfile b/standalone/Dockerfile index dea0e9a3..ba1259f8 100644 --- a/standalone/Dockerfile +++ b/standalone/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get install -yqq \ cron \ git -COPY django-helpdesk/src django-helpdesk/standalone /opt/django-helpdesk +COPY django-helpdesk/src django-helpdesk/standalone django-helpdesk/pyproject.toml /opt/django-helpdesk COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ RUN pip3 install --upgrade pip RUN pip3 install packaging