Merge branch 'develop' into feature/b-and-i-24-14

* Resolve outstanding conflicts and prior bad merges.
CenterForOpenScience · Aug 16, 2024 · c468eaa · c468eaa
2 parents 9d02957 + 3920a29
commit c468eaa
Show file tree

Hide file tree

Showing 23 changed files with 8 additions and 184 deletions.
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -21,7 +21,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/.cache
-        key: reqs_${{ hashFiles('**/requirements.txt') }}
+        key: reqs_${{ hashFiles('**/pyproject.toml') }}
         restore-keys: reqs
     - run: |
         mkdir -p ~/.cache/downloads

diff --git a/addons/bitbucket/requirements.txt b/addons/bitbucket/requirements.txt
diff --git a/addons/boa/requirements.txt b/addons/boa/requirements.txt
diff --git a/addons/box/requirements.txt b/addons/box/requirements.txt
diff --git a/addons/dataverse/requirements.txt b/addons/dataverse/requirements.txt
diff --git a/addons/dropbox/requirements.txt b/addons/dropbox/requirements.txt
diff --git a/addons/figshare/requirements.txt b/addons/figshare/requirements.txt
diff --git a/addons/github/requirements.txt b/addons/github/requirements.txt
diff --git a/addons/gitlab/requirements.txt b/addons/gitlab/requirements.txt
diff --git a/addons/mendeley/requirements.txt b/addons/mendeley/requirements.txt
diff --git a/addons/onedrive/requirements.txt b/addons/onedrive/requirements.txt
diff --git a/addons/owncloud/requirements.txt b/addons/owncloud/requirements.txt
diff --git a/addons/s3/requirements.txt b/addons/s3/requirements.txt
diff --git a/addons/twofactor/requirements.txt b/addons/twofactor/requirements.txt
diff --git a/addons/wiki/requirements.txt b/addons/wiki/requirements.txt
diff --git a/addons/zotero/requirements.txt b/addons/zotero/requirements.txt
diff --git a/api/base/utils.py b/api/base/utils.py
@@ -1,5 +1,5 @@
 from furl import furl
-from urllib.parse import urlunsplit, urlsplit, parse_qs, urlencode, quote
+from urllib.parse import urlunsplit, urlsplit, parse_qs, urlencode
 from packaging.version import Version
 from hashids import Hashids
 
@@ -236,7 +236,7 @@ def waterbutler_api_url_for(node_id, provider, path='/', _internal=False, base_u
     # NOTE: furl encoding to be verified later
     url = furl(website_settings.WATERBUTLER_INTERNAL_URL if _internal else (base_url or website_settings.WATERBUTLER_URL))
     segments = ['v1', 'resources', node_id, 'providers', provider] + path.split('/')[1:]
-    url.add(path=[quote(x) for x in segments])
+    url.add(path=segments)
     url.args.update(kwargs)
     return url.url
 

diff --git a/api_tests/nodes/views/test_node_draft_registration_list.py b/api_tests/nodes/views/test_node_draft_registration_list.py
@@ -342,7 +342,7 @@ def test_type_is_draft_registrations(self, app, user, metaschema_open_ended, url
         assert res.status_code == 409
 
     def test_admin_can_create_draft(
-            self, app, user, project_public, url_draft_registrations, payload, metaschema_open_ended
+        self, app, user, project_public, url_draft_registrations, payload, metaschema_open_ended
     ):
         res = app.post_json_api(
             f'{url_draft_registrations}&embed=branched_from&embed=initiator',

diff --git a/api_tests/users/views/test_user_draft_registration_list.py b/api_tests/users/views/test_user_draft_registration_list.py
@@ -142,7 +142,7 @@ def test_cannot_access_other_users_draft_registration(self, app, user, other_adm
         assert res.status_code == 403
 
     def test_can_access_own_draft_registrations_with_guid(self, app, user, draft_registration):
-        url = '/{}users/{}/draft_registrations/'.format(API_BASE, user._id)
+        url = f'/{API_BASE}users/{user._id}/draft_registrations/'
         res = app.get(url, auth=user.auth, expect_errors=True)
         assert res.status_code == 200
         assert len(res.json['data']) == 1
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -358,15 +358,16 @@ services:
       - /bin/bash
       - -c
       - python -m venv /tmp/venv
-        && /tmp/venv/bin/pip install poetry==1.8.0 &&
+        && /tmp/venv/bin/pip install poetry==1.8.3 &&
         /tmp/venv/bin/poetry install --no-root --without release --compile --sync &&
         rm -rf /python3.12/* &&
         cp -Rf -p /usr/local/lib/python3.12 /
     restart: 'no'
     environment:
       DJANGO_SETTINGS_MODULE: api.base.settings
     volumes:
-      - ./:/code:cached
+      - ./pyproject.toml:/code/pyproject.toml
+      - ./poetry.lock:/code/poetry.lock
       - osf_requirements_3_12_vol:/python3.12
 
   assets:

diff --git a/requirements.txt b/requirements.txt
diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/requirements/release.txt b/requirements/release.txt