Django 4.2: update dependecies

onaio · Apr 3, 2024 · 56c99b9 · 56c99b9
1 parent 3a56520
commit 56c99b9
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 51 deletions.
diff --git a/requirements/azure.in b/requirements/azure.in
@@ -1,3 +1,3 @@
 cryptography>=39.0.1
-django ==4.1.13
+django>=4.2.11,<5
 django-storages[azure]
diff --git a/requirements/azure.pip b/requirements/azure.pip
@@ -22,7 +22,7 @@ cryptography==42.0.5
     # via
     #   -r requirements/azure.in
     #   azure-storage-blob
-django==4.1.13
+django==4.2.11
     # via
     #   -r requirements/azure.in
     #   django-storages

diff --git a/requirements/base.in b/requirements/base.in
@@ -2,10 +2,10 @@
 -e .
 
 # installed from Git
--e git+https://github.com/onaio/python-digest.git@08267ca8afc1a52f91352ebb5385e8e6d074fc36#egg=python-digest
--e git+https://github.com/onaio/django-digest.git@6bf61ec08502fd3545d4f2c0838b6cb15e7ffa92#egg=django-digest
--e git+https://github.com/onaio/django-multidb-router.git@f711368180d58eef87eda54fadfd5f8355623d52#egg=django-multidb-router
--e git+https://github.com/onaio/floip-py.git@3c980eb184069ae7c3c9136b18441978237cd41d#egg=pyfloip
--e git+https://github.com/onaio/python-json2xlsclient.git@62b4645f7b4f2684421a13ce98da0331a9dd66a0#egg=python-json2xlsclient
--e git+https://github.com/onaio/ona-oidc.git@pytz-deprecated#egg=ona-oidc
+git+https://github.com/onaio/python-digest.git@08267ca8afc1a52f91352ebb5385e8e6d074fc36#egg=python-digest
+git+https://github.com/onaio/django-digest.git@6bf61ec08502fd3545d4f2c0838b6cb15e7ffa92#egg=django-digest
+git+https://github.com/onaio/django-multidb-router.git@f711368180d58eef87eda54fadfd5f8355623d52#egg=django-multidb-router
+git+https://github.com/onaio/floip-py.git@3c980eb184069ae7c3c9136b18441978237cd41d#egg=pyfloip
+git+https://github.com/onaio/python-json2xlsclient.git@62b4645f7b4f2684421a13ce98da0331a9dd66a0#egg=python-json2xlsclient
+git+https://github.com/onaio/ona-oidc.git@pytz-deprecated#egg=ona-oidc
 -e git+https://github.com/onaio/savreaderwriter.git@fix-pep-440-issues#egg=savreaderwriter
diff --git a/requirements/base.pip b/requirements/base.pip
@@ -4,18 +4,6 @@
 #
 #    pip-compile --output-file=requirements/base.pip --strip-extras requirements/base.in
 #
--e git+https://github.com/onaio/django-digest.git@6bf61ec08502fd3545d4f2c0838b6cb15e7ffa92#egg=django-digest
-    # via -r requirements/base.in
--e git+https://github.com/onaio/django-multidb-router.git@f711368180d58eef87eda54fadfd5f8355623d52#egg=django-multidb-router
-    # via -r requirements/base.in
--e git+https://github.com/onaio/ona-oidc.git@pytz-deprecated#egg=ona-oidc
-    # 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
-    # via -r requirements/base.in
--e git+https://github.com/onaio/python-json2xlsclient.git@62b4645f7b4f2684421a13ce98da0331a9dd66a0#egg=python-json2xlsclient
-    # 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.16
@@ -41,9 +29,9 @@ backoff==1.10.0
     # via analytics-python
 billiard==4.2.0
     # via celery
-boto3==1.34.70
+boto3==1.34.71
     # via dataflows-tabulator
-botocore==1.34.70
+botocore==1.34.71
     # via
     #   boto3
     #   s3transfer
@@ -100,7 +88,7 @@ deprecated==1.2.14
     # via onadata
 dict2xml==1.7.5
     # via onadata
