Merge pull request #92 from hydroshare/5793-download-tests

[#5793] fix download tests

Author: devincowan

.github/workflows/test-on-demand.yml

@@ -1,9 +1,6 @@
 name: Test on demand
 
 on:  
-  pull_request:
-    branches: 
-      - '**'
   workflow_dispatch:
     inputs:
       target:

.github/workflows/python-package.yml .github/workflows/test-on-pr.yml.github/workflows/python-package.yml renamed to .github/workflows/test-on-pr.yml

@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Python package
+name: Run tests and lint
 
 on:
   push:
@@ -21,6 +21,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.head_ref }}
+        fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
       with:

hsclient/hydroshare.py

@@ -1417,6 +1417,9 @@ def retrieve_zip(self, path, save_path="", params=None):
                 "Failed GET {}, status_code {}, message {}".format(url, response.status_code, response.content)
             )
         filename = path.split("/")[-1]
+        # append .zip to the filename if it doesn't end with .zip
+        if not filename.endswith(".zip"):
+            filename += ".zip"
         downloaded_file = os.path.join(save_path, filename)
         with open(downloaded_file, 'wb') as f:
             f.write(response.content)