From db7ad7f9fdf924b81e957358277122787918c021 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 6 Oct 2023 16:24:15 -0400 Subject: [PATCH 1/2] BUG: Remove aiohttp version workaround Resolved via https://github.com/imjoy-team/imjoy-elfinder/pull/607 --- pyproject.toml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ea293fa7..1a00b6fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,13 +61,11 @@ Source = "https://github.com/InsightSoftwareConsortium/itkwidgets" all = [ "imjoy-jupyterlab-extension >=0.1.13", "imjoy-elfinder[jupyter]", - "imjoy-jupyter-extension >=0.3.0", - "aiohttp>=3.8.2; python_version=='3.11'" + "imjoy-jupyter-extension >=0.3.0" ] lab = [ "imjoy-jupyterlab-extension >=0.1.13", - "imjoy-elfinder[jupyter]", - "aiohttp>=3.8.2; python_version=='3.11'" + "imjoy-elfinder[jupyter]" ] cli = [ "hypha >= 0.15.28", @@ -80,8 +78,7 @@ cli = [ notebook = [ "imjoy-jupyter-extension >=0.3.0", - "imjoy-elfinder[jupyter]", - "aiohttp>=3.8.2; python_version=='3.11'" + "imjoy-elfinder[jupyter]" ] test = [ "pytest >=2.7.3", From 2f5282469dc72385b57531fcbde6df455e565403 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 6 Oct 2023 16:29:50 -0400 Subject: [PATCH 2/2] BUG: Constrain aiohttp to <4.0 It is a transitive dependency of imjoy-elfinder[jupyter]. 4.0a1 (current version), does not have published wheels. Prevent build errors with: ``` pip install --pre 'itkwidgets[all]' ``` --- pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1a00b6fc..82f3fa5c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,11 +61,13 @@ Source = "https://github.com/InsightSoftwareConsortium/itkwidgets" all = [ "imjoy-jupyterlab-extension >=0.1.13", "imjoy-elfinder[jupyter]", - "imjoy-jupyter-extension >=0.3.0" + "imjoy-jupyter-extension >=0.3.0", + "aiohttp <4.0" ] lab = [ "imjoy-jupyterlab-extension >=0.1.13", - "imjoy-elfinder[jupyter]" + "imjoy-elfinder[jupyter]", + "aiohttp <4.0" ] cli = [ "hypha >= 0.15.28",