Merge pull request #304 from caktus/CU-86890uc9q-fix-build

Fix Build post K8s/Python Upgrade
caktus · Jul 16, 2024 · 6699867 · 6699867
2 parents a637ce2 + 0626f7f
commit 6699867
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 32 deletions.
diff --git a/requirements/base/base.in b/requirements/base/base.in
@@ -1,6 +1,6 @@
 # base requirements.in
 django==3.2.25
-celery
+celery==5.4.0
 census==0.8.22
 us
 dealer
@@ -27,4 +27,5 @@ requests==2.32.3
 urllib3==2.2.1
 six
 whitenoise
-pandas<1.5
+pandas==2.2.2
+vine==5.1.0
diff --git a/requirements/base/base.txt b/requirements/base/base.txt
@@ -4,11 +4,11 @@
 #
 #    pip-compile --output-file=requirements/base/base.txt requirements/base/base.in
 #
-amqp==2.6.0
+amqp==5.2.0
     # via kombu
 asgiref==3.5.2
     # via django
-billiard==3.6.3.0
+billiard==4.2.0
     # via celery
 boto==2.49.0
     # via -r requirements/base/base.in
@@ -19,7 +19,7 @@ botocore==1.34.100
     #   -r requirements/base/base.in
     #   boto3
     #   s3transfer
-celery==4.4.6
+celery==5.4.0
     # via -r requirements/base/base.in
 census==0.8.22
     # via -r requirements/base/base.in
@@ -30,7 +30,17 @@ charset-normalizer==3.0.1
 click==8.1.7
     # via
     #   -r requirements/base/base.in
+    #   celery
+    #   click-didyoumean
+    #   click-plugins
+    #   click-repl
     #   django-click
+click-didyoumean==0.3.1
+    # via celery
+click-plugins==1.1.1
+    # via celery
+click-repl==0.3.0
+    # via celery
 dealer==2.1.0
     # via -r requirements/base/base.in
 dj-database-url==0.5.0
@@ -75,8 +85,6 @@ djangorestframework==3.12.4
     #   drf-extensions
 drf-extensions==0.7.1
     # via -r requirements/base/base.in
-future==0.18.2
-    # via celery
 idna==2.10
     # via requests
 jellyfish==0.6.1
@@ -85,21 +93,23 @@ jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-kombu==4.6.11
+kombu==5.3.7
     # via celery
-numpy==1.22.3
+numpy==2.0.0
     # via pandas
-pandas==1.4.1
+pandas==2.2.2
     # via -r requirements/base/base.in
+prompt-toolkit==3.0.47
+    # via click-repl
 psycopg2==2.8.6
     # via -r requirements/base/base.in
-python-dateutil==2.8.1
+python-dateutil==2.9.0.post0
     # via
     #   botocore
+    #   celery
     #   pandas
 pytz==2022.1
     # via
-    #   celery
     #   django
     #   pandas
 redis==3.5.3
@@ -117,16 +127,24 @@ six==1.15.0
     #   python-dateutil
 sqlparse==0.3.1
     # via django
+tzdata==2024.1
+    # via
+    #   celery
+    #   pandas
 urllib3==2.2.1
     # via
     #   -r requirements/base/base.in
     #   botocore
     #   requests
 us==2.0.2
     # via -r requirements/base/base.in
-vine==1.3.0
+vine==5.1.0
     # via
+    #   -r requirements/base/base.in
     #   amqp
     #   celery
+    #   kombu
+wcwidth==0.2.13
+    # via prompt-toolkit
 whitenoise==5.1.0
     # via -r requirements/base/base.in
diff --git a/requirements/dev/dev.in b/requirements/dev/dev.in
@@ -13,6 +13,8 @@ Jinja2==3.1.4
 openshift==0.13.2
 kubernetes==12.0.0
 kubernetes-validate~=1.29.1
+referencing==0.35.1
+jsonschema==4.22
 
 troposphere
 

diff --git a/requirements/dev/dev.txt b/requirements/dev/dev.txt
@@ -91,7 +91,6 @@ idna==2.10
     # via
     #   -c requirements/dev/../base/base.txt
     #   requests
-    #   yarl
 imagesize==1.2.0
     # via sphinx
 importlib-resources==6.4.0
@@ -132,8 +131,6 @@ livereload==2.6.2
     # via sphinx-autobuild
 markupsafe==2.1.1
     # via jinja2
-multidict==6.0.5
-    # via yarl
 oauthlib==3.1.0
     # via requests-oauthlib
 openshift==0.13.2
@@ -158,8 +155,10 @@ pkgutil-resolve-name==1.3.10
     # via jsonschema
 port-for==0.3.1
     # via sphinx-autobuild
-prompt-toolkit==3.0.5
-    # via ipython
+prompt-toolkit==3.0.47
+    # via
+    #   -c requirements/dev/../base/base.txt
+    #   ipython
 ptyprocess==0.6.0
     # via pexpect
 pudb==2019.2
@@ -177,11 +176,7 @@ pygments==2.6.1
     #   ipython
     #   pudb
     #   sphinx
-pyrsistent==0.16.0
-    # via
-    #   jsonschema
-    #   referencing
-python-dateutil==2.8.1
+python-dateutil==2.9.0.post0
     # via
     #   -c requirements/dev/../base/base.txt
     #   -c requirements/dev/../test/test.txt
@@ -203,8 +198,12 @@ pyyaml==5.3.1
     #   kubernetes
     #   kubernetes-validate
     #   sphinx-autobuild
-referencing==0.8.11
-    # via kubernetes-validate
+referencing==0.35.1
+    # via
+    #   -r requirements/dev/dev.in
+    #   jsonschema
+    #   jsonschema-specifications
+    #   kubernetes-validate
 requests==2.32.3
     # via
     #   -c requirements/dev/../base/base.txt
@@ -215,7 +214,7 @@ requests-oauthlib==1.3.0
     # via kubernetes
 resolvelib==0.5.4
     # via ansible-core
-rpds-py==0.18.1
+rpds-py==0.19.0
     # via
     #   jsonschema
     #   referencing
@@ -239,7 +238,6 @@ six==1.15.0
     #   kubernetes
     #   livereload
     #   openshift
-    #   pyrsistent
     #   python-dateutil
     #   traitlets
     #   websocket-client
@@ -288,14 +286,14 @@ urwid==2.1.0
     # via pudb
 watchdog==0.10.3
     # via sphinx-autobuild
-wcwidth==0.1.9
-    # via prompt-toolkit
+wcwidth==0.2.13
+    # via
+    #   -c requirements/dev/../base/base.txt
+    #   prompt-toolkit
 websocket-client==0.57.0
     # via kubernetes
 wheel==0.37.1
     # via -r requirements/dev/dev.in
-yarl==1.9.4
-    # via referencing
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/test/test.txt b/requirements/test/test.txt
@@ -69,7 +69,7 @@ pytest-cov==5.0.0
     # via -r requirements/test/test.in
 pytest-django==4.8.0
     # via -r requirements/test/test.in
-python-dateutil==2.8.1
+python-dateutil==2.9.0.post0
     # via
     #   -c requirements/test/../base/base.txt
     #   faker