From 4f4542174d73127b23f9a4fd9e0b53802ede33f8 Mon Sep 17 00:00:00 2001 From: Kipchirchir Sigei Date: Wed, 13 Mar 2024 11:16:47 +0300 Subject: [PATCH 1/3] Bump application dependencies Signed-off-by: Kipchirchir Sigei --- onadata/libs/test_utils/pyxform_test_case.py | 4 +- requirements/azure.in | 2 +- requirements/azure.pip | 32 +- requirements/base.pip | 224 +++++++------ requirements/dev.pip | 333 ++++++++++--------- requirements/s3.in | 2 +- requirements/s3.pip | 22 +- requirements/ses.in | 2 +- requirements/ses.pip | 22 +- setup.cfg | 4 +- 10 files changed, 346 insertions(+), 301 deletions(-) diff --git a/onadata/libs/test_utils/pyxform_test_case.py b/onadata/libs/test_utils/pyxform_test_case.py index 4d46c83bf9..c6d440cd79 100644 --- a/onadata/libs/test_utils/pyxform_test_case.py +++ b/onadata/libs/test_utils/pyxform_test_case.py @@ -45,7 +45,7 @@ class MatcherContext: debug: bool nsmap_xpath: "Dict[str, str]" - nsmap_subs: "NSMAPSubs" + nsmap_subs: "NSMAPSubs" # noqa: F821 content_str: str @@ -545,7 +545,7 @@ def reorder_attributes(root): def xpath_clean_result_strings( - nsmap_subs: "NSMAPSubs", results: "Set[_Element]" + nsmap_subs: "NSMAPSubs", results: "Set[_Element]" # noqa: F821 ) -> "Set[str]": """ Clean XPath results: stringify, remove namespace declarations, clean up whitespace. diff --git a/requirements/azure.in b/requirements/azure.in index c7b8e930ab..b8799ecf47 100644 --- a/requirements/azure.in +++ b/requirements/azure.in @@ -1,3 +1,3 @@ django-storages[azure] cryptography>=39.0.1 -django >=3.2.23,<4 +django >=3.2.25,<4 diff --git a/requirements/azure.pip b/requirements/azure.pip index 7401938f51..169326e3e8 100644 --- a/requirements/azure.pip +++ b/requirements/azure.pip @@ -1,38 +1,40 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile --output-file=requirements/azure.pip requirements/azure.in # asgiref==3.7.2 # via django -azure-core==1.29.0 - # via azure-storage-blob -azure-storage-blob==12.17.0 +azure-core==1.30.1 + # via + # azure-storage-blob + # django-storages +azure-storage-blob==12.19.1 # via django-storages -certifi==2023.7.22 +certifi==2024.2.2 # via requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests -cryptography==41.0.3 +cryptography==42.0.5 # via # -r requirements/azure.in # azure-storage-blob -django==3.2.23 +django==3.2.25 # via # -r requirements/azure.in # django-storages -django-storages[azure]==1.13.2 +django-storages[azure]==1.14.2 # via -r requirements/azure.in -idna==3.4 +idna==3.6 # via requests isodate==0.6.1 # via azure-storage-blob pycparser==2.21 # via cffi -pytz==2023.3 +pytz==2024.1 # via django requests==2.31.0 # via azure-core @@ -42,10 +44,10 @@ six==1.16.0 # isodate sqlparse==0.4.4 # via django -typing-extensions==4.7.1 +typing-extensions==4.10.0 # via # asgiref # azure-core # azure-storage-blob -urllib3==2.0.4 +urllib3==2.2.1 # via requests diff --git a/requirements/base.pip b/requirements/base.pip index 32a36f9663..8f91aca45b 100644 --- a/requirements/base.pip +++ b/requirements/base.pip @@ -10,7 +10,6 @@ # via -r requirements/base.in -e git+https://github.com/onaio/ona-oidc.git@v1.0.3#egg=ona-oidc # via -r requirements/base.in - # via -r requirements/base.in -e git+https://github.com/onaio/floip-py.git@3c980eb184069ae7c3c9136b18441978237cd41d#egg=pyfloip # via -r requirements/base.in -e git+https://github.com/onaio/python-digest.git@08267ca8afc1a52f91352ebb5385e8e6d074fc36#egg=python-digest @@ -19,59 +18,65 @@ # via -r requirements/base.in -e git+https://github.com/onaio/savreaderwriter.git@fix-pep-440-issues#egg=savreaderwriter # via -r requirements/base.in -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx -amqp==5.1.1 +amqp==5.2.0 # via kombu analytics-python==1.4.post1 # via onadata appoptics-metrics==5.1.0 # via onadata asgiref==3.7.2 - # via django -async-timeout==4.0.2 + # via + # django + # django-cors-headers +async-timeout==4.0.3 # via redis -attrs==23.1.0 +attrs==23.2.0 # via # jsonlines # jsonschema # referencing -babel==2.12.1 +babel==2.14.0 # via sphinx backoff==1.10.0 # via analytics-python -billiard==4.1.0 +billiard==4.2.0 # via celery -boto3==1.28.22 - # via tabulator -botocore==1.31.22 +boto3==1.34.61 + # via + # dataflows-tabulator + # tabulator +botocore==1.34.61 # via # boto3 # s3transfer cached-property==1.5.2 # via tableschema -cachetools==5.3.1 +cachetools==5.3.3 # via google-auth -celery==5.3.1 +celery==5.3.6 # via onadata -certifi==2023.7.22 +certifi==2024.2.2 # via # requests # sentry-sdk -cffi==1.15.1 +cffi==1.16.0 # via cryptography chardet==5.2.0 # via + # dataflows-tabulator # datapackage # tabulator -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests -click==8.1.6 +click==8.1.7 # via # celery # click-didyoumean # click-plugins # click-repl + # dataflows-tabulator # datapackage # tableschema # tabulator @@ -81,12 +86,14 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -cryptography==41.0.3 +cryptography==42.0.5 # via # jwcrypto # onadata # pyjwt -datapackage==1.15.2 +dataflows-tabulator==1.54.0 + # via datapackage +datapackage==1.15.4 # via pyfloip defusedxml==0.7.1 # via @@ -94,12 +101,10 @@ defusedxml==0.7.1 # onadata # pyxform deprecated==1.2.14 - # via - # jwcrypto - # onadata -dict2xml==1.7.3 # via onadata -django==3.2.23 +dict2xml==1.7.5 + # via onadata +django==3.2.25 # via # django-activity-stream # django-cors-headers @@ -118,15 +123,15 @@ django==3.2.23 # djangorestframework-jsonapi # ona-oidc # onadata -django-activity-stream==1.4.2 +django-activity-stream==2.0.0 # via onadata -django-cors-headers==4.2.0 +django-cors-headers==4.3.1 # via onadata -django-csp==3.7 +django-csp==3.8 # via onadata -django-debug-toolbar==4.1.0 +django-debug-toolbar==4.3.0 # via onadata -django-filter==21.1 +django-filter==23.5 # via onadata django-guardian==2.4.0 # via @@ -138,15 +143,15 @@ django-oauth-toolkit==2.3.0 # via onadata django-ordered-model==3.7.4 # via onadata -django-query-builder==3.1.0 +django-query-builder==3.2.0 # via onadata -django-redis==5.3.0 +django-redis==5.4.0 # via onadata -django-registration-redux==2.12 +django-registration-redux==2.13 # via onadata django-render-block==0.9.2 # via django-templated-email -django-reversion==5.0.4 +django-reversion==5.0.12 # via onadata django-taggit==4.0.0 # via onadata @@ -160,21 +165,21 @@ djangorestframework==3.14.0 # djangorestframework-jsonapi # ona-oidc # onadata -djangorestframework-csv==2.1.1 +djangorestframework-csv==3.0.2 # via onadata djangorestframework-gis==1.0 # via onadata djangorestframework-guardian==0.3.0 # via onadata -djangorestframework-jsonapi==6.0.0 +djangorestframework-jsonapi==6.1.0 # via onadata djangorestframework-jsonp==1.0.2 # via onadata djangorestframework-xml==2.0.0 # via onadata -dnspython==2.4.1 +dnspython==2.6.1 # via pymongo -docutils==0.19 +docutils==0.20.1 # via sphinx dpath==2.1.6 # via onadata @@ -184,59 +189,65 @@ et-xmlfile==1.1.0 # via openpyxl fleming==0.7.0 # via django-query-builder -future==0.18.3 +future==1.0.0 # via python-json2xlsclient -geojson==3.0.1 +geojson==3.1.0 # via onadata -google-auth==2.22.0 +google-auth==2.28.2 # via # google-auth-oauthlib # onadata -google-auth-oauthlib==1.0.0 +google-auth-oauthlib==1.2.0 # via onadata -greenlet==2.0.2 +greenlet==3.0.3 # via sqlalchemy httplib2==0.22.0 # via onadata -idna==3.4 +idna==3.6 # via requests ijson==3.2.3 - # via tabulator + # via + # dataflows-tabulator + # tabulator imagesize==1.4.1 # via sphinx inflection==0.5.1 # via djangorestframework-jsonapi isodate==0.6.1 # via tableschema -jinja2==3.1.2 +jinja2==3.1.3 # via sphinx jmespath==1.0.1 # via # boto3 # botocore -jsonlines==3.1.0 - # via tabulator -jsonpickle==3.0.1 +jsonlines==4.0.0 + # via + # dataflows-tabulator + # tabulator +jsonpickle==3.0.3 # via onadata jsonpointer==2.4 # via datapackage -jsonschema==4.19.0 +jsonschema==4.21.1 # via # datapackage # tableschema -jsonschema-specifications==2023.7.1 +jsonschema-specifications==2023.12.1 # via jsonschema -jwcrypto==1.5.0 +jwcrypto==1.5.6 # via django-oauth-toolkit -kombu==5.3.1 +kombu==5.3.5 # via celery linear-tsv==1.1.0 - # via tabulator -lxml==4.9.3 + # via + # dataflows-tabulator + # tabulator +lxml==5.1.0 # via onadata -markdown==3.4.4 +markdown==3.5.2 # via onadata -markupsafe==2.1.3 +markupsafe==2.1.5 # via jinja2 modilabs-python-utils==0.1.5 # via onadata @@ -244,7 +255,7 @@ monotonic==1.6 # via analytics-python nose==1.3.7 # via django-nose -numpy==1.25.2 +numpy==1.26.4 # via onadata oauthlib==3.2.2 # via @@ -252,22 +263,23 @@ oauthlib==3.2.2 # requests-oauthlib openpyxl==3.0.9 # via + # dataflows-tabulator # onadata # pyxform # tabulator -packaging==23.1 +packaging==24.0 # via sphinx -paho-mqtt==1.6.1 +paho-mqtt==2.0.0 # via onadata -pillow==10.0.1 +pillow==10.2.0 # via # elaphe3 # onadata -prompt-toolkit==3.0.39 +prompt-toolkit==3.0.43 # via click-repl -psycopg2-binary==2.9.7 +psycopg2-binary==2.9.9 # via onadata -pyasn1==0.5.0 +pyasn1==0.5.1 # via # pyasn1-modules # rsa @@ -275,7 +287,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.16.1 +pygments==2.17.2 # via sphinx pyjwt[crypto]==2.8.0 # via @@ -283,11 +295,11 @@ pyjwt[crypto]==2.8.0 # onadata pylibmc==1.6.3 # via onadata -pymongo==4.4.1 +pymongo==4.6.2 # via onadata -pyparsing==3.1.1 +pyparsing==3.1.2 # via httplib2 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # analytics-python # botocore @@ -295,30 +307,31 @@ python-dateutil==2.8.2 # fleming # onadata # tableschema -python-memcached==1.59 +python-memcached==1.62 # via onadata -pytz==2023.3 +pytz==2024.1 # via # django # django-query-builder # djangorestframework # fleming # onadata -pyxform==1.12.1 +pyxform==1.12.2 # via # onadata # pyfloip recaptcha-client==1.0.6 # via onadata -redis==4.6.0 +redis==5.0.3 # via django-redis -referencing==0.30.2 +referencing==0.33.0 # via # jsonschema # jsonschema-specifications requests==2.31.0 # via # analytics-python + # dataflows-tabulator # datapackage # django-oauth-toolkit # ona-oidc @@ -328,103 +341,96 @@ requests==2.31.0 # sphinx # tableschema # tabulator -requests-oauthlib==1.3.1 +requests-oauthlib==1.4.0 # via google-auth-oauthlib rfc3986==2.0.0 # via tableschema -rpds-py==0.9.2 +rpds-py==0.18.0 # via # jsonschema # referencing rsa==4.9 # via google-auth -s3transfer==0.6.1 +s3transfer==0.10.0 # via boto3 -sentry-sdk==1.29.2 +sentry-sdk==1.41.0 # via onadata -simplejson==3.19.1 +simplejson==3.19.2 # via onadata six==1.16.0 # via # analytics-python # appoptics-metrics + # dataflows-tabulator # datapackage - # djangorestframework-csv - # google-auth # isodate # linear-tsv # python-dateutil - # python-memcached # tableschema # tabulator snowballstemmer==2.2.0 # via sphinx -sphinx==6.2.1 - # via - # onadata - # sphinxcontrib-applehelp - # sphinxcontrib-devhelp - # sphinxcontrib-htmlhelp - # sphinxcontrib-qthelp - # sphinxcontrib-serializinghtml -sphinxcontrib-applehelp==1.0.5 +sphinx==7.2.6 + # via onadata +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.3 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.2 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.4 +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.6 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx -sqlalchemy==2.0.19 - # via tabulator +sqlalchemy==2.0.28 + # via + # dataflows-tabulator + # tabulator sqlparse==0.4.4 # via # django # django-debug-toolbar -tableschema==1.20.2 +tableschema==1.20.7 # via datapackage tabulator==1.53.5 - # via - # datapackage - # tableschema -typing-extensions==4.7.1 + # via tableschema +typing-extensions==4.10.0 # via # asgiref + # jwcrypto # sqlalchemy -tzdata==2023.3 +tzdata==2024.1 # via celery -ujson==5.8.0 +ujson==5.9.0 # via onadata unicodecsv==0.14.1 # via + # dataflows-tabulator # datapackage - # djangorestframework-csv # onadata # tableschema # tabulator -urllib3==1.26.16 +urllib3==2.0.7 # via # botocore - # google-auth # requests # sentry-sdk -uwsgi==2.0.22 +uwsgi==2.0.24 # via onadata -vine==5.0.0 +vine==5.1.0 # via # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.13 # via prompt-toolkit -wrapt==1.15.0 +wrapt==1.16.0 # via deprecated xlrd==2.0.1 # via + # dataflows-tabulator # pyxform # tabulator xlwt==1.3.0 diff --git a/requirements/dev.pip b/requirements/dev.pip index 9f3489f777..7e79ee9a7a 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile --output-file=requirements/dev.pip requirements/dev.in # @@ -18,65 +18,73 @@ # via -r requirements/base.in -e git+https://github.com/onaio/savreaderwriter.git@fix-pep-440-issues#egg=savreaderwriter # via -r requirements/base.in -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx -amqp==5.1.1 +amqp==5.2.0 # via kombu analytics-python==1.4.post1 # via onadata appoptics-metrics==5.1.0 # via onadata asgiref==3.7.2 - # via django -astroid==2.15.6 - # via pylint -asttokens==2.2.1 + # via + # django + # django-cors-headers +astroid==2.15.8 + # via + # pylint + # pylint-celery + # pylint-flask + # requirements-detector +asttokens==2.4.1 # via stack-data -async-timeout==4.0.2 +async-timeout==4.0.3 # via redis -attrs==23.1.0 +attrs==23.2.0 # via # jsonlines # jsonschema # referencing -babel==2.12.1 +babel==2.14.0 # via sphinx -backcall==0.2.0 - # via ipython backoff==1.10.0 # via analytics-python -billiard==4.1.0 +billiard==4.2.0 # via celery -boto3==1.28.22 - # via tabulator -botocore==1.31.22 +boto3==1.34.61 + # via + # dataflows-tabulator + # tabulator +botocore==1.34.61 # via # boto3 # s3transfer cached-property==1.5.2 # via tableschema -cachetools==5.3.1 +cachetools==5.3.3 # via google-auth -celery==5.3.1 +celery==5.3.6 # via onadata -certifi==2023.7.22 +certifi==2024.2.2 # via # requests # sentry-sdk -cffi==1.15.1 +cffi==1.16.0 # via cryptography chardet==5.2.0 # via + # dataflows-tabulator # datapackage # tabulator -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests -click==8.1.6 +click==8.1.7 # via # celery # click-didyoumean # click-plugins # click-repl + # dataflows-tabulator # datapackage # tableschema # tabulator @@ -86,12 +94,14 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -cryptography==41.0.3 +cryptography==42.0.5 # via # jwcrypto # onadata # pyjwt -datapackage==1.15.2 +dataflows-tabulator==1.54.0 + # via datapackage +datapackage==1.15.4 # via pyfloip decorator==5.1.1 # via @@ -103,14 +113,12 @@ defusedxml==0.7.1 # onadata # pyxform deprecated==1.2.14 - # via - # jwcrypto - # onadata -dict2xml==1.7.3 # via onadata -dill==0.3.7 +dict2xml==1.7.5 + # via onadata +dill==0.3.8 # via pylint -django==3.2.23 +django==3.2.25 # via # django-activity-stream # django-cors-headers @@ -130,17 +138,17 @@ django==3.2.23 # djangorestframework-jsonapi # ona-oidc # onadata -django-activity-stream==1.4.2 +django-activity-stream==2.0.0 # via onadata -django-cors-headers==4.2.0 +django-cors-headers==4.3.1 # via onadata -django-csp==3.7 +django-csp==3.8 # via onadata -django-debug-toolbar==4.1.0 +django-debug-toolbar==4.3.0 # via onadata django-extensions==3.2.3 # via -r requirements/dev.in -django-filter==21.1 +django-filter==23.5 # via onadata django-guardian==2.4.0 # via @@ -152,15 +160,15 @@ django-oauth-toolkit==2.3.0 # via onadata django-ordered-model==3.7.4 # via onadata -django-query-builder==3.1.0 +django-query-builder==3.2.0 # via onadata -django-redis==5.3.0 +django-redis==5.4.0 # via onadata -django-registration-redux==2.12 +django-registration-redux==2.13 # via onadata django-render-block==0.9.2 # via django-templated-email -django-reversion==5.0.4 +django-reversion==5.0.12 # via onadata django-taggit==4.0.0 # via onadata @@ -174,115 +182,128 @@ djangorestframework==3.14.0 # djangorestframework-jsonapi # ona-oidc # onadata -djangorestframework-csv==2.1.1 +djangorestframework-csv==3.0.2 # via onadata djangorestframework-gis==1.0 # via onadata djangorestframework-guardian==0.3.0 # via onadata -djangorestframework-jsonapi==6.0.0 +djangorestframework-jsonapi==6.1.0 # via onadata djangorestframework-jsonp==1.0.2 # via onadata djangorestframework-xml==2.0.0 # via onadata -dnspython==2.4.1 +dnspython==2.6.1 # via pymongo -docutils==0.19 +docutils==0.20.1 # via sphinx +dodgy==0.2.1 + # via prospector dpath==2.1.6 # via onadata elaphe3==0.2.0 # via onadata et-xmlfile==1.1.0 # via openpyxl -executing==1.2.0 +exceptiongroup==1.2.0 + # via ipython +executing==2.0.1 # via stack-data -flake8==4.0.1 +flake8==3.8.4 # via # -r requirements/dev.in # flake8-polyfill flake8-polyfill==1.0.2 # via pep8-naming -flaky==3.7.0 +flaky==3.8.1 # via -r requirements/dev.in fleming==0.7.0 # via django-query-builder -future==0.18.3 +future==1.0.0 # via python-json2xlsclient -geojson==3.0.1 +geojson==3.1.0 # via onadata -google-auth==2.22.0 +google-auth==2.28.2 # via # google-auth-oauthlib # onadata -google-auth-oauthlib==1.0.0 +google-auth-oauthlib==1.2.0 # via onadata -greenlet==2.0.2 +greenlet==3.0.3 # via sqlalchemy httmock==1.4.0 # via -r requirements/dev.in httplib2==0.22.0 # via onadata -idna==3.4 +idna==3.6 # via requests ijson==3.2.3 - # via tabulator + # via + # dataflows-tabulator + # tabulator imagesize==1.4.1 # via sphinx -importlib-metadata==6.8.0 +importlib-metadata==7.0.2 # via yapf inflection==0.5.1 # via djangorestframework-jsonapi ipdb==0.13.13 # via -r requirements/dev.in -ipython==8.14.0 +ipython==8.22.2 # via ipdb isodate==0.6.1 # via tableschema -isort==5.12.0 +isort==5.13.2 # via # -r requirements/dev.in # pylint -jedi==0.19.0 +jedi==0.19.1 # via ipython -jinja2==3.1.2 +jinja2==3.1.3 # via sphinx jmespath==1.0.1 # via # boto3 # botocore -jsonlines==3.1.0 - # via tabulator -jsonpickle==3.0.1 +jsonlines==4.0.0 + # via + # dataflows-tabulator + # tabulator +jsonpickle==3.0.3 # via onadata jsonpointer==2.4 # via datapackage -jsonschema==4.19.0 +jsonschema==4.21.1 # via # datapackage # tableschema -jsonschema-specifications==2023.7.1 +jsonschema-specifications==2023.12.1 # via jsonschema -jwcrypto==1.5.0 +jwcrypto==1.5.6 # via django-oauth-toolkit -kombu==5.3.1 +kombu==5.3.5 # via celery -lazy-object-proxy==1.9.0 +lazy-object-proxy==1.10.0 # via astroid linear-tsv==1.1.0 - # via tabulator -lxml==4.9.3 + # via + # dataflows-tabulator + # tabulator +lxml==5.1.0 # via onadata -markdown==3.4.4 +markdown==3.5.2 # via onadata -markupsafe==2.1.3 +markupsafe==2.1.5 # via jinja2 matplotlib-inline==0.1.6 # via ipython mccabe==0.6.1 - # via pylint -mock==4.0.3 + # via + # flake8 + # prospector + # pylint +mock==5.1.0 # via -r requirements/dev.in modilabs-python-utils==0.1.5 # via onadata @@ -290,7 +311,7 @@ monotonic==1.6 # via analytics-python nose==1.3.7 # via django-nose -numpy==1.25.2 +numpy==1.26.4 # via onadata oauthlib==3.2.2 # via @@ -298,52 +319,62 @@ oauthlib==3.2.2 # requests-oauthlib openpyxl==3.0.9 # via + # dataflows-tabulator # onadata # pyxform # tabulator -packaging==23.1 - # via sphinx -paho-mqtt==1.6.1 +packaging==24.0 + # via + # prospector + # requirements-detector + # sphinx +paho-mqtt==2.0.0 # via onadata parso==0.8.3 # via jedi pep8-naming==0.10.0 # via prospector -pexpect==4.8.0 +pexpect==4.9.0 # via ipython -pickleshare==0.7.5 - # via ipython -pillow==10.0.1 +pillow==10.2.0 # via # elaphe3 # onadata -platformdirs==3.10.0 +platformdirs==4.2.0 # via # pylint # yapf -prompt-toolkit==3.0.39 +prompt-toolkit==3.0.43 # via # click-repl # ipython -psycopg2-binary==2.9.7 +prospector==1.4.1.1 + # via -r requirements/dev.in +psycopg2-binary==2.9.9 # via onadata ptyprocess==0.7.0 # via pexpect pure-eval==0.2.2 # via stack-data -pyasn1==0.5.0 +pyasn1==0.5.1 # via # pyasn1-modules # rsa pyasn1-modules==0.3.0 # via google-auth -pycodestyle==2.8.0 +pycodestyle==2.6.0 # via # flake8 # prospector pycparser==2.21 # via cffi -pygments==2.16.1 +pydocstyle==6.3.0 + # via prospector +pyflakes==2.2.0 + # via + # flake8 + # prospector +pygments==2.17.2 # via # ipython # sphinx @@ -353,7 +384,7 @@ pyjwt[crypto]==2.8.0 # onadata pylibmc==1.6.3 # via onadata -pylint==2.17.5 +pylint==2.17.7 # via # -r requirements/dev.in # prospector @@ -363,15 +394,23 @@ pylint==2.17.5 # pylint-plugin-utils pylint-celery==0.3 # via prospector -pylint-django==2.5.3 - # via -r requirements/dev.in +pylint-django==2.1.0 + # via + # -r requirements/dev.in + # prospector +pylint-flask==0.6 + # via prospector pylint-plugin-utils==0.8.2 - # via pylint-django -pymongo==4.4.1 + # via + # prospector + # pylint-celery + # pylint-django + # pylint-flask +pymongo==4.6.2 # via onadata -pyparsing==3.1.1 +pyparsing==3.1.2 # via httplib2 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # analytics-python # botocore @@ -379,34 +418,33 @@ python-dateutil==2.8.2 # fleming # onadata # tableschema -python-memcached==1.59 +python-memcached==1.62 # via onadata -pytz==2023.3 +pytz==2024.1 # via - # babel - # celery # django # django-query-builder # djangorestframework # fleming # onadata -pyxform==1.12.1 +pyxform==1.12.2 # via # onadata # pyfloip -pyyaml==6.0 +pyyaml==6.0.1 # via prospector recaptcha-client==1.0.6 # via onadata -redis==4.6.0 +redis==5.0.3 # via django-redis -referencing==0.30.2 +referencing==0.33.0 # via # jsonschema # jsonschema-specifications requests==2.31.0 # via # analytics-python + # dataflows-tabulator # datapackage # django-oauth-toolkit # httmock @@ -420,134 +458,133 @@ requests==2.31.0 # tabulator requests-mock==1.11.0 # via -r requirements/dev.in -requests-oauthlib==1.3.1 +requests-oauthlib==1.4.0 # via google-auth-oauthlib -requirements-detector==0.7 +requirements-detector==1.2.2 # via prospector rfc3986==2.0.0 # via tableschema -rpds-py==0.9.2 +rpds-py==0.18.0 # via # jsonschema # referencing rsa==4.9 # via google-auth -s3transfer==0.6.1 +s3transfer==0.10.0 # via boto3 -sentry-sdk==1.29.2 +semver==3.0.2 + # via requirements-detector +sentry-sdk==1.41.0 # via onadata -simplejson==3.19.1 +setoptconf==0.3.0 + # via prospector +simplejson==3.19.2 # via onadata six==1.16.0 # via # analytics-python # appoptics-metrics # asttokens - # click-repl + # dataflows-tabulator # datapackage - # django-query-builder - # djangorestframework-csv - # google-auth # isodate # linear-tsv # python-dateutil - # python-memcached # requests-mock # tableschema # tabulator snowballstemmer==2.2.0 - # via sphinx -sphinx==6.2.1 # via - # onadata - # sphinxcontrib-applehelp - # sphinxcontrib-devhelp - # sphinxcontrib-htmlhelp - # sphinxcontrib-qthelp - # sphinxcontrib-serializinghtml -sphinxcontrib-applehelp==1.0.5 + # pydocstyle + # sphinx +sphinx==7.2.6 + # via onadata +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.3 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.2 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.4 +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.6 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx -sqlalchemy==2.0.19 - # via tabulator +sqlalchemy==2.0.28 + # via + # dataflows-tabulator + # tabulator sqlparse==0.4.4 # via # django # django-debug-toolbar -stack-data==0.6.2 +stack-data==0.6.3 # via ipython -tableschema==1.20.2 +tableschema==1.20.7 # via datapackage tabulator==1.53.5 - # via - # datapackage - # tableschema -tblib==2.0.0 + # via tableschema +tblib==3.0.0 # via -r requirements/dev.in +toml==0.10.2 + # via requirements-detector tomli==2.0.1 # via # ipdb # pylint # yapf -tomlkit==0.12.1 +tomlkit==0.12.4 # via pylint -traitlets==5.9.0 +traitlets==5.14.2 # via # ipython # matplotlib-inline -typing-extensions==4.7.1 +typing-extensions==4.10.0 # via # asgiref # astroid + # jwcrypto # sqlalchemy -tzdata==2023.3 +tzdata==2024.1 # via celery -ujson==5.8.0 +ujson==5.9.0 # via onadata unicodecsv==0.14.1 # via + # dataflows-tabulator # datapackage - # djangorestframework-csv # onadata # tableschema # tabulator -urllib3==1.26.16 +urllib3==2.0.7 # via # botocore - # google-auth # requests # sentry-sdk -uwsgi==2.0.22 +uwsgi==2.0.24 # via onadata -vine==5.0.0 +vine==5.1.0 # via # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.13 # via prompt-toolkit -wrapt==1.15.0 +wrapt==1.16.0 # via # astroid # deprecated xlrd==2.0.1 # via + # dataflows-tabulator # pyxform # tabulator xlwt==1.3.0 # via onadata xmltodict==0.13.0 # via onadata -yapf==0.40.1 +yapf==0.40.2 # via -r requirements/dev.in -zipp==3.16.2 +zipp==3.18.0 # via importlib-metadata diff --git a/requirements/s3.in b/requirements/s3.in index 84a3d03a03..108712204d 100644 --- a/requirements/s3.in +++ b/requirements/s3.in @@ -1,3 +1,3 @@ django-storages -django >=3.2.23,<4 +django >=3.2.25,<4 boto3 diff --git a/requirements/s3.pip b/requirements/s3.pip index 723bcbdf4c..d03912b6b1 100644 --- a/requirements/s3.pip +++ b/requirements/s3.pip @@ -1,38 +1,38 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile --output-file=requirements/s3.pip requirements/s3.in # asgiref==3.7.2 # via django -boto3==1.28.22 +boto3==1.34.61 # via -r requirements/s3.in -botocore==1.31.22 +botocore==1.34.61 # via # boto3 # s3transfer -django==3.2.23 +django==3.2.25 # via # -r requirements/s3.in # django-storages -django-storages==1.13.2 +django-storages==1.14.2 # via -r requirements/s3.in jmespath==1.0.1 # via # boto3 # botocore -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via botocore -pytz==2023.3 +pytz==2024.1 # via django -s3transfer==0.6.1 +s3transfer==0.10.0 # via boto3 six==1.16.0 # via python-dateutil sqlparse==0.4.4 # via django -typing-extensions==4.7.1 +typing-extensions==4.10.0 # via asgiref -urllib3==1.26.16 +urllib3==2.0.7 # via botocore diff --git a/requirements/ses.in b/requirements/ses.in index 19f15cd2c8..4825ec8368 100644 --- a/requirements/ses.in +++ b/requirements/ses.in @@ -1,3 +1,3 @@ boto -django >=3.2.23,<4 +django >=3.2.25,<4 django-ses diff --git a/requirements/ses.pip b/requirements/ses.pip index 6ef3d085f6..aee2de5254 100644 --- a/requirements/ses.pip +++ b/requirements/ses.pip @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile --output-file=requirements/ses.pip requirements/ses.in # @@ -8,35 +8,35 @@ asgiref==3.7.2 # via django boto==2.49.0 # via -r requirements/ses.in -boto3==1.28.22 +boto3==1.34.61 # via django-ses -botocore==1.31.22 +botocore==1.34.61 # via # boto3 # s3transfer -django==3.2.23 +django==3.2.25 # via # -r requirements/ses.in # django-ses -django-ses==3.5.0 +django-ses==3.5.2 # via -r requirements/ses.in jmespath==1.0.1 # via # boto3 # botocore -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via botocore -pytz==2023.3 +pytz==2024.1 # via # django # django-ses -s3transfer==0.6.1 +s3transfer==0.10.0 # via boto3 six==1.16.0 # via python-dateutil sqlparse==0.4.4 # via django -typing-extensions==4.7.1 +typing-extensions==4.10.0 # via asgiref -urllib3==1.26.16 +urllib3==2.0.7 # via botocore diff --git a/setup.cfg b/setup.cfg index 91d615cd1a..472679f037 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,12 +27,12 @@ tests_require = mock requests-mock install_requires = - Django>=3.2.23,<4 + Django>=3.2.25,<4 django-guardian django-registration-redux django-templated-email django-reversion - django-filter<22.1 + django-filter<24.2 django-nose django-ordered-model #generic relation From 330f7a8591dfffe255dd8b99918d82ab2d68dbf3 Mon Sep 17 00:00:00 2001 From: Kipchirchir Sigei Date: Wed, 13 Mar 2024 12:13:24 +0300 Subject: [PATCH 2/3] Downgrade sphinx packae Signed-off-by: Kipchirchir Sigei --- requirements/base.pip | 14 +++++++------- requirements/dev.pip | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements/base.pip b/requirements/base.pip index 8f91aca45b..a75fd021b8 100644 --- a/requirements/base.pip +++ b/requirements/base.pip @@ -179,7 +179,7 @@ djangorestframework-xml==2.0.0 # via onadata dnspython==2.6.1 # via pymongo -docutils==0.20.1 +docutils==0.19 # via sphinx dpath==2.1.6 # via onadata @@ -370,19 +370,19 @@ six==1.16.0 # tabulator snowballstemmer==2.2.0 # via sphinx -sphinx==7.2.6 +sphinx==6.2.1 # via onadata -sphinxcontrib-applehelp==1.0.8 +sphinxcontrib-applehelp==1.0.5 # via sphinx -sphinxcontrib-devhelp==1.0.6 +sphinxcontrib-devhelp==1.0.3 # via sphinx -sphinxcontrib-htmlhelp==2.0.5 +sphinxcontrib-htmlhelp==2.0.2 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.7 +sphinxcontrib-qthelp==1.0.4 # via sphinx -sphinxcontrib-serializinghtml==1.1.10 +sphinxcontrib-serializinghtml==1.1.6 # via sphinx sqlalchemy==2.0.28 # via diff --git a/requirements/dev.pip b/requirements/dev.pip index 7e79ee9a7a..d119fa4a15 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -196,7 +196,7 @@ djangorestframework-xml==2.0.0 # via onadata dnspython==2.6.1 # via pymongo -docutils==0.20.1 +docutils==0.19 # via sphinx dodgy==0.2.1 # via prospector @@ -497,19 +497,19 @@ snowballstemmer==2.2.0 # via # pydocstyle # sphinx -sphinx==7.2.6 +sphinx==6.2.1 # via onadata -sphinxcontrib-applehelp==1.0.8 +sphinxcontrib-applehelp==1.0.5 # via sphinx -sphinxcontrib-devhelp==1.0.6 +sphinxcontrib-devhelp==1.0.3 # via sphinx -sphinxcontrib-htmlhelp==2.0.5 +sphinxcontrib-htmlhelp==2.0.2 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.7 +sphinxcontrib-qthelp==1.0.4 # via sphinx -sphinxcontrib-serializinghtml==1.1.10 +sphinxcontrib-serializinghtml==1.1.6 # via sphinx sqlalchemy==2.0.28 # via From 0d730f943beffb037e602f035c1dad81550f00d3 Mon Sep 17 00:00:00 2001 From: Kipchirchir Sigei Date: Wed, 13 Mar 2024 15:00:54 +0300 Subject: [PATCH 3/3] Update deprecated django-filter classes Signed-off-by: Kipchirchir Sigei --- onadata/apps/api/viewsets/submission_review_viewset.py | 2 +- onadata/apps/api/viewsets/xform_list_viewset.py | 2 +- onadata/apps/api/viewsets/xform_viewset.py | 2 +- requirements/dev.pip | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/onadata/apps/api/viewsets/submission_review_viewset.py b/onadata/apps/api/viewsets/submission_review_viewset.py index 4318a2ab7e..3c2a21c54a 100644 --- a/onadata/apps/api/viewsets/submission_review_viewset.py +++ b/onadata/apps/api/viewsets/submission_review_viewset.py @@ -36,7 +36,7 @@ class SubmissionReviewViewSet(AuthenticateHeaderMixin, CacheControlMixin, serializer_class = SubmissionReviewSerializer permission_classes = [SubmissionReviewPermissions] filter_backends = (DjangoFilterBackend, ) - filter_fields = ('instance', 'created_by', 'status') + filterset_fields = ('instance', 'created_by', 'status') def destroy(self, request, *args, **kwargs): """ diff --git a/onadata/apps/api/viewsets/xform_list_viewset.py b/onadata/apps/api/viewsets/xform_list_viewset.py index e0be32bfe1..5144f27f5e 100644 --- a/onadata/apps/api/viewsets/xform_list_viewset.py +++ b/onadata/apps/api/viewsets/xform_list_viewset.py @@ -52,7 +52,7 @@ class XFormListViewSet(ETagsMixin, BaseViewset, viewsets.ReadOnlyModelViewSet): TokenAuthentication, ) content_negotiation_class = MediaFileContentNegotiation - filter_class = filters.FormIDFilter + filterset_class = filters.FormIDFilter filter_backends = ( filters.XFormListObjectPermissionFilter, filters.XFormListXFormPKFilter, diff --git a/onadata/apps/api/viewsets/xform_viewset.py b/onadata/apps/api/viewsets/xform_viewset.py index cfeff8c041..749b4a74d4 100644 --- a/onadata/apps/api/viewsets/xform_viewset.py +++ b/onadata/apps/api/viewsets/xform_viewset.py @@ -323,7 +323,7 @@ class XFormViewSet( filters.XFormOwnerFilter, DjangoFilterBackend, ) - filter_fields = ("instances_with_osm",) + filterset_fields = ("instances_with_osm",) public_forms_endpoint = "public" diff --git a/requirements/dev.pip b/requirements/dev.pip index d119fa4a15..cb50c8ccdb 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -303,7 +303,7 @@ mccabe==0.6.1 # flake8 # prospector # pylint -mock==5.1.0 +mock==4.0.3 # via -r requirements/dev.in modilabs-python-utils==0.1.5 # via onadata