diff --git a/docker/onadata-uwsgi/Dockerfile.ubuntu b/docker/onadata-uwsgi/Dockerfile.ubuntu index 18823135ca..50233f47a7 100644 --- a/docker/onadata-uwsgi/Dockerfile.ubuntu +++ b/docker/onadata-uwsgi/Dockerfile.ubuntu @@ -53,7 +53,7 @@ RUN python -m pip install --no-cache-dir -r requirements/docs.pip && \ make -C docs html -FROM ubuntu:jammy-20240405 AS runtime +FROM ubuntu:jammy-20240530 as runtime ENV DEBIAN_FRONTEND=noninteractive diff --git a/requirements/azure.pip b/requirements/azure.pip index 0b78e9199a..3129b2fe2b 100644 --- a/requirements/azure.pip +++ b/requirements/azure.pip @@ -6,23 +6,23 @@ # asgiref==3.8.1 # via django -azure-core==1.30.1 +azure-core==1.30.2 # via # azure-storage-blob # django-storages -azure-storage-blob==12.19.1 +azure-storage-blob==12.20.0 # via django-storages -certifi==2024.2.2 +certifi==2024.6.2 # via requests cffi==1.16.0 # via cryptography charset-normalizer==3.3.2 # via requests -cryptography==42.0.6 +cryptography==42.0.8 # via # -r requirements/azure.in # azure-storage-blob -django==4.2.11 +django==4.2.13 # via # -r requirements/azure.in # django-storages @@ -34,7 +34,7 @@ isodate==0.6.1 # via azure-storage-blob pycparser==2.22 # via cffi -requests==2.31.0 +requests==2.32.3 # via azure-core six==1.16.0 # via @@ -42,9 +42,10 @@ six==1.16.0 # isodate sqlparse==0.5.0 # via django -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via + # asgiref # azure-core # azure-storage-blob -urllib3==2.2.1 +urllib3==2.2.2 # via requests diff --git a/requirements/base.pip b/requirements/base.pip index 669f6c64e1..4f4ffd52d8 100644 --- a/requirements/base.pip +++ b/requirements/base.pip @@ -16,6 +16,8 @@ asgiref==3.8.1 # via # django # django-cors-headers +async-timeout==4.0.3 + # via redis attrs==23.2.0 # via # jsonlines @@ -25,9 +27,9 @@ backoff==1.10.0 # via analytics-python billiard==4.2.0 # via celery -boto3==1.34.98 +boto3==1.34.134 # via dataflows-tabulator -botocore==1.34.98 +botocore==1.34.134 # via # boto3 # s3transfer @@ -37,7 +39,7 @@ cachetools==5.3.3 # via google-auth celery==5.4.0 # via onadata -certifi==2024.2.2 +certifi==2024.6.2 # via # requests # sentry-sdk @@ -64,7 +66,7 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -cryptography==42.0.6 +cryptography==42.0.8 # via # jwcrypto # onadata @@ -84,7 +86,7 @@ deprecated==1.2.14 # via onadata dict2xml==1.7.5 # via onadata -django==4.2.11 +django==4.2.13 # via # django-activity-stream # django-cors-headers @@ -105,11 +107,11 @@ django==4.2.11 # onadata django-activity-stream==2.0.0 # via onadata -django-cors-headers==4.3.1 +django-cors-headers==4.4.0 # via onadata django-csp==3.8 # via onadata -django-debug-toolbar==4.3.0 +django-debug-toolbar==4.4.2 # via onadata django-digest @ git+https://github.com/onaio/django-digest.git@6bf61ec08502fd3545d4f2c0838b6cb15e7ffa92 # via -r requirements/base.in @@ -123,7 +125,7 @@ django-multidb-router @ git+https://github.com/onaio/django-multidb-router.git@f # via -r requirements/base.in django-nose==1.4.7 # via onadata -django-oauth-toolkit==2.3.0 +django-oauth-toolkit==2.4.0 # via onadata django-ordered-model==3.7.4 # via onadata @@ -141,7 +143,7 @@ django-taggit==5.0.1 # via onadata django-templated-email==3.0.1 # via onadata -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via # djangorestframework-csv # djangorestframework-gis @@ -155,7 +157,7 @@ djangorestframework-gis==1.0 # via onadata djangorestframework-guardian==0.3.0 # via onadata -djangorestframework-jsonapi==7.0.0 +djangorestframework-jsonapi==7.0.1 # via onadata djangorestframework-jsonp==1.0.2 # via onadata @@ -163,7 +165,7 @@ djangorestframework-xml==2.0.0 # via onadata dnspython==2.6.1 # via pymongo -dpath==2.1.6 +dpath==2.2.0 # via onadata elaphe3==0.2.0 # via onadata @@ -175,7 +177,7 @@ future==1.0.0 # via python-json2xlsclient geojson==3.1.0 # via onadata -google-auth==2.29.0 +google-auth==2.30.0 # via # google-auth-oauthlib # onadata @@ -189,7 +191,7 @@ httplib2==0.22.0 # via onadata idna==3.7 # via requests -ijson==3.2.3 +ijson==3.3.0 # via dataflows-tabulator inflection==0.5.1 # via djangorestframework-jsonapi @@ -201,9 +203,9 @@ jmespath==1.0.1 # botocore jsonlines==4.0.0 # via dataflows-tabulator -jsonpickle==3.0.4 +jsonpickle==3.2.2 # via onadata -jsonpointer==2.4 +jsonpointer==3.0.0 # via datapackage jsonschema==4.22.0 # via @@ -217,7 +219,7 @@ kombu==5.3.7 # via celery linear-tsv==1.1.0 # via dataflows-tabulator -lxml==5.2.1 +lxml==5.2.2 # via onadata markdown==3.6 # via onadata @@ -227,7 +229,7 @@ monotonic==1.6 # via analytics-python nose==1.3.7 # via django-nose -numpy==1.26.4 +numpy==2.0.0 # via onadata oauthlib==3.2.2 # via @@ -246,7 +248,7 @@ pillow==10.3.0 # via # elaphe3 # onadata -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.47 # via click-repl psycopg2-binary==2.9.9 # via onadata @@ -266,7 +268,7 @@ pyjwt==2.8.0 # onadata pylibmc==1.6.3 # via onadata -pymongo==4.7.1 +pymongo==4.8.0 # via onadata pyparsing==3.1.2 # via httplib2 @@ -286,6 +288,7 @@ python-memcached==1.62 # via onadata pytz==2024.1 # via + # django-oauth-toolkit # django-query-builder # fleming pyxform==2.0.3 @@ -294,7 +297,7 @@ pyxform==2.0.3 # pyfloip recaptcha-client==1.0.6 # via onadata -redis==5.0.4 +redis==5.0.7 # via # django-redis # onadata @@ -302,7 +305,7 @@ referencing==0.35.1 # via # jsonschema # jsonschema-specifications -requests==2.31.0 +requests==2.32.3 # via # analytics-python # dataflows-tabulator @@ -317,13 +320,13 @@ requests-oauthlib==2.0.0 # via google-auth-oauthlib rfc3986==2.0.0 # via tableschema -rpds-py==0.18.0 +rpds-py==0.18.1 # via # jsonschema # referencing rsa==4.9 # via google-auth -s3transfer==0.10.1 +s3transfer==0.10.2 # via boto3 sentry-sdk==1.45.0 # via onadata @@ -339,7 +342,7 @@ six==1.16.0 # linear-tsv # python-dateutil # tableschema -sqlalchemy==2.0.30 +sqlalchemy==2.0.31 # via dataflows-tabulator sqlparse==0.5.0 # via @@ -347,13 +350,14 @@ sqlparse==0.5.0 # django-debug-toolbar tableschema==1.20.11 # via datapackage -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via + # asgiref # jwcrypto # sqlalchemy tzdata==2024.1 # via celery -ujson==5.9.0 +ujson==5.10.0 # via onadata unicodecsv==0.14.1 # via @@ -361,12 +365,12 @@ unicodecsv==0.14.1 # datapackage # onadata # tableschema -urllib3==2.2.1 +urllib3==2.2.2 # via # botocore # requests # sentry-sdk -uwsgi==2.0.25.1 +uwsgi==2.0.26 # via onadata vine==5.1.0 # via diff --git a/requirements/dev.pip b/requirements/dev.pip index 69d5643e7a..3818661b3f 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -24,6 +24,8 @@ astroid==2.15.8 # requirements-detector asttokens==2.4.1 # via stack-data +async-timeout==4.0.3 + # via redis attrs==23.2.0 # via # jsonlines @@ -33,9 +35,9 @@ backoff==1.10.0 # via analytics-python billiard==4.2.0 # via celery -boto3==1.34.98 +boto3==1.34.134 # via dataflows-tabulator -botocore==1.34.98 +botocore==1.34.134 # via # boto3 # s3transfer @@ -45,7 +47,7 @@ cachetools==5.3.3 # via google-auth celery==5.4.0 # via onadata -certifi==2024.2.2 +certifi==2024.6.2 # via # requests # sentry-sdk @@ -74,7 +76,7 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -cryptography==42.0.6 +cryptography==42.0.8 # via # jwcrypto # onadata @@ -102,7 +104,7 @@ dill==0.3.8 # via pylint distlib==0.3.8 # via virtualenv -django==4.2.11 +django==4.2.13 # via # django-activity-stream # django-cors-headers @@ -124,11 +126,11 @@ django==4.2.11 # onadata django-activity-stream==2.0.0 # via onadata -django-cors-headers==4.3.1 +django-cors-headers==4.4.0 # via onadata django-csp==3.8 # via onadata -django-debug-toolbar==4.3.0 +django-debug-toolbar==4.4.2 # via onadata django-digest @ git+https://github.com/onaio/django-digest.git@6bf61ec08502fd3545d4f2c0838b6cb15e7ffa92 # via -r requirements/base.in @@ -144,7 +146,7 @@ django-multidb-router @ git+https://github.com/onaio/django-multidb-router.git@f # via -r requirements/base.in django-nose==1.4.7 # via onadata -django-oauth-toolkit==2.3.0 +django-oauth-toolkit==2.4.0 # via onadata django-ordered-model==3.7.4 # via onadata @@ -162,7 +164,7 @@ django-taggit==5.0.1 # via onadata django-templated-email==3.0.1 # via onadata -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via # djangorestframework-csv # djangorestframework-gis @@ -176,7 +178,7 @@ djangorestframework-gis==1.0 # via onadata djangorestframework-guardian==0.3.0 # via onadata -djangorestframework-jsonapi==7.0.0 +djangorestframework-jsonapi==7.0.1 # via onadata djangorestframework-jsonp==1.0.2 # via onadata @@ -186,15 +188,17 @@ dnspython==2.6.1 # via pymongo dodgy==0.2.1 # via prospector -dpath==2.1.6 +dpath==2.2.0 # via onadata elaphe3==0.2.0 # via onadata et-xmlfile==1.1.0 # via openpyxl +exceptiongroup==1.2.1 + # via ipython executing==2.0.1 # via stack-data -filelock==3.14.0 +filelock==3.15.4 # via virtualenv flake8==5.0.4 # via @@ -214,7 +218,7 @@ gitdb==4.0.11 # via gitpython gitpython==3.1.43 # via prospector -google-auth==2.29.0 +google-auth==2.30.0 # via # google-auth-oauthlib # onadata @@ -232,15 +236,15 @@ identify==2.5.36 # via pre-commit idna==3.7 # via requests -ijson==3.2.3 +ijson==3.3.0 # via dataflows-tabulator -importlib-metadata==7.1.0 +importlib-metadata==8.0.0 # via yapf inflection==0.5.1 # via djangorestframework-jsonapi ipdb==0.13.13 # via -r requirements/dev.in -ipython==8.24.0 +ipython==8.25.0 # via ipdb isodate==0.6.1 # via tableschema @@ -256,9 +260,9 @@ jmespath==1.0.1 # botocore jsonlines==4.0.0 # via dataflows-tabulator -jsonpickle==3.0.4 +jsonpickle==3.2.2 # via onadata -jsonpointer==2.4 +jsonpointer==3.0.0 # via datapackage jsonschema==4.22.0 # via @@ -274,7 +278,7 @@ lazy-object-proxy==1.10.0 # via astroid linear-tsv==1.1.0 # via dataflows-tabulator -lxml==5.2.1 +lxml==5.2.2 # via onadata markdown==3.6 # via onadata @@ -289,11 +293,11 @@ modilabs-python-utils==0.1.5 # via onadata monotonic==1.6 # via analytics-python -nodeenv==1.8.0 +nodeenv==1.9.1 # via pre-commit nose==1.3.7 # via django-nose -numpy==1.26.4 +numpy==2.0.0 # via onadata oauthlib==3.2.2 # via @@ -306,7 +310,7 @@ openpyxl==3.1.2 # dataflows-tabulator # onadata # pyxform -packaging==24.0 +packaging==24.1 # via # prospector # requirements-detector @@ -322,14 +326,14 @@ pillow==10.3.0 # via # elaphe3 # onadata -platformdirs==4.2.1 +platformdirs==4.2.2 # via # pylint # virtualenv # yapf -pre-commit==3.7.0 +pre-commit==3.7.1 # via -r requirements/dev.in -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.47 # via # click-repl # ipython @@ -391,7 +395,7 @@ pylint-plugin-utils==0.7 # pylint-celery # pylint-django # pylint-flask -pymongo==4.7.1 +pymongo==4.8.0 # via onadata pyparsing==3.1.2 # via httplib2 @@ -411,6 +415,7 @@ python-memcached==1.62 # via onadata pytz==2024.1 # via + # django-oauth-toolkit # django-query-builder # fleming pyxform==2.0.3 @@ -423,7 +428,7 @@ pyyaml==6.0.1 # prospector recaptcha-client==1.0.6 # via onadata -redis==5.0.4 +redis==5.0.7 # via # django-redis # onadata @@ -431,7 +436,7 @@ referencing==0.35.1 # via # jsonschema # jsonschema-specifications -requests==2.31.0 +requests==2.32.3 # via # analytics-python # dataflows-tabulator @@ -452,13 +457,13 @@ requirements-detector==1.2.2 # via prospector rfc3986==2.0.0 # via tableschema -rpds-py==0.18.0 +rpds-py==0.18.1 # via # jsonschema # referencing rsa==4.9 # via google-auth -s3transfer==0.10.1 +s3transfer==0.10.2 # via boto3 semver==3.0.2 # via requirements-detector @@ -483,7 +488,7 @@ smmap==5.0.1 # via gitdb snowballstemmer==2.2.0 # via pydocstyle -sqlalchemy==2.0.30 +sqlalchemy==2.0.31 # via dataflows-tabulator sqlparse==0.5.0 # via @@ -500,21 +505,26 @@ toml==0.10.2 # prospector # requirements-detector tomli==2.0.1 - # via yapf -tomlkit==0.12.4 + # via + # ipdb + # pylint + # yapf +tomlkit==0.12.5 # via pylint traitlets==5.14.3 # via # ipython # matplotlib-inline -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via + # asgiref + # astroid # ipython # jwcrypto # sqlalchemy tzdata==2024.1 # via celery -ujson==5.9.0 +ujson==5.10.0 # via onadata unicodecsv==0.14.1 # via @@ -522,19 +532,19 @@ unicodecsv==0.14.1 # datapackage # onadata # tableschema -urllib3==2.2.1 +urllib3==2.2.2 # via # botocore # requests # sentry-sdk -uwsgi==2.0.25.1 +uwsgi==2.0.26 # via onadata vine==5.1.0 # via # amqp # celery # kombu -virtualenv==20.26.1 +virtualenv==20.26.3 # via pre-commit wcwidth==0.2.13 # via prompt-toolkit @@ -552,8 +562,5 @@ xmltodict==0.13.0 # via onadata yapf==0.40.2 # via -r requirements/dev.in -zipp==3.18.1 +zipp==3.19.2 # via importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/docs.pip b/requirements/docs.pip index 981a9f8d7c..6d4beda516 100644 --- a/requirements/docs.pip +++ b/requirements/docs.pip @@ -8,7 +8,7 @@ alabaster==0.7.16 # via sphinx babel==2.15.0 # via sphinx -certifi==2024.2.2 +certifi==2024.6.2 # via requests charset-normalizer==3.3.2 # via requests @@ -22,11 +22,11 @@ jinja2==3.1.4 # via sphinx markupsafe==2.1.5 # via jinja2 -packaging==24.0 +packaging==24.1 # via sphinx pygments==2.18.0 # via sphinx -requests==2.31.0 +requests==2.32.3 # via sphinx snowballstemmer==2.2.0 # via sphinx @@ -44,5 +44,5 @@ sphinxcontrib-qthelp==1.0.7 # via sphinx sphinxcontrib-serializinghtml==1.1.10 # via sphinx -urllib3==2.2.1 +urllib3==2.2.2 # via requests diff --git a/requirements/s3.pip b/requirements/s3.pip index 60197bf2f6..58b0e45d25 100644 --- a/requirements/s3.pip +++ b/requirements/s3.pip @@ -6,13 +6,13 @@ # asgiref==3.8.1 # via django -boto3==1.34.98 +boto3==1.34.134 # via -r requirements/s3.in -botocore==1.34.98 +botocore==1.34.134 # via # boto3 # s3transfer -django==4.2.11 +django==4.2.13 # via # -r requirements/s3.in # django-storages @@ -24,11 +24,13 @@ jmespath==1.0.1 # botocore python-dateutil==2.9.0.post0 # via botocore -s3transfer==0.10.1 +s3transfer==0.10.2 # via boto3 six==1.16.0 # via python-dateutil sqlparse==0.5.0 # via django -urllib3==2.2.1 +typing-extensions==4.12.2 + # via asgiref +urllib3==2.2.2 # via botocore diff --git a/requirements/ses.pip b/requirements/ses.pip index d3f3d8f86a..3e3736fb76 100644 --- a/requirements/ses.pip +++ b/requirements/ses.pip @@ -8,17 +8,17 @@ asgiref==3.8.1 # via django boto==2.49.0 # via -r requirements/ses.in -boto3==1.34.98 +boto3==1.34.134 # via django-ses -botocore==1.34.98 +botocore==1.34.134 # via # boto3 # s3transfer -django==4.2.11 +django==4.2.13 # via # -r requirements/ses.in # django-ses -django-ses==4.0.0 +django-ses==4.1.0 # via -r requirements/ses.in jmespath==1.0.1 # via @@ -28,11 +28,13 @@ python-dateutil==2.9.0.post0 # via botocore pytz==2024.1 # via django-ses -s3transfer==0.10.1 +s3transfer==0.10.2 # via boto3 six==1.16.0 # via python-dateutil sqlparse==0.5.0 # via django -urllib3==2.2.1 +typing-extensions==4.12.2 + # via asgiref +urllib3==2.2.2 # via botocore