From a646226bd2dc4e29ffe853f83d91300dd89e0eac Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Mon, 14 Aug 2023 10:22:35 +0100 Subject: [PATCH 1/4] bump certifi --- requirements.in | 2 +- requirements.txt | 24 ++++++++++++------------ requirements_test.txt | 36 ++++++++++++++++++------------------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/requirements.in b/requirements.in index 96dd9d20..7a635c86 100644 --- a/requirements.in +++ b/requirements.in @@ -34,7 +34,7 @@ w3lib==1.22 notifications-python-client==6.3.* num2words==0.5.10 pycountry==19.8.18 -elastic-apm>6.0 +elastic-apm==6.18.* gevent==22.10.* psycogreen==1.0.2 wagtailmedia==0.14.* diff --git a/requirements.txt b/requirements.txt index a47d69d5..6007a359 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ anyascii==0.3.2 # via wagtail asgiref==3.7.2 # via django -async-timeout==4.0.2 +async-timeout==4.0.3 # via redis attrs==23.1.0 # via jsonschema @@ -38,7 +38,7 @@ celery[redis]==5.3.1 # via # -r requirements.in # django-celery-beat -certifi==2023.5.7 +certifi==2023.7.22 # via # elastic-apm # requests @@ -61,9 +61,9 @@ click-repl==0.3.0 # via celery cron-descriptor==1.4.0 # via django-celery-beat -cryptography==41.0.2 +cryptography==41.0.3 # via -r requirements.in -directory-components==39.1.2 +directory-components==39.1.3 # via -r requirements.in directory-constants==23.1.1 # via @@ -142,11 +142,11 @@ docopt==0.6.2 # num2words draftjs-exporter==2.1.7 # via wagtail -drf-spectacular==0.26.3 +drf-spectacular==0.26.4 # via -r requirements.in ecs-logging==2.0.2 # via elastic-apm -elastic-apm==6.17.0 +elastic-apm==6.18.0 # via -r requirements.in et-xmlfile==1.1.0 # via openpyxl @@ -180,7 +180,7 @@ kombu==5.3.1 # celery l18n==2021.3 # via wagtail -markdown==3.4.3 +markdown==3.4.4 # via # -r requirements.in # wagtail-markdown @@ -204,7 +204,7 @@ prompt-toolkit==3.0.39 # via click-repl psycogreen==1.0.2 # via -r requirements.in -psycopg2==2.9.6 +psycopg2==2.9.7 # via -r requirements.in pycountry==19.8.18 # via -r requirements.in @@ -245,7 +245,7 @@ requests-oauthlib==1.3.1 # via django-staff-sso-client s3transfer==0.6.1 # via boto3 -sentry-sdk==1.28.1 +sentry-sdk==1.29.2 # via -r requirements.in sigauth==5.2.0 # via -r requirements.in @@ -289,7 +289,7 @@ vine==5.0.0 # amqp # celery # kombu -w3lib==1.22 +w3lib==1.22.0 # via -r requirements.in wagtail==4.1.5 # via @@ -297,11 +297,11 @@ wagtail==4.1.5 # wagtail-markdown # wagtail-modeltranslation # wagtailmedia -wagtail-markdown==0.11 +wagtail-markdown==0.11.0 # via -r requirements.in wagtail-modeltranslation==0.13.0 # via -r requirements.in -wagtailmedia==0.14.3 +wagtailmedia==0.14.4 # via -r requirements.in wcwidth==0.2.6 # via prompt-toolkit diff --git a/requirements_test.txt b/requirements_test.txt index 003f79ea..66041eca 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -12,7 +12,7 @@ anyascii==0.3.2 # via wagtail asgiref==3.7.2 # via django -async-timeout==4.0.2 +async-timeout==4.0.3 # via redis attrs==23.1.0 # via jsonschema @@ -40,7 +40,7 @@ celery[redis]==5.3.1 # via # -r requirements.in # django-celery-beat -certifi==2023.5.7 +certifi==2023.7.22 # via # elastic-apm # requests @@ -71,9 +71,9 @@ coveralls==3.3.1 # via -r requirements_test.in cron-descriptor==1.4.0 # via django-celery-beat -cryptography==41.0.2 +cryptography==41.0.3 # via -r requirements.in -directory-components==39.1.2 +directory-components==39.1.3 # via -r requirements.in directory-constants==23.1.1 # via @@ -156,11 +156,11 @@ docopt==0.6.2 # num2words draftjs-exporter==2.1.7 # via wagtail -drf-spectacular==0.26.3 +drf-spectacular==0.26.4 # via -r requirements.in ecs-logging==2.0.2 # via elastic-apm -elastic-apm==6.17.0 +elastic-apm==6.18.0 # via -r requirements.in et-xmlfile==1.1.0 # via openpyxl @@ -170,9 +170,9 @@ factory-boy==2.12.0 # via # -r requirements_test.in # wagtail-factories -faker==19.2.0 +faker==19.3.0 # via factory-boy -flake8==6.0.0 +flake8==6.1.0 # via -r requirements_test.in freezegun==0.3.14 # via -r requirements_test.in @@ -212,7 +212,7 @@ kombu==5.3.1 # celery l18n==2021.3 # via wagtail -markdown==3.4.3 +markdown==3.4.4 # via # -r requirements.in # wagtail-markdown @@ -238,7 +238,7 @@ packaging==23.1 # pytest-sugar pillow==9.5.0 # via wagtail -pip-tools==7.1.0 +pip-tools==7.3.0 # via -r requirements_test.in pluggy==1.2.0 # via pytest @@ -246,15 +246,15 @@ prompt-toolkit==3.0.39 # via click-repl psycogreen==1.0.2 # via -r requirements.in -psycopg2==2.9.6 +psycopg2==2.9.7 # via -r requirements.in -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via flake8 pycountry==19.8.18 # via -r requirements.in pycparser==2.21 # via cffi -pyflakes==3.0.1 +pyflakes==3.1.0 # via flake8 pyjwt==2.8.0 # via notifications-python-client @@ -317,7 +317,7 @@ requests-oauthlib==1.3.1 # via django-staff-sso-client s3transfer==0.6.1 # via boto3 -sentry-sdk==1.28.1 +sentry-sdk==1.29.2 # via -r requirements.in sigauth==5.2.0 # via -r requirements.in @@ -376,7 +376,7 @@ vine==5.0.0 # amqp # celery # kombu -w3lib==1.22 +w3lib==1.22.0 # via -r requirements.in wagtail==4.1.5 # via @@ -387,11 +387,11 @@ wagtail==4.1.5 # wagtailmedia wagtail-factories==2.0.1 # via -r requirements_test.in -wagtail-markdown==0.11 +wagtail-markdown==0.11.0 # via -r requirements.in wagtail-modeltranslation==0.13.0 # via -r requirements.in -wagtailmedia==0.14.3 +wagtailmedia==0.14.4 # via -r requirements.in wcwidth==0.2.6 # via prompt-toolkit @@ -399,7 +399,7 @@ webencodings==0.5.1 # via # bleach # html5lib -wheel==0.40.0 +wheel==0.41.1 # via pip-tools whitenoise==6.4.0 # via -r requirements.in From 9aaeae6e197e1b1d9c06a877322cab6155724f19 Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Mon, 14 Aug 2023 10:28:52 +0100 Subject: [PATCH 2/4] bump sigauth --- requirements.in | 2 +- requirements.txt | 2 +- requirements_test.txt | 2 +- test-reports/junit.xml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 test-reports/junit.xml diff --git a/requirements.in b/requirements.in index 7a635c86..5bfd85fb 100644 --- a/requirements.in +++ b/requirements.in @@ -9,7 +9,7 @@ dj-database-url==2.* psycopg2==2.9.* --no-binary psycopg2 django-pglocks==1.0.* boto3==1.24.* -sigauth==5.2.0 +sigauth==5.2.2 directory-healthcheck==3.* directory-components==39.* directory-constants==23.* diff --git a/requirements.txt b/requirements.txt index 6007a359..438a4894 100644 --- a/requirements.txt +++ b/requirements.txt @@ -247,7 +247,7 @@ s3transfer==0.6.1 # via boto3 sentry-sdk==1.29.2 # via -r requirements.in -sigauth==5.2.0 +sigauth==5.2.2 # via -r requirements.in six==1.16.0 # via diff --git a/requirements_test.txt b/requirements_test.txt index 66041eca..305d6355 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -319,7 +319,7 @@ s3transfer==0.6.1 # via boto3 sentry-sdk==1.29.2 # via -r requirements.in -sigauth==5.2.0 +sigauth==5.2.2 # via -r requirements.in six==1.16.0 # via diff --git a/test-reports/junit.xml b/test-reports/junit.xml new file mode 100644 index 00000000..1de9a912 --- /dev/null +++ b/test-reports/junit.xml @@ -0,0 +1 @@ + \ No newline at end of file From 1f9338e7864cb60540e7417da61088bf370908a8 Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Mon, 14 Aug 2023 11:00:43 +0100 Subject: [PATCH 3/4] removed test-reports dir --- test-reports/junit.xml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test-reports/junit.xml diff --git a/test-reports/junit.xml b/test-reports/junit.xml deleted file mode 100644 index 1de9a912..00000000 --- a/test-reports/junit.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 4dd67e5a8826a50df65b962465a277ab5bc1502d Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Mon, 14 Aug 2023 14:11:00 +0100 Subject: [PATCH 4/4] added certifi as main requirement --- requirements.in | 3 ++- requirements.txt | 5 +++-- requirements_test.txt | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/requirements.in b/requirements.in index 5bfd85fb..322059da 100644 --- a/requirements.in +++ b/requirements.in @@ -34,10 +34,11 @@ w3lib==1.22 notifications-python-client==6.3.* num2words==0.5.10 pycountry==19.8.18 -elastic-apm==6.18.* +elastic-apm>6.0 gevent==22.10.* psycogreen==1.0.2 wagtailmedia==0.14.* cryptography==41.* oauthlib==3.2.* drf-spectacular +certifi==2023.7.22 diff --git a/requirements.txt b/requirements.txt index 438a4894..d1f7cf4e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,6 +40,7 @@ celery[redis]==5.3.1 # django-celery-beat certifi==2023.7.22 # via + # -r requirements.in # elastic-apm # requests # sentry-sdk @@ -289,7 +290,7 @@ vine==5.0.0 # amqp # celery # kombu -w3lib==1.22.0 +w3lib==1.22 # via -r requirements.in wagtail==4.1.5 # via @@ -297,7 +298,7 @@ wagtail==4.1.5 # wagtail-markdown # wagtail-modeltranslation # wagtailmedia -wagtail-markdown==0.11.0 +wagtail-markdown==0.11 # via -r requirements.in wagtail-modeltranslation==0.13.0 # via -r requirements.in diff --git a/requirements_test.txt b/requirements_test.txt index 305d6355..a9ddf8b3 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -42,6 +42,7 @@ celery[redis]==5.3.1 # django-celery-beat certifi==2023.7.22 # via + # -r requirements.in # elastic-apm # requests # sentry-sdk @@ -164,7 +165,7 @@ elastic-apm==6.18.0 # via -r requirements.in et-xmlfile==1.1.0 # via openpyxl -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via pytest factory-boy==2.12.0 # via @@ -376,7 +377,7 @@ vine==5.0.0 # amqp # celery # kombu -w3lib==1.22.0 +w3lib==1.22 # via -r requirements.in wagtail==4.1.5 # via @@ -387,7 +388,7 @@ wagtail==4.1.5 # wagtailmedia wagtail-factories==2.0.1 # via -r requirements_test.in -wagtail-markdown==0.11.0 +wagtail-markdown==0.11 # via -r requirements.in wagtail-modeltranslation==0.13.0 # via -r requirements.in