-django==4.1.13
+django==4.2.11
     # via
     #   django-activity-stream
     #   django-cors-headers
@@ -127,12 +115,16 @@ django-csp==3.8
     # via onadata
 django-debug-toolbar==4.3.0
     # via onadata
-django-filter==23.5
+django-digest @ git+https://github.com/onaio/django-digest.git@6bf61ec08502fd3545d4f2c0838b6cb15e7ffa92
+    # via -r requirements/base.in
+django-filter==24.1
     # via onadata
 django-guardian==2.4.0
     # via
     #   djangorestframework-guardian
     #   onadata
+django-multidb-router @ git+https://github.com/onaio/django-multidb-router.git@f711368180d58eef87eda54fadfd5f8355623d52
+    # via -r requirements/base.in
 django-nose==1.4.7
     # via onadata
 django-oauth-toolkit==2.3.0
@@ -253,6 +245,8 @@ oauthlib==3.2.2
     # via
     #   django-oauth-toolkit
     #   requests-oauthlib
+ona-oidc @ git+https://github.com/onaio/ona-oidc.git@pytz-deprecated
+    # via -r requirements/base.in
 openpyxl==3.0.9
     # via
     #   dataflows-tabulator
@@ -270,14 +264,16 @@ prompt-toolkit==3.0.43
     # via click-repl
 psycopg2-binary==2.9.9
     # via onadata
-pyasn1==0.5.1
+pyasn1==0.6.0
     # via
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.3.0
+pyasn1-modules==0.4.0
     # via google-auth
 pycparser==2.21
     # via cffi
+pyfloip @ git+https://github.com/onaio/floip-py.git@3c980eb184069ae7c3c9136b18441978237cd41d
+    # via -r requirements/base.in
 pygments==2.17.2
     # via sphinx
 pyjwt==2.8.0
@@ -298,6 +294,10 @@ python-dateutil==2.9.0.post0
     #   fleming
     #   onadata
     #   tableschema
+python-digest @ git+https://github.com/onaio/python-digest.git@08267ca8afc1a52f91352ebb5385e8e6d074fc36
+    # via -r requirements/base.in
+python-json2xlsclient @ git+https://github.com/onaio/python-json2xlsclient.git@62b4645f7b4f2684421a13ce98da0331a9dd66a0
+    # via -r requirements/base.in
 python-memcached==1.62
     # via onadata
 pytz==2024.1

diff --git a/requirements/dev.pip b/requirements/dev.pip
@@ -4,18 +4,6 @@
 #
 #    pip-compile --output-file=requirements/dev.pip --strip-extras requirements/dev.in
 #
--e git+https://github.com/onaio/django-digest.git@6bf61ec08502fd3545d4f2c0838b6cb15e7ffa92#egg=django-digest
-    # via -r requirements/base.in
--e git+https://github.com/onaio/django-multidb-router.git@f711368180d58eef87eda54fadfd5f8355623d52#egg=django-multidb-router
-    # via -r requirements/base.in
--e git+https://github.com/onaio/ona-oidc.git@pytz-deprecated#egg=ona-oidc
-    # 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
-    # via -r requirements/base.in
--e git+https://github.com/onaio/python-json2xlsclient.git@62b4645f7b4f2684421a13ce98da0331a9dd66a0#egg=python-json2xlsclient
-    # 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.16
@@ -49,9 +37,9 @@ backoff==1.10.0
     # via analytics-python
 billiard==4.2.0
     # via celery
-boto3==1.34.70
+boto3==1.34.71
     # via dataflows-tabulator
-botocore==1.34.70
+botocore==1.34.71
     # via
     #   boto3
     #   s3transfer
@@ -118,7 +106,7 @@ dill==0.3.8
     # via pylint
 distlib==0.3.8
     # via virtualenv
-django==4.1.13
+django==4.2.11
     # via
     #   django-activity-stream
     #   django-cors-headers
@@ -146,14 +134,18 @@ django-csp==3.8
     # via onadata
 django-debug-toolbar==4.3.0
     # via onadata
