Skip to content

Commit

Permalink
install pandas after other deps
Browse files Browse the repository at this point in the history
  • Loading branch information
devincowan committed Jun 24, 2024
1 parent 305f2fa commit 913f320
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 913f320

Please sign in to comment.