Fix merge_networks tests' scope auth; revert docs.yml gufe bump

CI ran the env solve and tests cleanly with the gufe/openfe/feflow
trio bump (b63474e), revealing two real bugs:

1. The four merge_networks client tests merged into destination
   scopes the test identity does not have access to (e.g.
   `test_org-test_campaign-merged_project`). The test identity only
   has the three scopes in `multiple_scopes` (scope_test plus two
   others); creating a "new project" under the same org/campaign was
   not, in fact, authorized. Switch the destination scope to one the
   identity has:

   - test_merge_networks: scope_test (collision-free because the
     merged network's name differs from pre-loaded networks)
   - test_merge_networks_respects_state: scope_test (each parametrize
     case uses a unique network name)
   - test_merge_networks_preserves_tasks_and_results: multiple_scopes[1]
     (different from where the source Tasks were set up, so the
     per-`_project` Task/PDRR counts stay clean)

2. The docs.yml gufe bump from 1.3.0 to 1.10.0 breaks the RTD build,
   because sphinx 9's autodoc dynamic-importer trips on
   `gufe/settings/models.py`:

       ph: PositiveFloat | None = Field(None, ...)
           ~~~~~~~~~~~~~~^~~~~~
       TypeError: unsupported operand type(s) for |: 'PositiveFloat' and 'NoneType'

   gufe 1.3.0 still allows pydantic v1 (where PositiveFloat is a
   class with `__or__`); gufe >=1.8.0 forces pydantic v2 (where
   PositiveFloat is `Annotated[float, ...]`, no `__or__`). docs.yml
   only needs gufe for intersphinx and type-hint resolution; neither
   benefits from the bump. Revert docs.yml to its pre-PR state.

Also polish the client merge_networks docstring with a `set_tasks_status`
hint alongside `action_tasks` for the errored-Task remediation path.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: dotsdl

alchemiscale/interface/client.py

@@ -204,13 +204,10 @@ def merge_networks(
         their associated ProtocolDAGResultRefs, so previously-computed results
         do not need to be re-run.
 
-        Cloned Tasks are wired to their Transformations via ``PERFORMS`` and
-        are reachable through standard network traversals
-        (``get_network_tasks``, ``get_network_results``, etc.). They are
-        intentionally **not** actioned to the new network's TaskHub; to
-        retry errored Tasks on the merged network, call
-        :meth:`action_tasks` with the merged network's ScopedKey after the
-        merge completes.
+        Cloned Tasks are intentionally **not** actioned; to retry errored Tasks
+        on the merged network, call :meth:`action_tasks` with the merged
+        network's ScopedKey after the merge completes, and set the Tasks'
+        status to back to `waiting` with :meth:`set_tasks_status`.
 
         Parameters
         ----------
@@ -224,11 +221,11 @@ def merge_networks(
             The Scope in which to create the new AlchemicalNetwork.
             This must be a *specific* Scope; it must not contain wildcards.
         state
-            The starting state of the new AlchemicalNetwork in the database.
-            See :meth:`AlchemiscaleClient.set_network_state` for valid states.
+            The starting state of the new AlchemicalNetwork. See
+            :meth:`AlchemiscaleClient.set_network_state` for valid states.
             Defaults to ``"active"``.
         visualize
-            If ``True``, show submission progress indicator.
+            If ``True``, show progress indicator.
 
         Returns
         -------

alchemiscale/tests/integration/interface/client/test_client.py

@@ -213,12 +213,10 @@ def test_merge_networks(
         # "incomplete" in each of `multiple_scopes`
         source_sks = user_client.query_networks(state=None)
 
-        # destination scope: a new project under the existing org/campaign
-        merge_scope = Scope(
-            org=scope_test.org,
-            campaign=scope_test.campaign,
-            project="merged_project",
-        )
+        # destination scope: reuse `scope_test`, which is authorized for
+        # the test identity. The merged network's name differs from the
+        # pre-loaded networks, so there is no _scoped_key collision.
+        merge_scope = scope_test
 
         merged_sk = user_client.merge_networks(
             networks=source_sks,
@@ -261,11 +259,10 @@ def test_merge_networks_respects_state(
         source_sks = user_client.query_networks(scope=scope_test, state=None)
         assert source_sks
 
-        merge_scope = Scope(
-            org=scope_test.org,
-            campaign=scope_test.campaign,
-            project=f"merged_state_{state}",
-        )
+        # destination scope: reuse `scope_test`, which is authorized for
+        # the test identity; the unique network name keeps each parametrize
+        # case from colliding on _scoped_key.
+        merge_scope = scope_test
         merged_sk = user_client.merge_networks(
             networks=source_sks,
             name=f"merged_state_{state}",
@@ -324,6 +321,7 @@ def test_merge_networks_rejects_non_network_scoped_key(
     def test_merge_networks_preserves_tasks_and_results(
         self,
         scope_test,
+        multiple_scopes,
         n4js_preloaded,
         user_client: client.AlchemiscaleClient,
         network_tyk2,
@@ -363,12 +361,11 @@ def test_merge_networks_preserves_tasks_and_results(
         )
         n4js_preloaded.set_task_result(task_sks[1], err_pdrr)
 
-        # merge into a fresh project under the same org/campaign
-        merge_scope = Scope(
-            org=scope_test.org,
-            campaign=scope_test.campaign,
-            project="merged_with_results",
-        )
+        # merge into a different authorized scope from where we set up the
+        # source Tasks, so the per-scope counts below remain clean (the
+        # destination scope has pre-loaded networks but no Tasks/PDRRs).
+        merge_scope = multiple_scopes[1]
+        assert merge_scope != scope_test
         merged_sk = user_client.merge_networks(
             networks=[source_sk],
             name="merged_with_results",

devtools/conda-envs/docs.yml

@@ -3,13 +3,13 @@ channels:
   - conda-forge
 
 dependencies:
-  - python >=3.11,<3.13
+  - python<3.13
   - sphinx
   - furo
   - myst-nb
   - myst-parser>=0.14
   - docutils
   - sphinx-notfound-page
-  - gufe=1.10.0
+  - gufe=1.3.0
   - py2neo
   - stratocaster