From 2a1c0f42fa6270cdaacacebad811a0fcc664fe44 Mon Sep 17 00:00:00 2001 From: stitch1 Date: Wed, 19 Jun 2024 10:23:37 +0200 Subject: [PATCH 1/2] Updated requirements. --- requirements-deploy.in | 2 +- requirements.in | 2 +- requirements.txt | 30 +++++++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/requirements-deploy.in b/requirements-deploy.in index 0853af19..f68fd886 100644 --- a/requirements-deploy.in +++ b/requirements-deploy.in @@ -3,7 +3,7 @@ # make sure there are no version conflicts with requirements.txt -c requirements.txt -websecmap[deploy] @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@d622c22a9f180a1501c1d68e63c16863ad4a0369 +websecmap[deploy] @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@5a97fb289d0e86b444d98cf6d30fbef3b964120b # include (security) version constraints for non primary dependencies -c security-constraints.in diff --git a/requirements.in b/requirements.in index e91d939b..394497c2 100644 --- a/requirements.in +++ b/requirements.in @@ -9,7 +9,7 @@ # - no version pinning, unless it is required and explained # to update websecmap, update the SHA hash and run: make update_requirement_websecmap -websecmap @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@d622c22a9f180a1501c1d68e63c16863ad4a0369 +websecmap @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@5a97fb289d0e86b444d98cf6d30fbef3b964120b django-otp django-two-factor-auth>1.15 diff --git a/requirements.txt b/requirements.txt index 3ad983ce..bf6bb14d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -68,6 +68,7 @@ chardet==5.1.0 # websecmap charset-normalizer==3.1.0 # via + # niquests # requests # websecmap click==8.1.7 @@ -232,22 +233,35 @@ greenlet==3.0.3 # via # gevent # websecmap +h11==0.14.0 + # via + # urllib3-future + # websecmap humanize==4.9.0 # via # flower # websecmap idna==3.4 # via + # niquests # requests # tldextract # websecmap # yarl iso3166==2.1.1 # via websecmap +jh2==5.0.3 + # via + # urllib3-future + # websecmap jsonfield==3.1.0 # via # django-mail-admin # websecmap +kiss-headers==2.4.3 + # via + # niquests + # websecmap kombu==5.3.7 # via # celery @@ -283,6 +297,8 @@ netaddr==0.8.0 # via # dnsrecon # websecmap +niquests==3.6.6 + # via websecmap numpy==1.25.0 # via # -r requirements.in @@ -397,6 +413,10 @@ pyyaml==6.0 # via # tablib # websecmap +qh3==1.0.7 + # via + # urllib3-future + # websecmap qrcode==7.4.2 # via django-two-factor-auth rdp==0.8 @@ -491,6 +511,10 @@ urllib3==1.26.18 # requests # sentry-sdk # websecmap +urllib3-future==2.7.912 + # via + # niquests + # websecmap validators==0.20.0 # via # -r requirements.in @@ -501,11 +525,15 @@ vine==5.1.0 # celery # kombu # websecmap +wassima==1.1.1 + # via + # niquests + # websecmap wcwidth==0.2.13 # via # prompt-toolkit # websecmap -websecmap @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@d622c22a9f180a1501c1d68e63c16863ad4a0369 +websecmap @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@5a97fb289d0e86b444d98cf6d30fbef3b964120b # via -r requirements.in wikidata==0.7.0 # via websecmap From 552cf0ff1e123afedf90dbee76a49a355980fe6a Mon Sep 17 00:00:00 2001 From: stitch1 Date: Wed, 19 Jun 2024 10:29:06 +0200 Subject: [PATCH 2/2] incorporate dns servfail fix --- requirements-deploy.txt | 2 +- requirements-dev.in | 2 +- requirements-dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-deploy.txt b/requirements-deploy.txt index 82d57d7b..69d7171b 100644 --- a/requirements-deploy.txt +++ b/requirements-deploy.txt @@ -641,7 +641,7 @@ wcwidth==0.2.13 # -c requirements.txt # prompt-toolkit # websecmap -websecmap[deploy] @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@d622c22a9f180a1501c1d68e63c16863ad4a0369 +websecmap[deploy] @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@5a97fb289d0e86b444d98cf6d30fbef3b964120b # via # -c requirements.txt # -r requirements-deploy.in diff --git a/requirements-dev.in b/requirements-dev.in index 5daca6a6..040adc6b 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -18,7 +18,7 @@ django-extensions django-debug-toolbar django-debug-toolbar-request-history pytest-mock -websecmap @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@d622c22a9f180a1501c1d68e63c16863ad4a0369 +websecmap @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@5a97fb289d0e86b444d98cf6d30fbef3b964120b # use the version with relaxed attr requirements pytest-docker @ git+https://github.com/avast/pytest-docker@519b155009b6f3570c01f1f56e7c4e6ce3c5c760 diff --git a/requirements-dev.txt b/requirements-dev.txt index b417be07..81b31dd9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -898,7 +898,7 @@ wcwidth==0.2.13 # -c requirements.txt # prompt-toolkit # websecmap -websecmap @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@d622c22a9f180a1501c1d68e63c16863ad4a0369 +websecmap @ git+https://gitlab.com/internet-cleanup-foundation/web-security-map@5a97fb289d0e86b444d98cf6d30fbef3b964120b # via # -c requirements.txt # -r requirements-dev.in