From ae9ffaa3d3d35be846684a6770ac8deab5f16db0 Mon Sep 17 00:00:00 2001 From: Tabassum Kakar Date: Tue, 3 Dec 2024 16:45:38 -0500 Subject: [PATCH] Fixed Python version and config issues due to vitessce updates --- .github/workflows/portal-ci.yml | 4 +- .../fake-multiome-conf.json | 112 ++++++------ .../fake-multiome-is-annotated-conf.json | 168 +++++++++--------- 3 files changed, 142 insertions(+), 142 deletions(-) diff --git a/.github/workflows/portal-ci.yml b/.github/workflows/portal-ci.yml index 22099a1..6c5f459 100644 --- a/.github/workflows/portal-ci.yml +++ b/.github/workflows/portal-ci.yml @@ -14,10 +14,10 @@ jobs: with: submodules: 'recursive' - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v2 with: - python-version: '3.9' + python-version: '3.10' architecture: 'x64' - name: Install python main dependencies diff --git a/test/good-fixtures/MultiomicAnndataZarrViewConfBuilder/fake-multiome-conf.json b/test/good-fixtures/MultiomicAnndataZarrViewConfBuilder/fake-multiome-conf.json index 7bdd547..3a63feb 100644 --- a/test/good-fixtures/MultiomicAnndataZarrViewConfBuilder/fake-multiome-conf.json +++ b/test/good-fixtures/MultiomicAnndataZarrViewConfBuilder/fake-multiome-conf.json @@ -179,13 +179,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 0.0, - "y": 0.0 + "w": 3, + "x": 0, + "y": 0 }, { "component": "scatterplot", @@ -200,13 +200,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 3.0, - "y": 0.0 + "w": 3, + "x": 3, + "y": 0 }, { "component": "scatterplot", @@ -219,13 +219,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 6.0, - "y": 0.0 + "w": 3, + "x": 6, + "y": 0 }, { "component": "featureList", @@ -238,10 +238,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 9, + "y": 6 }, { "component": "featureList", @@ -254,10 +254,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 6.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 6, + "y": 6 }, { "component": "genomicProfiles", @@ -266,13 +266,13 @@ "obsColorEncoding": "B", "obsSetSelection": "B" }, - "h": 6.0, + "h": 6, "props": { "title": "Leiden (Weighted Nearest Neighbor) Genomic Profiles" }, - "w": 6.0, - "x": 0.0, - "y": 6.0 + "w": 6, + "x": 0, + "y": 6 }, { "component": "obsSets", @@ -283,10 +283,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 0.0 + "h": 6, + "w": 3, + "x": 9, + "y": 0 } ], "name": "Leiden (Weighted Nearest Neighbor)", @@ -472,13 +472,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 0.0, - "y": 0.0 + "w": 3, + "x": 0, + "y": 0 }, { "component": "scatterplot", @@ -493,13 +493,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 3.0, - "y": 0.0 + "w": 3, + "x": 3, + "y": 0 }, { "component": "scatterplot", @@ -512,13 +512,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 6.0, - "y": 0.0 + "w": 3, + "x": 6, + "y": 0 }, { "component": "featureList", @@ -531,10 +531,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 9, + "y": 6 }, { "component": "featureList", @@ -547,10 +547,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 6.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 6, + "y": 6 }, { "component": "genomicProfiles", @@ -559,13 +559,13 @@ "obsColorEncoding": "B", "obsSetSelection": "B" }, - "h": 6.0, + "h": 6, "props": { "title": "Leiden (RNA) Genomic Profiles" }, - "w": 6.0, - "x": 0.0, - "y": 6.0 + "w": 6, + "x": 0, + "y": 6 }, { "component": "obsSets", @@ -576,10 +576,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 0.0 + "h": 6, + "w": 3, + "x": 9, + "y": 0 } ], "name": "Leiden (RNA)", diff --git a/test/good-fixtures/MultiomicAnndataZarrViewConfBuilder/fake-multiome-is-annotated-conf.json b/test/good-fixtures/MultiomicAnndataZarrViewConfBuilder/fake-multiome-is-annotated-conf.json index 45c0015..9ef3056 100644 --- a/test/good-fixtures/MultiomicAnndataZarrViewConfBuilder/fake-multiome-is-annotated-conf.json +++ b/test/good-fixtures/MultiomicAnndataZarrViewConfBuilder/fake-multiome-is-annotated-conf.json @@ -183,13 +183,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 0.0, - "y": 0.0 + "w": 3, + "x": 0, + "y": 0 }, { "component": "scatterplot", @@ -204,13 +204,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 3.0, - "y": 0.0 + "w": 3, + "x": 3, + "y": 0 }, { "component": "scatterplot", @@ -223,13 +223,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 6.0, - "y": 0.0 + "w": 3, + "x": 6, + "y": 0 }, { "component": "featureList", @@ -242,10 +242,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 9, + "y": 6 }, { "component": "featureList", @@ -258,10 +258,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 6.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 6, + "y": 6 }, { "component": "genomicProfiles", @@ -270,13 +270,13 @@ "obsColorEncoding": "B", "obsSetSelection": "B" }, - "h": 6.0, + "h": 6, "props": { "title": "Leiden (Weighted Nearest Neighbor) Genomic Profiles" }, - "w": 6.0, - "x": 0.0, - "y": 6.0 + "w": 6, + "x": 0, + "y": 6 }, { "component": "obsSets", @@ -287,10 +287,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 0.0 + "h": 6, + "w": 3, + "x": 9, + "y": 0 } ], "name": "Leiden (Weighted Nearest Neighbor)", @@ -480,13 +480,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 0.0, - "y": 0.0 + "w": 3, + "x": 0, + "y": 0 }, { "component": "scatterplot", @@ -501,13 +501,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 3.0, - "y": 0.0 + "w": 3, + "x": 3, + "y": 0 }, { "component": "scatterplot", @@ -520,13 +520,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 6.0, - "y": 0.0 + "w": 3, + "x": 6, + "y": 0 }, { "component": "featureList", @@ -539,10 +539,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 9, + "y": 6 }, { "component": "featureList", @@ -555,10 +555,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 6.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 6, + "y": 6 }, { "component": "genomicProfiles", @@ -567,13 +567,13 @@ "obsColorEncoding": "B", "obsSetSelection": "B" }, - "h": 6.0, + "h": 6, "props": { "title": "Leiden (RNA) Genomic Profiles" }, - "w": 6.0, - "x": 0.0, - "y": 6.0 + "w": 6, + "x": 0, + "y": 6 }, { "component": "obsSets", @@ -584,10 +584,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 0.0 + "h": 6, + "w": 3, + "x": 9, + "y": 0 } ], "name": "Leiden (RNA)", @@ -777,13 +777,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 0.0, - "y": 0.0 + "w": 3, + "x": 0, + "y": 0 }, { "component": "scatterplot", @@ -798,13 +798,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 3.0, - "y": 0.0 + "w": 3, + "x": 3, + "y": 0 }, { "component": "scatterplot", @@ -817,13 +817,13 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, + "h": 6, "props": { "embeddingCellSetLabelsVisible": false }, - "w": 3.0, - "x": 6.0, - "y": 0.0 + "w": 3, + "x": 6, + "y": 0 }, { "component": "featureList", @@ -836,10 +836,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 9, + "y": 6 }, { "component": "featureList", @@ -852,10 +852,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 6.0, - "y": 6.0 + "h": 6, + "w": 3, + "x": 6, + "y": 6 }, { "component": "genomicProfiles", @@ -864,13 +864,13 @@ "obsColorEncoding": "B", "obsSetSelection": "B" }, - "h": 6.0, + "h": 6, "props": { "title": "Cell Ontology Annotation Genomic Profiles" }, - "w": 6.0, - "x": 0.0, - "y": 6.0 + "w": 6, + "x": 0, + "y": 6 }, { "component": "obsSets", @@ -881,10 +881,10 @@ "obsColorEncoding": "A", "obsSetSelection": "A" }, - "h": 6.0, - "w": 3.0, - "x": 9.0, - "y": 0.0 + "h": 6, + "w": 3, + "x": 9, + "y": 0 } ], "name": "Cell Ontology Annotation",