Merge tag '1.15.1' into develop

1.15.1 release

.gitignore

@@ -2,6 +2,7 @@
 .idea
 *.class
 *.swp
+.DS_Store
 
 # Contains SQL statements to initialize testing DB with a confidential user and tokens
 # Contains SQL statements to initialize testing DB with a confidential user, assuming they followed the dockstore setup tutorial

README.md

@@ -45,7 +45,7 @@ server-url = https://www.dockstore.org/api
 
 By default, cwltool reads input files from the local filesystem. Dockstore also adds support for additional file systems
 such as http, https, and ftp. Through a plug-in system, Dockstore also supports 
-the Amazon S3 and [Synapse](https://help.synapse.org/docs/Downloading-Data-Programmatically.2003796248.html), and via [plugins](https://github.com/dockstore).
+Amazon S3 and [Synapse](https://help.synapse.org/docs/Downloading-Data-Programmatically.2003796248.html) via [plugins](https://github.com/dockstore).
 
 Download the above set of default plugins via: 
 ```

scripts/install-tests.sh

@@ -14,7 +14,7 @@ fi
 if [ "${TESTING_PROFILE}" = "toil-integration-tests" ]; then
     pip3 install --user toil[cwl]==3.15.0
 else
-    pip3 install --user -r https://raw.githubusercontent.com/dockstore/dockstore/develop/dockstore-webservice/src/main/resources/requirements/1.14.0/requirements3.txt
+    pip3 install --user -r https://raw.githubusercontent.com/dockstore/dockstore/hotfix/1.15.4/dockstore-webservice/src/main/resources/requirements/1.15.0/requirements3.txt
 fi
 
 if [ "${TESTING_PROFILE}" = "singularity-tests" ]; then