From 2e68152b1dfc810a72f283202cd6262d36981224 Mon Sep 17 00:00:00 2001 From: Sven van de Scheur Date: Wed, 23 Nov 2022 14:33:42 +0100 Subject: [PATCH] :arrow_up: - Fix dependency conflict. --- requirements/base.in | 2 +- requirements/base.txt | 18 +++++++++--------- requirements/ci.txt | 23 +++++++++++------------ requirements/dev.txt | 22 +++++++++++----------- requirements/test-tools.in | 1 - 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 14f545e91c..5f0048af0c 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -62,7 +62,7 @@ beautifulsoup4 # DigidLocal django-digid-eherkenning -git+https://github.com/maykinmedia/python3-saml.git@9f1ffa86fdfe68ccbcf063613c6e6cbb5447c360#egg=python3_saml +maykin-python3-saml pyopenssl django-sessionprofile diff --git a/requirements/base.txt b/requirements/base.txt index 26a0a481ad..712d2da8d3 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -44,8 +44,8 @@ cssselect2==0.4.1 defusedxml==0.7.1 # via # django-digid-eherkenning + # maykin-python3-saml # odfpy - # python3-saml diff-match-patch==20200713 # via django-import-export django==3.2.15 @@ -240,15 +240,15 @@ importlib-metadata==4.8.2 inflection==0.5.1 # via drf-spectacular isodate==0.6.1 - # via python3-saml + # via maykin-python3-saml josepy==1.13.0 # via mozilla-django-oidc jsonschema==4.1.0 # via drf-spectacular -lxml==4.6.5 +lxml==4.9.1 # via # django-digid-eherkenning - # python3-saml + # maykin-python3-saml # xmlsec mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@0b4621b5c7f434586115b8e722af8940cfa70195 # via -r requirements/base.in @@ -258,6 +258,8 @@ markuppy==1.14 # via tablib maykin-django-two-factor-auth==2.0.4 # via -r requirements/base.in +maykin-python3-saml==1.14.0.post0 + # via -r requirements/base.in mozilla-django-oidc==2.0.0 # via mozilla-django-oidc-db mozilla-django-oidc-db==0.10.0 @@ -291,7 +293,7 @@ pyopenssl==21.0.0 # via # -r requirements/base.in # josepy - # python3-saml + # maykin-python3-saml # zgw-consumers pyphen==0.12.0 # via weasyprint @@ -308,8 +310,6 @@ python-dotenv==0.19.0 # via -r requirements/base.in python-stdnum==1.17 # via django-localflavor -python3_saml @ git+https://github.com/maykinmedia/python3-saml.git@9f1ffa86fdfe68ccbcf063613c6e6cbb5447c360 - # via -r requirements/base.in pytz==2021.3 # via # -r requirements/base.in @@ -330,8 +330,8 @@ requests==2.26.0 # django-open-forms-client # django-rosetta # gemma-zds-client + # maykin-python3-saml # mozilla-django-oidc - # python3-saml # requests-mock # zgw-consumers requests-mock==1.9.3 @@ -389,7 +389,7 @@ xlrd==2.0.1 xlwt==1.3.0 # via tablib xmlsec==1.3.12 - # via python3-saml + # via maykin-python3-saml zgw-consumers==0.18.0 # via -r requirements/base.in zipp==3.6.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index 88f3f48e39..bdd2edb2ad 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -83,8 +83,8 @@ defusedxml==0.7.1 # -c requirements/base.txt # -r requirements/base.txt # django-digid-eherkenning + # maykin-python3-saml # odfpy - # python3-saml diff-match-patch==20200713 # via # -c requirements/base.txt @@ -433,7 +433,7 @@ isodate==0.6.1 # via # -c requirements/base.txt # -r requirements/base.txt - # python3-saml + # maykin-python3-saml isort==5.9.3 # via pylint josepy==1.13.0 @@ -448,13 +448,13 @@ jsonschema==4.1.0 # drf-spectacular lazy-object-proxy==1.6.0 # via astroid -lxml==4.6.5 +lxml==4.9.1 # via # -c requirements/base.txt # -r requirements/base.txt # django-digid-eherkenning + # maykin-python3-saml # pyquery - # python3-saml # xmlsec mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@0b4621b5c7f434586115b8e722af8940cfa70195 # via @@ -473,6 +473,10 @@ maykin-django-two-factor-auth==2.0.4 # via # -c requirements/base.txt # -r requirements/base.txt +maykin-python3-saml==1.14.0.post0 + # via + # -c requirements/base.txt + # -r requirements/base.txt mccabe==0.6.1 # via pylint mozilla-django-oidc==2.0.0 @@ -550,7 +554,7 @@ pyopenssl==21.0.0 # -r requirements/base.txt # -r requirements/test-tools.in # josepy - # python3-saml + # maykin-python3-saml # zgw-consumers pyphen==0.12.0 # via @@ -585,11 +589,6 @@ python-stdnum==1.17 # -c requirements/base.txt # -r requirements/base.txt # django-localflavor -python3_saml @ git+https://github.com/maykinmedia/python3-saml.git@9f1ffa86fdfe68ccbcf063613c6e6cbb5447c360 - # via - # -c requirements/base.txt - # -r requirements/base.txt - # -r requirements/test-tools.in pytz==2021.3 # via # -c requirements/base.txt @@ -623,8 +622,8 @@ requests==2.26.0 # django-open-forms-client # django-rosetta # gemma-zds-client + # maykin-python3-saml # mozilla-django-oidc - # python3-saml # requests-mock # zgw-consumers requests-mock==1.9.3 @@ -746,7 +745,7 @@ xmlsec==1.3.12 # via # -c requirements/base.txt # -r requirements/base.txt - # python3-saml + # maykin-python3-saml zgw-consumers==0.18.0 # via # -c requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 24e842f7a3..fe3ce07319 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -107,8 +107,8 @@ defusedxml==0.7.1 # -c requirements/ci.txt # -r requirements/ci.txt # django-digid-eherkenning + # maykin-python3-saml # odfpy - # python3-saml diff-match-patch==20200713 # via # -c requirements/ci.txt @@ -482,7 +482,7 @@ isodate==0.6.1 # via # -c requirements/ci.txt # -r requirements/ci.txt - # python3-saml + # maykin-python3-saml isort==5.9.3 # via # -c requirements/ci.txt @@ -506,13 +506,13 @@ lazy-object-proxy==1.6.0 # -c requirements/ci.txt # -r requirements/ci.txt # astroid -lxml==4.6.5 +lxml==4.9.1 # via # -c requirements/ci.txt # -r requirements/ci.txt # django-digid-eherkenning + # maykin-python3-saml # pyquery - # python3-saml # xmlsec mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@0b4621b5c7f434586115b8e722af8940cfa70195 # via @@ -533,6 +533,10 @@ maykin-django-two-factor-auth==2.0.4 # via # -c requirements/ci.txt # -r requirements/ci.txt +maykin-python3-saml==1.14.0.post0 + # via + # -c requirements/ci.txt + # -r requirements/ci.txt mccabe==0.6.1 # via # -c requirements/ci.txt @@ -640,7 +644,7 @@ pyopenssl==21.0.0 # -c requirements/ci.txt # -r requirements/ci.txt # josepy - # python3-saml + # maykin-python3-saml # zgw-consumers pyparsing==2.4.7 # via packaging @@ -679,10 +683,6 @@ python-stdnum==1.17 # -c requirements/ci.txt # -r requirements/ci.txt # django-localflavor -python3_saml @ git+https://github.com/maykinmedia/python3-saml.git@9f1ffa86fdfe68ccbcf063613c6e6cbb5447c360 - # via - # -c requirements/ci.txt - # -r requirements/ci.txt pytz==2021.3 # via # -c requirements/ci.txt @@ -721,8 +721,8 @@ requests==2.26.0 # django-open-forms-client # django-rosetta # gemma-zds-client + # maykin-python3-saml # mozilla-django-oidc - # python3-saml # requests-mock # sphinx # zgw-consumers @@ -897,7 +897,7 @@ xmlsec==1.3.12 # via # -c requirements/ci.txt # -r requirements/ci.txt - # python3-saml + # maykin-python3-saml zgw-consumers==0.18.0 # via # -c requirements/ci.txt diff --git a/requirements/test-tools.in b/requirements/test-tools.in index 64d25a8aca..b7f7a70e11 100644 --- a/requirements/test-tools.in +++ b/requirements/test-tools.in @@ -12,5 +12,4 @@ requests-mock tblib # DigidLocal -python3-saml pyopenssl