diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc71c5551..47f77d8ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,8 +78,6 @@ jobs: default_python: '3.12.0-rc.1' envs: | - linux: devdeps - setenv: | - AIOHTTP_NO_EXTENSIONS: 1 dev: needs: [core, asdf-schemas] diff --git a/asdf/_tests/test_asdf.py b/asdf/_tests/test_asdf.py index 65bbf8797..66756a313 100644 --- a/asdf/_tests/test_asdf.py +++ b/asdf/_tests/test_asdf.py @@ -1,6 +1,5 @@ import os -import fsspec import pytest from asdf import config_context, get_config @@ -392,11 +391,14 @@ def test_unclosed_file(tmp_path): pass +@pytest.importorskip('fsspec') def test_fsspec(tmp_path): """ Issue #1146 reported errors when opening a fsspec 'file' This is a regression test for the fix in PR #1226 """ + import fsspec + tree = {"a": 1} af = AsdfFile(tree) fn = tmp_path / "test.asdf" @@ -407,6 +409,7 @@ def test_fsspec(tmp_path): assert_tree_match(tree, af.tree) +@pytest.importorskip('fsspec') @pytest.mark.remote_data() def test_fsspec_http(httpserver): """ @@ -414,6 +417,8 @@ def test_fsspec_http(httpserver): filesystem) This is a regression test for the fix in PR #1228 """ + import fsspec + tree = {"a": 1} af = AsdfFile(tree) path = os.path.join(httpserver.tmpdir, "test") diff --git a/asdf/_tests/test_generic_io.py b/asdf/_tests/test_generic_io.py index 5aeabc84d..0425f534d 100644 --- a/asdf/_tests/test_generic_io.py +++ b/asdf/_tests/test_generic_io.py @@ -5,7 +5,6 @@ import sys import urllib.request as urllib_request -import fsspec import numpy as np import pytest @@ -788,11 +787,14 @@ def test_io_subclasses(tmp_path): f.close() +@pytest.importorskip('fsspec') def test_fsspec(tmp_path): """ Issue #1146 reported errors when opening a fsspec 'file' This is a regression test for the fix in PR #1226 """ + import fsspec + ref = b"01234567890" fn = tmp_path / "test" @@ -809,6 +811,7 @@ def test_fsspec(tmp_path): assert ai == i +@pytest.importorskip('fsspec') @pytest.mark.remote_data() def test_fsspec_http(httpserver): """ @@ -816,6 +819,8 @@ def test_fsspec_http(httpserver): filesystem) This is a regression test for the fix in PR #1228 """ + import fsspec + ref = b"01234567890" path = os.path.join(httpserver.tmpdir, "test") diff --git a/pyproject.toml b/pyproject.toml index c992b2e57..37cef97b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ docs = [ 'tomli; python_version < "3.11"', ] tests = [ - "fsspec[http]>=2022.8.2", + #"fsspec[http]>=2022.8.2", "lz4>=0.10", "psutil", "pytest>=6",