diff --git a/Dockerfile b/Dockerfile index 0815c1d5..4951b6ab 100644 --- 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 index daaf23ae..1f0979b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: ka: build: @@ -6,7 +5,7 @@ services: 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 index 8ca89e89..91165364 100644 Binary files a/docs/wip/ICTU-Kwaliteitsaanpak-Checklist.xlsx and b/docs/wip/ICTU-Kwaliteitsaanpak-Checklist.xlsx differ diff --git a/docs/wip/ICTU-Kwaliteitsaanpak-Samenvatting.pdf b/docs/wip/ICTU-Kwaliteitsaanpak-Samenvatting.pdf index a8aa46f8..aa0a1b94 100644 Binary files a/docs/wip/ICTU-Kwaliteitsaanpak-Samenvatting.pdf and b/docs/wip/ICTU-Kwaliteitsaanpak-Samenvatting.pdf differ diff --git a/docs/wip/ICTU-Kwaliteitsaanpak-Wijzigingsgeschiedenis.pdf b/docs/wip/ICTU-Kwaliteitsaanpak-Wijzigingsgeschiedenis.pdf index e424e950..a5e0d397 100644 Binary files a/docs/wip/ICTU-Kwaliteitsaanpak-Wijzigingsgeschiedenis.pdf and b/docs/wip/ICTU-Kwaliteitsaanpak-Wijzigingsgeschiedenis.pdf differ diff --git a/docs/wip/ICTU-Kwaliteitsaanpak.pdf b/docs/wip/ICTU-Kwaliteitsaanpak.pdf index 3d1eaba7..2ebfa190 100644 Binary files a/docs/wip/ICTU-Kwaliteitsaanpak.pdf and b/docs/wip/ICTU-Kwaliteitsaanpak.pdf differ diff --git a/docs/wip/ICTU-Kwaliteitsaanpak.pptx b/docs/wip/ICTU-Kwaliteitsaanpak.pptx index a76cdd79..c5abc553 100644 Binary files a/docs/wip/ICTU-Kwaliteitsaanpak.pptx and b/docs/wip/ICTU-Kwaliteitsaanpak.pptx differ diff --git a/docs/wip/ICTU-Template-Compacte-Voorfase.docx b/docs/wip/ICTU-Template-Compacte-Voorfase.docx index 54134a9c..ec3fd5d2 100644 Binary files a/docs/wip/ICTU-Template-Compacte-Voorfase.docx and b/docs/wip/ICTU-Template-Compacte-Voorfase.docx differ diff --git a/docs/wip/ICTU-Template-Detailtestplan-Softwarerealisatie.docx b/docs/wip/ICTU-Template-Detailtestplan-Softwarerealisatie.docx index eeef6dac..47c8e9c3 100644 Binary files a/docs/wip/ICTU-Template-Detailtestplan-Softwarerealisatie.docx and b/docs/wip/ICTU-Template-Detailtestplan-Softwarerealisatie.docx differ diff --git a/docs/wip/ICTU-Template-Generiek.docx b/docs/wip/ICTU-Template-Generiek.docx index f2d500c0..c01c98ef 100644 Binary files a/docs/wip/ICTU-Template-Generiek.docx and b/docs/wip/ICTU-Template-Generiek.docx differ diff --git a/docs/wip/ICTU-Template-Globaal-Functioneel-Ontwerp.docx b/docs/wip/ICTU-Template-Globaal-Functioneel-Ontwerp.docx index 995bd36c..d3701c43 100644 Binary files a/docs/wip/ICTU-Template-Globaal-Functioneel-Ontwerp.docx and b/docs/wip/ICTU-Template-Globaal-Functioneel-Ontwerp.docx differ diff --git a/docs/wip/ICTU-Template-Inwerkplan-Kwaliteitsmanager.docx b/docs/wip/ICTU-Template-Inwerkplan-Kwaliteitsmanager.docx index 9c640337..d0f53496 100644 Binary files a/docs/wip/ICTU-Template-Inwerkplan-Kwaliteitsmanager.docx and b/docs/wip/ICTU-Template-Inwerkplan-Kwaliteitsmanager.docx differ diff --git a/docs/wip/ICTU-Template-Kwaliteitsplan.docx b/docs/wip/ICTU-Template-Kwaliteitsplan.docx index 1441e2d2..0bb79c7d 100644 Binary files a/docs/wip/ICTU-Template-Kwaliteitsplan.docx and b/docs/wip/ICTU-Template-Kwaliteitsplan.docx differ diff --git a/docs/wip/ICTU-Template-Plan-van-Aanpak-Realisatiefase.docx b/docs/wip/ICTU-Template-Plan-van-Aanpak-Realisatiefase.docx index 644a9808..c1c6521a 100644 Binary files a/docs/wip/ICTU-Template-Plan-van-Aanpak-Realisatiefase.docx and b/docs/wip/ICTU-Template-Plan-van-Aanpak-Realisatiefase.docx differ diff --git a/docs/wip/ICTU-Template-Plan-van-Aanpak-Voorfase.docx b/docs/wip/ICTU-Template-Plan-van-Aanpak-Voorfase.docx index 7667a543..55a361e6 100644 Binary files a/docs/wip/ICTU-Template-Plan-van-Aanpak-Voorfase.docx and b/docs/wip/ICTU-Template-Plan-van-Aanpak-Voorfase.docx differ diff --git a/docs/wip/ICTU-Template-Software-architectuurdocument.docx b/docs/wip/ICTU-Template-Software-architectuurdocument.docx index 24791780..0e20ac42 100644 Binary files a/docs/wip/ICTU-Template-Software-architectuurdocument.docx and b/docs/wip/ICTU-Template-Software-architectuurdocument.docx differ diff --git a/docs/wip/Neutraal-Template-Generiek.docx b/docs/wip/Neutraal-Template-Generiek.docx index e61b0bea..87791e7b 100644 Binary files a/docs/wip/Neutraal-Template-Generiek.docx and b/docs/wip/Neutraal-Template-Generiek.docx differ diff --git a/docs/wip/Neutraal-Template-Infrastructuurarchitectuur.docx b/docs/wip/Neutraal-Template-Infrastructuurarchitectuur.docx index 7790265a..f84d5118 100644 Binary files a/docs/wip/Neutraal-Template-Infrastructuurarchitectuur.docx and b/docs/wip/Neutraal-Template-Infrastructuurarchitectuur.docx differ diff --git a/docs/wip/Neutraal-Template-Mastertestplan.docx b/docs/wip/Neutraal-Template-Mastertestplan.docx index fa25832e..06fc8a6c 100644 Binary files a/docs/wip/Neutraal-Template-Mastertestplan.docx and b/docs/wip/Neutraal-Template-Mastertestplan.docx differ diff --git a/docs/wip/Neutraal-Template-Niet-Functionele-Eisen.docx b/docs/wip/Neutraal-Template-Niet-Functionele-Eisen.docx index e9e530db..4696dccb 100644 Binary files a/docs/wip/Neutraal-Template-Niet-Functionele-Eisen.docx and b/docs/wip/Neutraal-Template-Niet-Functionele-Eisen.docx differ diff --git a/pyproject.toml b/pyproject.toml index 55ec8d78..d615d227 100644 --- 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 deleted file mode 100644 index fdd0f43f..00000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,5 +0,0 @@ -black==24.4.2 -coverage==7.6.0 -mypy==1.11.1 -pylint==3.2.6 -vulture==2.11 diff --git a/requirements.txt b/requirements.txt index 47667dc4..02740920 100644 --- 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