Bump Python and wkhtmltopdf.

ICTU · Jul 31, 2024 · 846baa2 · 846baa2
1 parent db4dcc4
commit 846baa2
Show file tree

Hide file tree

Showing 23 changed files with 55 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,20 @@
-FROM python:3.10.2-buster
+FROM python:3.12.4-bullseye
+
+# Work-around for https://github.com/docker/for-mac/issues/7025:
+RUN echo 'Acquire::http::Pipeline-Depth 0;\nAcquire::http::No-Cache true;\nAcquire::BrokenProxy true;\n' > /etc/apt/apt.conf.d/99fixbadproxy
 
 RUN apt-get update \
-  && apt-get -y upgrade \
-  && apt-get install -y --no-install-recommends fontconfig libjpeg62-turbo libx11-6 libxcb1 libxext6 libxrender1 xfonts-75dpi xfonts-base wget \
-  && apt-get install -y --no-install-recommends make docker.io docker-compose ghostscript \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+    && apt-get -y upgrade \
+    && apt-get install -y --no-install-recommends fontconfig libjpeg62-turbo libx11-6 libxcb1 libxext6 libxrender1 xfonts-75dpi xfonts-base wget \
+    && apt-get install -y --no-install-recommends make docker.io docker-compose ghostscript \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 ARG ARCH
 
-RUN wget --quiet https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${ARCH}.deb \
-    && dpkg -i wkhtmltox_0.12.6-1.buster_${ARCH}.deb \
-    && rm -f wkhtmltox_0.12.6-1.buster_${ARCH}.deb
+RUN wget --quiet https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.bullseye_${ARCH}.deb \
+    && dpkg -i wkhtmltox_0.12.6.1-2.bullseye_${ARCH}.deb \
+    && rm -f wkhtmltox_0.12.6.1-2.bullseye_${ARCH}.deb
 
 ADD ./thirdparty/fonts/muli /usr/share/fonts/truetype/muli
 RUN fc-cache -fv

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,12 +1,11 @@
-version: '3'
 services:
   ka:
     build:
       context: .
       args:
         ARCH: ${ARCH:-amd64}
     environment:
-        VERSION: ${VERSION}
+      VERSION: ${VERSION:-wip}
     working_dir: /work
     volumes:
       - ./:/work

diff --git a/docs/wip/ICTU-Kwaliteitsaanpak-Checklist.xlsx b/docs/wip/ICTU-Kwaliteitsaanpak-Checklist.xlsx
diff --git a/docs/wip/ICTU-Kwaliteitsaanpak-Samenvatting.pdf b/docs/wip/ICTU-Kwaliteitsaanpak-Samenvatting.pdf
diff --git a/docs/wip/ICTU-Kwaliteitsaanpak-Wijzigingsgeschiedenis.pdf b/docs/wip/ICTU-Kwaliteitsaanpak-Wijzigingsgeschiedenis.pdf
diff --git a/docs/wip/ICTU-Kwaliteitsaanpak.pdf b/docs/wip/ICTU-Kwaliteitsaanpak.pdf
diff --git a/docs/wip/ICTU-Kwaliteitsaanpak.pptx b/docs/wip/ICTU-Kwaliteitsaanpak.pptx
diff --git a/docs/wip/ICTU-Template-Compacte-Voorfase.docx b/docs/wip/ICTU-Template-Compacte-Voorfase.docx
diff --git a/docs/wip/ICTU-Template-Detailtestplan-Softwarerealisatie.docx b/docs/wip/ICTU-Template-Detailtestplan-Softwarerealisatie.docx
diff --git a/docs/wip/ICTU-Template-Generiek.docx b/docs/wip/ICTU-Template-Generiek.docx
diff --git a/docs/wip/ICTU-Template-Globaal-Functioneel-Ontwerp.docx b/docs/wip/ICTU-Template-Globaal-Functioneel-Ontwerp.docx
diff --git a/docs/wip/ICTU-Template-Inwerkplan-Kwaliteitsmanager.docx b/docs/wip/ICTU-Template-Inwerkplan-Kwaliteitsmanager.docx
diff --git a/docs/wip/ICTU-Template-Kwaliteitsplan.docx b/docs/wip/ICTU-Template-Kwaliteitsplan.docx
diff --git a/docs/wip/ICTU-Template-Plan-van-Aanpak-Realisatiefase.docx b/docs/wip/ICTU-Template-Plan-van-Aanpak-Realisatiefase.docx
diff --git a/docs/wip/ICTU-Template-Plan-van-Aanpak-Voorfase.docx b/docs/wip/ICTU-Template-Plan-van-Aanpak-Voorfase.docx
diff --git a/docs/wip/ICTU-Template-Software-architectuurdocument.docx b/docs/wip/ICTU-Template-Software-architectuurdocument.docx
diff --git a/docs/wip/Neutraal-Template-Generiek.docx b/docs/wip/Neutraal-Template-Generiek.docx
diff --git a/docs/wip/Neutraal-Template-Infrastructuurarchitectuur.docx b/docs/wip/Neutraal-Template-Infrastructuurarchitectuur.docx
diff --git a/docs/wip/Neutraal-Template-Mastertestplan.docx b/docs/wip/Neutraal-Template-Mastertestplan.docx
diff --git a/docs/wip/Neutraal-Template-Niet-Functionele-Eisen.docx b/docs/wip/Neutraal-Template-Niet-Functionele-Eisen.docx
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,2 +1,24 @@
+[project]
+name = "ictu-kwaliteitsaanpak"
+version = "4.0.0"
+requires-python = ">=3.12"
+classifiers = [
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.12",
+]
+dependencies = [
+    "python-docx==1.1.2",
+    "python-pptx==0.6.23",
+    "xlsxwriter==3.2.0",
+]
+optional-dependencies.dev = [
+    "black==24.4.2",
+    "coverage==7.6.0",
+    "mypy==1.11.1",
+    "pip-tools==7.4.1",
+    "pylint==3.2.6",
+    "vulture==2.11",
+]
+
 [tool.black]
 line-length = 120
diff --git a/requirements-dev.txt b/requirements-dev.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,22 @@
-pip==24.2
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile pyproject.toml
+#
+lxml==5.2.2
+    # via
+    #   python-docx
+    #   python-pptx
+pillow==10.4.0
+    # via python-pptx
 python-docx==1.1.2
+    # via ictu-kwaliteitsaanpak (pyproject.toml)
 python-pptx==0.6.23
-XlsxWriter==3.2.0
+    # via ictu-kwaliteitsaanpak (pyproject.toml)
+typing-extensions==4.12.2
+    # via python-docx
+xlsxwriter==3.2.0
+    # via
+    #   ictu-kwaliteitsaanpak (pyproject.toml)
+    #   python-pptx