Skip to content

Commit

Permalink
Merge pull request #129 from hydroshare/pin-deps
Browse files Browse the repository at this point in the history
pin dependencies
  • Loading branch information
devincowan authored Jun 24, 2024
2 parents 14ed049 + 913f320 commit cc0597a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
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
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit cc0597a

Please sign in to comment.