Skip to content

Commit 181a364

Browse files
committed
Merge branch 'develop' into synpy-1575-fileview-updates
2 parents d328f69 + 1fbc248 commit 181a364

File tree

5 files changed

+37
-5
lines changed

5 files changed

+37
-5
lines changed

Diff for: .github/pull_request_template.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# **Problem:**
2+
3+
- Describe the specific technical problem that this PR solves.
4+
- Include details such as:
5+
- How you reproduced the problem
6+
- What code is affected
7+
- Any relevant background information
8+
9+
# **Solution:**
10+
11+
- Describe the specific technical solution that this PR provides.
12+
- Include details such as:
13+
- How you debugged the problem
14+
- Why you chose this solution
15+
- Does the solution make any impact beyond the immediate problem
16+
- Any necessary technical debt incurred
17+
- Any important design decisions/links to design documentation (if applicable)
18+
19+
# **Testing:**
20+
21+
- Describe any testing that was performed to validate the solution.
22+
- Include details such as:
23+
- How you tested the solution
24+
- Any relevant test results (Do not include any test results that may contain sensitive information)
25+
- Any automated tests that were added to the codebase

Diff for: .readthedocs.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ version: 2
88
build:
99
os: ubuntu-22.04
1010
tools:
11-
python: "3.9"
11+
# alias for the latest 3.x version available on Read the Docs
12+
python: "3"
1213

1314
mkdocs:
1415
configuration: mkdocs.yml
@@ -17,3 +18,8 @@ mkdocs:
1718
python:
1819
install:
1920
- requirements: docs/requirements.txt
21+
22+
# See https://docs.readthedocs.com/platform/stable/config-file/v2.html#search for more options
23+
search:
24+
ranking:
25+
reference/*: -1

Diff for: docs/guides/data_storage.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Migrating a Synapse project or folder programmatically is a two step process.
104104

105105
First ensure that you know the id of the storage location you want to migrate to. More info on storage locations can be found above and [here](https://help.synapse.org/docs/Custom-Storage-Locations.2048327803.html).
106106

107-
Once the storage location is known, the first step to migrate the project or folder is to create a migratable index of its contents using the [index_files_for_migration](synapseutils.migrate_functions.index_files_for_migration) function, e.g.
107+
Once the storage location is known, the first step to migrate the project or folder is to create a migratable index of its contents using the [index_files_for_migration][synapseutils.migrate_functions.index_files_for_migration] function, e.g.
108108

109109
When specifying the `.db` file for the migratable indexes you need to specify a `.db` file that does not already exist for another synapse project or folder on disk. It is the best practice to specify a unique name for the file by including the synapse id in the name of the file, or other unique identifier.
110110

@@ -134,9 +134,9 @@ result = synapseutils.index_files_for_migration(
134134
)
135135
```
136136

137-
If called on a container (e.g. a Project or Folder) the *index_files_for_migration* function will recursively index all of the children of that container (including its subfolders). Once the entity has been indexed you can optionally programmatically inspect the the contents of the index or output its contents to a csv file in order to manually inspect it using the [available methods](synapseutils.html#synapseutils.migrate_functions.MigrationResult) on the returned result object.
137+
If called on a container (e.g. a Project or Folder) the *index_files_for_migration* function will recursively index all of the children of that container (including its subfolders). Once the entity has been indexed you can optionally programmatically inspect the the contents of the index or output its contents to a csv file in order to manually inspect it using the [available methods][synapseutils.migrate_functions.MigrationResult] on the returned result object.
138138

139-
The next step to trigger the migration from the indexed files is using the [migrate_indexed_files](synapseutils.html#synapseutils.migrate_functions.migrate_indexed_files) function, e.g.
139+
The next step to trigger the migration from the indexed files is using the [migrate_indexed_files][synapseutils.migrate_functions.migrate_indexed_files] function, e.g.
140140

141141
```python
142142
result = synapseutils.migrate_indexed_files(

Diff for: tests/integration/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def pytest_collection_modifyitems(items) -> None:
5151

5252

5353
@pytest_asyncio.fixture(loop_scope="session", scope="session")
54-
async def syn(request) -> Synapse:
54+
def syn(request) -> Synapse:
5555
"""
5656
Create a logged in Synapse instance that can be shared by all tests in the session.
5757
If xdist is being used a syn is created for each worker node.

Diff for: tests/unit/synapseclient/models/unit_test_table.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Tests for the Table class."""
2+
23
import pytest
34

45
from synapseclient import Synapse

0 commit comments

Comments
 (0)