Merge pull request #36 from hydroshare/develop

develop -> master
hydroshare · Oct 9, 2019 · d77a1e5 · d77a1e5
2 parents fc8d361 + f94d2db
commit d77a1e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -63,7 +63,7 @@ RUN ./configure --with-python --with-geos=yes \
     && sudo ldconfig
 WORKDIR /
 
-# Install iRODS v.4.2.0
+# Install iRODS v.4.2.6
 RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | sudo apt-key add - \
     && echo "deb [arch=amd64] https://packages.irods.org/apt/ trusty main" | \
     sudo tee /etc/apt/sources.list.d/renci-irods.list \

diff --git a/requirements.txt b/requirements.txt
@@ -48,6 +48,7 @@ djangorestframework==3.8.2
 docker-py==1.7.2
 dominate==2.3.1
 DoubleMetaphone==0.1
+drf-haystack==1.8.5
 drf-yasg==1.10.0
 ecdsa==0.13
 enum34==1.1.6