+django-digest @ git+https://github.com/onaio/django-digest.git@6bf61ec08502fd3545d4f2c0838b6cb15e7ffa92
+    # via -r requirements/base.in
 django-extensions==3.2.3
     # via -r requirements/dev.in
-django-filter==23.5
+django-filter==24.1
     # via onadata
 django-guardian==2.4.0
     # via
     #   djangorestframework-guardian
     #   onadata
+django-multidb-router @ git+https://github.com/onaio/django-multidb-router.git@f711368180d58eef87eda54fadfd5f8355623d52
+    # via -r requirements/base.in
 django-nose==1.4.7
     # via onadata
 django-oauth-toolkit==2.3.0
@@ -319,6 +311,8 @@ oauthlib==3.2.2
     # via
     #   django-oauth-toolkit
     #   requests-oauthlib
+ona-oidc @ git+https://github.com/onaio/ona-oidc.git@pytz-deprecated
+    # via -r requirements/base.in
 openpyxl==3.0.9
     # via
     #   dataflows-tabulator
@@ -360,11 +354,11 @@ ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.2
     # via stack-data
-pyasn1==0.5.1
+pyasn1==0.6.0
     # via
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.3.0
+pyasn1-modules==0.4.0
     # via google-auth
 pycodestyle==2.9.1
     # via
@@ -378,6 +372,8 @@ pyflakes==2.5.0
     # via
     #   flake8
     #   prospector
+pyfloip @ git+https://github.com/onaio/floip-py.git@3c980eb184069ae7c3c9136b18441978237cd41d
+    # via -r requirements/base.in
 pygments==2.17.2
     # via
     #   ipython
@@ -422,6 +418,10 @@ python-dateutil==2.9.0.post0
     #   fleming
     #   onadata
     #   tableschema
+python-digest @ git+https://github.com/onaio/python-digest.git@08267ca8afc1a52f91352ebb5385e8e6d074fc36
+    # via -r requirements/base.in
+python-json2xlsclient @ git+https://github.com/onaio/python-json2xlsclient.git@62b4645f7b4f2684421a13ce98da0331a9dd66a0
+    # via -r requirements/base.in
 python-memcached==1.62
     # via onadata
 pytz==2024.1

diff --git a/requirements/s3.in b/requirements/s3.in
@@ -1,3 +1,3 @@
 boto3
-django ==4.1.13
+django>=4.2.11,<5
 django-storages
diff --git a/requirements/s3.pip b/requirements/s3.pip
@@ -12,7 +12,7 @@ botocore==1.34.71
     # via
     #   boto3
     #   s3transfer
-django==4.1.13
+django==4.2.11
     # via
     #   -r requirements/s3.in
     #   django-storages

diff --git a/requirements/ses.in b/requirements/ses.in
@@ -1,3 +1,3 @@
 boto
-django ==4.1.13
+django>=4.2.11,<5
 django-ses
diff --git a/requirements/ses.pip b/requirements/ses.pip
@@ -14,7 +14,7 @@ botocore==1.34.71
     # via
     #   boto3
     #   s3transfer
-django==4.1.13
+django==4.2.11
     # via
     #   -r requirements/ses.in
     #   django-ses

diff --git a/setup.cfg b/setup.cfg
@@ -1,17 +1,18 @@
 [metadata]
 name = onadata
-version = 3.19.0
+version = 4.0.0
 description = Collect Analyze and Share Data
 long_description = file: README.rst
 long_description_content_type = text/x-rst
 url = https://github.com/onaio/onadata
 author = Ona Systems Inc
 author_email = [email protected]
-license = Copyright (c) 2022 Ona Systems Inc All rights reserved
+license = Copyright (c) 2024 Ona Systems Inc All rights reserved
 license_file = LICENSE
 classifiers =
     Development Status :: 5 - Production/Stable
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 project_urls =
     Documentation = https://api.ona.io/api
     Source = https://github.com/onaio/onadata
@@ -26,7 +27,7 @@ tests_require =
     httmock
     requests-mock
 install_requires =
-    Django==4.1.13
+    Django>=4.2.11,<5
     django-guardian
     django-registration-redux
     django-templated-email