From 41ce53572cfc1c97c7450468069f46384077a082 Mon Sep 17 00:00:00 2001 From: Dominik Klein Date: Wed, 4 Jan 2023 14:39:01 +0100 Subject: [PATCH 1/2] fix bug in SinkhornProblem; --- src/moscot/problems/generic/_generic.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/moscot/problems/generic/_generic.py b/src/moscot/problems/generic/_generic.py index 7eedefffe..39f975858 100644 --- a/src/moscot/problems/generic/_generic.py +++ b/src/moscot/problems/generic/_generic.py @@ -63,21 +63,6 @@ def prepare( %(ex_prepare)s """ self.batch_key = key - if joint_attr is None: - kwargs["xy_callback"] = "local-pca" - kwargs.setdefault("xy_callback_kwargs", {}) - elif isinstance(joint_attr, str): - kwargs["xy"] = { - "x_attr": "obsm", - "x_key": joint_attr, - "y_attr": "obsm", - "y_key": joint_attr, - } - elif isinstance(joint_attr, Mapping): - kwargs["xy"] = joint_attr - else: - raise TypeError(f"Unable to interpret `joint_attr` of type `{type(joint_attr)}`.") - xy, kwargs = handle_joint_attr(joint_attr, kwargs) xy, _, _ = handle_cost(xy=xy, cost=cost) return super().prepare( From f3c04ead14b1798aa5a19db1cf796e3a02bb278b Mon Sep 17 00:00:00 2001 From: Dominik Klein Date: Wed, 4 Jan 2023 14:49:26 +0100 Subject: [PATCH 2/2] fix tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index dc80b774d..fb8d61247 100644 --- a/tox.ini +++ b/tox.ini @@ -107,7 +107,7 @@ deps = pytest-mock pytest-cov usedevelop = true -passenv = TOXENV CI CODECOV_* GITHUB_ACTIONS PYTEST_FLAGS +passenv = TOXENV,CI,CODECOV_*,GITHUB_ACTIONS,PYTEST_FLAGS commands = python -m pytest --cov --cov-append --cov-report=term-missing --cov-config={toxinidir}/tox.ini {posargs:-vv} {env:PYTEST_FLAGS:}