From 0c9ef10f05bd87506d161b5e578ba3ddcb660e1a Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Fri, 17 Sep 2021 17:28:20 +0100 Subject: [PATCH] requirements: Remove version restriction on jsonschema, and update all --- requirements.in | 3 +-- requirements.txt | 35 +++++++++++++++++----------- requirements_dev.txt | 55 ++++++++++++++++++++++++++------------------ 3 files changed, 54 insertions(+), 39 deletions(-) diff --git a/requirements.in b/requirements.in index ff490ba..a8c8afc 100644 --- a/requirements.in +++ b/requirements.in @@ -1,7 +1,6 @@ dealer sentry-sdk Django>2.2,<2.3 -# Lock this version of jsonschema, as that's what some of our libraries lock -jsonschema<2.7 +jsonschema libcovebods>=0.9.0 libcoveweb>=0.19.0 diff --git a/requirements.txt b/requirements.txt index 0200480..8f25de9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,8 @@ # # pip-compile requirements.in # +attrs==21.2.0 + # via jsonschema backports-datetime-fromisoformat==1.0.0 # via flattentool btrees==4.9.2 @@ -14,9 +16,9 @@ certifi==2021.5.30 # via # requests # sentry-sdk -cffi==1.14.5 +cffi==1.14.6 # via persistent -chardet==4.0.0 +charset-normalizer==2.0.5 # via requests contextlib2==21.6.0 # via schema @@ -32,30 +34,32 @@ django==2.2.24 # libcoveweb django-bootstrap3==15.0.0 # via libcoveweb -django-environ==0.4.5 +django-environ==0.7.0 # via libcoveweb et-xmlfile==1.1.0 # via openpyxl -flattentool==0.17.0 +flattentool==0.17.1 # via # libcove # libcovebods # libcoveweb -idna==2.10 +idna==3.2 # via requests ijson==3.1.4 # via flattentool importlib-metadata==2.1.1 - # via django-bootstrap3 + # via + # django-bootstrap3 + # jsonschema jsonref==0.2 # via # flattentool # libcove -jsonschema==2.6.0 +jsonschema==3.2.0 # via # -r requirements.in # libcove -libcove==0.24.0 +libcove==0.26.0 # via # libcovebods # libcoveweb @@ -69,7 +73,7 @@ lxml==4.6.3 # via flattentool odfpy==1.4.1 # via flattentool -openpyxl==3.0.7 +openpyxl==3.0.8 # via flattentool persistent==4.7.0 # via @@ -77,13 +81,15 @@ persistent==4.7.0 # zodb pycparser==2.20 # via cffi -python-dateutil==2.8.1 +pyrsistent==0.18.0 + # via jsonschema +python-dateutil==2.8.2 # via libcovebods pytz==2021.1 # via # django # flattentool -requests==2.25.1 +requests==2.26.0 # via # libcove # libcoveweb @@ -91,13 +97,14 @@ rfc3987==1.3.8 # via libcove schema==0.7.4 # via flattentool -sentry-sdk==1.1.0 +sentry-sdk==1.3.1 # via -r requirements.in six==1.16.0 # via + # jsonschema # python-dateutil # zodb -sqlparse==0.4.1 +sqlparse==0.4.2 # via django strict-rfc3339==0.7 # via libcove @@ -119,7 +126,7 @@ zc.zlibstorage==1.2.0 # via flattentool zconfig==3.6.0 # via zodb -zipp==3.4.1 +zipp==3.5.0 # via importlib-metadata zodb==5.6.0 # via diff --git a/requirements_dev.txt b/requirements_dev.txt index 9716eb4..1413b36 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -5,7 +5,10 @@ # pip-compile requirements_dev.in # attrs==21.2.0 - # via pytest + # via + # -r requirements.txt + # jsonschema + # pytest backports-datetime-fromisoformat==1.0.0 # via # -r requirements.txt @@ -23,11 +26,11 @@ certifi==2021.5.30 # -r requirements.txt # requests # sentry-sdk -cffi==1.14.5 +cffi==1.14.6 # via # -r requirements.txt # persistent -chardet==4.0.0 +charset-normalizer==2.0.5 # via # -r requirements.txt # requests @@ -53,7 +56,7 @@ django-bootstrap3==15.0.0 # via # -r requirements.txt # libcoveweb -django-environ==0.4.5 +django-environ==0.7.0 # via # -r requirements.txt # libcoveweb @@ -63,7 +66,7 @@ et-xmlfile==1.1.0 # openpyxl flake8==3.9.2 # via -r requirements_dev.in -flattentool==0.17.0 +flattentool==0.17.1 # via # -r requirements.txt # libcove @@ -73,7 +76,7 @@ gitdb==4.0.7 # via gitpython gitpython==3.1.18 # via transifex-client -idna==2.10 +idna==3.2 # via # -r requirements.txt # requests @@ -87,6 +90,7 @@ importlib-metadata==2.1.1 # click # django-bootstrap3 # flake8 + # jsonschema # pep517 # pluggy # pytest @@ -97,11 +101,11 @@ jsonref==0.2 # -r requirements.txt # flattentool # libcove -jsonschema==2.6.0 +jsonschema==3.2.0 # via # -r requirements.txt # libcove -libcove==0.24.0 +libcove==0.26.0 # via # -r requirements.txt # libcovebods @@ -122,13 +126,13 @@ odfpy==1.4.1 # via # -r requirements.txt # flattentool -openpyxl==3.0.7 +openpyxl==3.0.8 # via # -r requirements.txt # flattentool -packaging==20.9 +packaging==21.0 # via pytest -pep517==0.10.0 +pep517==0.11.0 # via pip-tools persistent==4.7.0 # via @@ -137,7 +141,7 @@ persistent==4.7.0 # zodb pip-tools==6.2.0 # via -r requirements_dev.in -pluggy==0.13.1 +pluggy==1.0.0 # via pytest py==1.10.0 # via pytest @@ -151,7 +155,11 @@ pyflakes==2.3.1 # via flake8 pyparsing==2.4.7 # via packaging -pytest==6.2.4 +pyrsistent==0.18.0 + # via + # -r requirements.txt + # jsonschema +pytest==6.2.5 # via # -r requirements_dev.in # pytest-django @@ -159,7 +167,7 @@ pytest-django==4.4.0 # via -r requirements_dev.in pytest-localserver==0.5.0 # via -r requirements_dev.in -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # -r requirements.txt # libcovebods @@ -170,7 +178,7 @@ pytz==2021.1 # -r requirements.txt # django # flattentool -requests==2.25.1 +requests==2.26.0 # via # -r requirements.txt # libcove @@ -186,17 +194,18 @@ schema==0.7.4 # flattentool selenium==3.141.0 # via -r requirements_dev.in -sentry-sdk==1.1.0 +sentry-sdk==1.3.1 # via -r requirements.txt six==1.16.0 # via # -r requirements.txt + # jsonschema # python-dateutil # transifex-client # zodb smmap==4.0.0 # via gitdb -sqlparse==0.4.1 +sqlparse==0.4.2 # via # -r requirements.txt # django @@ -207,16 +216,16 @@ strict-rfc3339==0.7 text-unidecode==1.3 # via python-slugify toml==0.10.2 - # via - # pep517 - # pytest + # via pytest +tomli==1.2.1 + # via pep517 transaction==3.0.1 # via # -r requirements.txt # zodb transifex-client==0.14.3 # via -r requirements_dev.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via gitpython uc-rfc6266-parser==0.1.0 # via @@ -234,7 +243,7 @@ werkzeug==1.0.1 # -r requirements.txt # pytest-localserver # uc-rfc6266-parser -wheel==0.36.2 +wheel==0.37.0 # via pip-tools xmltodict==0.12.0 # via @@ -252,7 +261,7 @@ zconfig==3.6.0 # via # -r requirements.txt # zodb -zipp==3.4.1 +zipp==3.5.0 # via # -r requirements.txt # importlib-metadata