From 913f320a1b58c3a6553dcfe3dbdb5fbfb8425702 Mon Sep 17 00:00:00 2001
From: Devin Cowan <dcowan@cuahsi.org>
Date: Mon, 24 Jun 2024 16:48:21 -0400
Subject: [PATCH] install pandas after other deps

---
 Dockerfile       | 4 ++++
 requirements.txt | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 68edfe9..bac10b9 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -93,6 +93,10 @@ RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | sudo apt-key a
 COPY ./requirements.txt /requirements.txt
 RUN pip install -r requirements.txt
 
+# Install pandas after other requirements
+# This is because of incompatibility between pandas and python-dateutil versions
+RUN pip install pandas==2.2.2
+
 # Install SSH for remote PyCharm debugging
 RUN mkdir /var/run/sshd
 RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
diff --git a/requirements.txt b/requirements.txt
index 13e9e2b..4eb9b93 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -52,6 +52,7 @@ django-oauth-toolkit==2.1.0
 djangorestframework==3.12.4
 django-robots==4.0
 django-security==0.12.0
+django-storages[google]==1.14.3
 django-test-without-migrations==0.6
 django-timedeltafield==0.7.10
 django-widget-tweaks==1.4.1
@@ -76,6 +77,7 @@ geographiclib==1.52
 geojson==1.3.2
 geopy==1.16.0
 gevent==23.9.1
+google-cloud-pubsub==2.21.2
 grappelli-safe==1.1.1
 greenlet==2.0.1
 gunicorn==20.1.0
@@ -107,7 +109,7 @@ nameparser==0.5.7
 netCDF4==1.6.3
 nose==1.3.7
 nose-timer==0.7.6
-numpy==1.22
+numpy==1.26.4
 oauthlib==3.1.0
 OWSLib==0.28.1
 packaging==21.3
@@ -141,7 +143,8 @@ pytest==7.2.0
 pytest-cov==4.0.0
 pytest-django==4.5.2
 python-crfsuite==0.9.8
-python-dateutil==2.8.0
+# python-dateutil removed due to version mismatch between
+# django-security and pandas
 python-irodsclient==0.8.1
 python-keycloak==3.9.1
 pytz==2022.6