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 c768c77..7119c5a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -78,6 +78,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==22.0.0 @@ -144,7 +145,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