From 78786854cfacd48fd8685089596aab6b142640fd Mon Sep 17 00:00:00 2001 From: "Mees, T.D. (Ty)" Date: Wed, 8 Nov 2023 17:33:40 +0100 Subject: [PATCH 1/3] chore: update deps --- requirements.in | 4 +- requirements.txt | 105 +++++++++++++++++++++++++++-------------------- 2 files changed, 62 insertions(+), 47 deletions(-) diff --git a/requirements.in b/requirements.in index e3cd60377..6b368808a 100644 --- a/requirements.in +++ b/requirements.in @@ -7,7 +7,7 @@ django-impersonate django-simple-menu django-debug-toolbar djangorestframework -djangosaml2<1.7 # 1.7 adds a logout bug... +djangosaml2 mysqlclient<2 xhtml2pdf sphinx @@ -21,7 +21,7 @@ pygments requests -e git+https://github.com/UiL-OTS-labs/django-shared-core.git@v2.0.10#egg=uil-django-core -e git+https://github.com/UiL-OTS-labs/python-docx2txt#egg=docx2txt -cdh-django-core[federated-auth] @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0-alpha-4 +cdh-django-core[federated-auth] @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0 python-magic pdftotext bpython diff --git a/requirements.txt b/requirements.txt index e789af82c..9618b7f20 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # # pip-compile --resolver=backtracking # @@ -19,25 +19,25 @@ asn1crypto==1.5.1 # oscrypto # pyhanko # pyhanko-certvalidator -babel==2.12.1 +babel==2.13.1 # via sphinx blessed==1.20.0 # via curtsies bpython==0.24 # via -r requirements.in -cdh-django-core @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0-alpha-4 +cdh-django-core @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0 # via -r requirements.in certifi==2023.7.22 # via requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests -click==8.1.6 +click==8.1.7 # via pyhanko closure==20191111 # via uil-django-core -cryptography==41.0.2 +cryptography==41.0.5 # via # pyhanko # pyhanko-certvalidator @@ -45,9 +45,9 @@ cryptography==41.0.2 # pysaml2 cssselect2==0.7.0 # via svglib -curtsies==0.4.1 +curtsies==0.4.2 # via bpython -cwcwidth==0.1.8 +cwcwidth==0.1.9 # via # bpython # curtsies @@ -57,7 +57,7 @@ defusedxml==0.7.1 # pysaml2 deprecated==1.2.14 # via cdh-django-core -django==3.2.20 +django==3.2.23 # via # -r requirements.in # cdh-django-core @@ -72,11 +72,11 @@ django==3.2.20 # djangosaml2 # sphinxcontrib-django # uil-django-core -django-auth-ldap==4.4.0 +django-auth-ldap==4.6.0 # via -r requirements.in django-braces==1.15.0 # via -r requirements.in -django-debug-toolbar==4.1.0 +django-debug-toolbar==4.2.0 # via -r requirements.in django-extensions==3.2.3 # via -r requirements.in @@ -84,7 +84,7 @@ django-impersonate==1.9.1 # via -r requirements.in django-modeltranslation==0.18.11 # via -r requirements.in -django-simple-menu==2.1.2.post1 +django-simple-menu==2.1.3 # via -r requirements.in django-user-agents==0.4.0 # via -r requirements.in @@ -93,14 +93,20 @@ djangorestframework==3.14.0 # -r requirements.in # uil-django-core djangosaml2==1.6.0 - # via cdh-django-core + # via + # -r requirements.in + # cdh-django-core docutils==0.18.1 # via # sphinx # sphinx-rtd-theme -elementpath==4.1.4 +elementpath==4.1.5 # via xmlschema -greenlet==2.0.2 +freetype-py==2.3.0 + # via + # reportlab + # rlpycairo +greenlet==3.0.1 # via bpython html5lib==1.1 # via @@ -124,13 +130,13 @@ mysqlclient==1.4.6 # via -r requirements.in oscrypto==1.3.0 # via pyhanko-certvalidator -packaging==23.1 +packaging==23.2 # via sphinx -pbr==5.11.1 +pbr==6.0.0 # via sphinxcontrib-apidoc pdftotext==2.2.2 # via -r requirements.in -pillow==10.0.0 +pillow==10.1.0 # via # -r requirements.in # reportlab @@ -147,24 +153,26 @@ pyasn1==0.5.0 # python-ldap pyasn1-modules==0.3.0 # via python-ldap +pycairo==1.25.1 + # via rlpycairo pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via # -r requirements.in # bpython # sphinx -pyhanko==0.19.0 +pyhanko==0.20.1 # via xhtml2pdf -pyhanko-certvalidator==0.23.0 +pyhanko-certvalidator==0.24.1 # via # pyhanko # xhtml2pdf pyjwt==2.8.0 # via uil-django-core -pyopenssl==23.2.0 +pyopenssl==23.3.0 # via pysaml2 -pypdf==3.13.0 +pypdf==3.17.0 # via xhtml2pdf pypng==0.20220715.0 # via qrcode @@ -180,7 +188,7 @@ python-ldap==3.4.3 # via django-auth-ldap python-magic==0.4.27 # via -r requirements.in -pytz==2023.3 +pytz==2023.3.post1 # via # django # djangorestframework @@ -191,7 +199,7 @@ pyyaml==6.0.1 # via pyhanko qrcode==7.4.2 # via pyhanko -reportlab==3.6.13 +reportlab[pycairo]==4.0.7 # via # svglib # xhtml2pdf @@ -204,6 +212,8 @@ requests==2.31.0 # pysaml2 # sphinx # uil-django-core +rlpycairo==0.3.0 + # via reportlab six==1.16.0 # via # blessed @@ -213,32 +223,37 @@ six==1.16.0 # python-dateutil snowballstemmer==2.2.0 # via sphinx -sphinx==6.2.1 +sphinx==7.2.6 # via # -r requirements.in # sphinx-rtd-theme # sphinxcontrib-apidoc + # sphinxcontrib-applehelp + # sphinxcontrib-devhelp # sphinxcontrib-django + # sphinxcontrib-htmlhelp # sphinxcontrib-jquery -sphinx-rtd-theme==1.2.2 + # sphinxcontrib-qthelp + # sphinxcontrib-serializinghtml +sphinx-rtd-theme==1.3.0 # via -r requirements.in -sphinxcontrib-apidoc==0.3.0 +sphinxcontrib-apidoc==0.4.0 # via -r requirements.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.7 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.5 # via sphinx -sphinxcontrib-django==2.4 +sphinxcontrib-django==2.5 # via -r requirements.in -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.4 # via sphinx sphinxcontrib-jquery==4.1 # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.6 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.9 # via sphinx sqlparse==0.4.4 # via @@ -250,25 +265,25 @@ tinycss2==1.2.1 # via # cssselect2 # svglib -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # asgiref # django-modeltranslation # pypdf # qrcode -tzlocal==5.0.1 +tzlocal==5.2 # via pyhanko ua-parser==0.18.0 # via user-agents -uritools==4.0.1 +uritools==4.0.2 # via pyhanko-certvalidator -urllib3==2.0.4 +urllib3==2.0.7 # via requests user-agents==2.2.0 # via django-user-agents -vbuild==0.8.1 +vbuild==0.8.2 # via uil-django-core -wcwidth==0.2.6 +wcwidth==0.2.9 # via blessed webencodings==0.5.1 # via @@ -277,9 +292,9 @@ webencodings==0.5.1 # tinycss2 wrapt==1.15.0 # via deprecated -xhtml2pdf==0.2.11 +xhtml2pdf==0.2.12 # via -r requirements.in -xmlschema==2.3.1 +xmlschema==2.5.0 # via pysaml2 -zipp==3.16.2 +zipp==3.17.0 # via importlib-metadata From dccd42c089886e8e218d4e07196ea7d65223d929 Mon Sep 17 00:00:00 2001 From: "Mees, T.D. (Ty)" Date: Thu, 9 Nov 2023 11:10:23 +0100 Subject: [PATCH 2/3] fix: use new DSC repo location --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 6b368808a..1826a6744 100644 --- a/requirements.in +++ b/requirements.in @@ -21,7 +21,7 @@ pygments requests -e git+https://github.com/UiL-OTS-labs/django-shared-core.git@v2.0.10#egg=uil-django-core -e git+https://github.com/UiL-OTS-labs/python-docx2txt#egg=docx2txt -cdh-django-core[federated-auth] @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0 +cdh-django-core[federated-auth] @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0 python-magic pdftotext bpython diff --git a/requirements.txt b/requirements.txt index 9618b7f20..b1a97c0ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,7 @@ blessed==1.20.0 # via curtsies bpython==0.24 # via -r requirements.in -cdh-django-core @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0 +cdh-django-core @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0 # via -r requirements.in certifi==2023.7.22 # via requests From 3fecfe480d9e9538403b55efca393eebb51ed61a Mon Sep 17 00:00:00 2001 From: "Mees, T.D. (Ty)" Date: Thu, 9 Nov 2023 11:26:28 +0100 Subject: [PATCH 3/3] docs: added missing syspackages --- docs/developing/install/steps.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/developing/install/steps.rst b/docs/developing/install/steps.rst index c7b17358e..44245a0f3 100644 --- a/docs/developing/install/steps.rst +++ b/docs/developing/install/steps.rst @@ -21,6 +21,8 @@ Your host OS needs some packages, below is a list of debian packages: + libsasl2-dev + libssl-dev + gettext ++ libcairo2-dev ++ libpoppler-cpp-dev Pip might throw errors while installing `mysqlclient` if you do not have a mysql-dev package. That package is not needed for development, so you can (temporarily) comment out that dependency if you run into problems. (Or just install the