Skip to content

Commit

Permalink
Apply updates for May
Browse files Browse the repository at this point in the history
  • Loading branch information
ukanga committed May 27, 2024
1 parent f9502bd commit a2b890b
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 58 deletions.
4 changes: 2 additions & 2 deletions docker/onadata-uwsgi/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN mkdir -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
# hadolint ignore=DL3013
RUN --mount=type=ssh if [ -n "$optional_packages" ]; then pip install ${optional_packages} ; fi

FROM ubuntu:jammy-20240405
FROM ubuntu:jammy-20240427

ARG release_version=v3.18.2

Expand Down Expand Up @@ -94,7 +94,7 @@ RUN python3.10 -m pip install --no-cache-dir -U pip && \
python3.10 -m pip install --no-cache-dir -r requirements/s3.pip && \
python3.10 -m pip install --no-cache-dir -r requirements/ses.pip && \
python3.10 -m pip install --no-cache-dir -r requirements/azure.pip && \
python3.10 -m pip install setuptools==65.5.1 && \
python3.10 -m pip install setuptools==70.0.0 && \
python3.10 -m pip install --no-cache-dir pyyaml uwsgitop


Expand Down
12 changes: 6 additions & 6 deletions requirements/azure.pip
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --output-file=requirements/azure.pip --strip-extras requirements/azure.in
Expand All @@ -10,23 +10,23 @@ azure-core==1.30.1
# 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
# via requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.2
# via requests
cryptography==42.0.5
cryptography==42.0.7
# via
# -r requirements/azure.in
# azure-storage-blob
django==3.2.25
# via
# -r requirements/azure.in
# django-storages
django-storages==1.14.2
django-storages==1.14.3
# via -r requirements/azure.in
idna==3.7
# via requests
Expand All @@ -36,15 +36,15 @@ pycparser==2.22
# via cffi
pytz==2024.1
# via django
requests==2.31.0
requests==2.32.2
# via azure-core
six==1.16.0
# via
# azure-core
# isodate
sqlparse==0.5.0
# via django
typing-extensions==4.11.0
typing-extensions==4.12.0
# via
# azure-core
# azure-storage-blob
Expand Down
41 changes: 23 additions & 18 deletions requirements/base.pip
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --output-file=requirements/base.pip --strip-extras requirements/base.in
Expand Down Expand Up @@ -35,15 +35,15 @@ attrs==23.2.0
# jsonlines
# jsonschema
# referencing
babel==2.14.0
babel==2.15.0
# via sphinx
backoff==1.10.0
# via analytics-python
billiard==4.2.0
# via celery
boto3==1.34.89
boto3==1.34.112
# via dataflows-tabulator
botocore==1.34.89
botocore==1.34.112
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -80,7 +80,7 @@ click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
cryptography==42.0.5
cryptography==42.0.7
# via
# jwcrypto
# onadata
Expand Down Expand Up @@ -135,7 +135,7 @@ django-guardian==2.4.0
# onadata
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
Expand Down Expand Up @@ -173,6 +173,8 @@ djangorestframework-jsonp==1.0.2
# via onadata
djangorestframework-xml==2.0.0
# via onadata
dnspython==2.6.1
# via pymongo
docutils==0.19
# via sphinx
dpath==2.1.6
Expand Down Expand Up @@ -207,7 +209,7 @@ inflection==0.5.1
# via djangorestframework-jsonapi
isodate==0.6.1
# via tableschema
jinja2==3.1.3
jinja2==3.1.4
# via sphinx
jmespath==1.0.1
# via
Expand All @@ -219,7 +221,7 @@ jsonpickle==3.0.4
# via onadata
jsonpointer==2.4
# via datapackage
jsonschema==4.21.1
jsonschema==4.22.0
# via
# datapackage
# tableschema
Expand All @@ -231,7 +233,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
Expand All @@ -256,7 +258,7 @@ openpyxl==3.0.9
# pyxform
packaging==24.0
# via sphinx
paho-mqtt==2.0.0
paho-mqtt==2.1.0
# via onadata
pillow==10.3.0
# via
Expand All @@ -274,14 +276,16 @@ pyasn1-modules==0.4.0
# via google-auth
pycparser==2.22
# via cffi
pygments==2.17.2
pygments==2.18.0
# via sphinx
pyjwt==2.8.0
# via
# ona-oidc
# onadata
pylibmc==1.6.3
# via onadata
pymongo==4.7.2
# via onadata
pyparsing==3.1.2
# via httplib2
python-dateutil==2.9.0.post0
Expand All @@ -297,6 +301,7 @@ python-memcached==1.62
pytz==2024.1
# via
# django
# django-oauth-toolkit
# django-query-builder
# djangorestframework
# fleming
Expand All @@ -307,13 +312,13 @@ pyxform==1.12.2
# pyfloip
recaptcha-client==1.0.6
# via onadata
redis==5.0.3
redis==5.0.4
# via django-redis
referencing==0.34.0
referencing==0.35.1
# via
# jsonschema
# jsonschema-specifications
requests==2.31.0
requests==2.32.2
# via
# analytics-python
# dataflows-tabulator
Expand All @@ -329,7 +334,7 @@ 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
Expand Down Expand Up @@ -367,21 +372,21 @@ sphinxcontrib-qthelp==1.0.7
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
sqlalchemy==2.0.29
sqlalchemy==2.0.30
# via dataflows-tabulator
sqlparse==0.5.0
# via
# django
# django-debug-toolbar
tableschema==1.20.11
# via datapackage
typing-extensions==4.11.0
typing-extensions==4.12.0
# via
# jwcrypto
# sqlalchemy
tzdata==2024.1
# via celery
ujson==5.9.0
ujson==5.10.0
# via onadata
unicodecsv==0.14.1
# via
Expand Down
Loading

0 comments on commit a2b890b

Please sign in to comment.