From 47b976c227e6ce3717940b763dd26de41e2fb094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= <cr52@protonmail.com>
Date: Sun, 3 May 2026 19:48:54 +0200
Subject: [PATCH 1/3] =?UTF-8?q?Revert=20"Revert=20"DEP:=20de-duplicate=20a?=
 =?UTF-8?q?nd=20sort=20optional=20dependencies=20(#2021)"=20(#2=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f58bc851213ab3a87b2d26c01c9d26b291b0e1d3.
---
 pyproject.toml | 86 ++++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 48 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 79fe1428d..1ce46e3fc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,34 +24,13 @@ classifiers = [
 ]
 
 [project.optional-dependencies]
+# user-facing
 abfs = ["adlfs"]
 adl = ["adlfs"]
 arrow = ["pyarrow >= 1"]
 dask = ["dask", "distributed"]
-dev = ["ruff >= 0.5", "pre-commit"]
-doc = ["sphinx", "numpydoc", "sphinx-design", "sphinx-rtd-theme", "yarl"]
 dropbox = ["dropbox", "dropboxdrivefs", "requests"]
 entrypoints = []
-full = [
-    'adlfs',
-    'aiohttp !=4.0.0a0, !=4.0.0a1',
-    'dask',
-    'distributed',
-    'dropbox',
-    'dropboxdrivefs',
-    'fusepy',
-    'gcsfs >2024.2.0',
-    'libarchive-c',
-    'ocifs',
-    'panel',
-    'paramiko',
-    'pyarrow >= 1',
-    'pygit2',
-    'requests',
-    's3fs >2024.2.0',
-    'smbprotocol',
-    'tqdm',
-]
 fuse = ["fusepy"]
 gcs = ["gcsfs >2024.2.0"]
 git = ["pygit2"]
@@ -66,8 +45,42 @@ s3 = ["s3fs >2024.2.0"]
 sftp = ["paramiko"]
 smb = ["smbprotocol"]
 ssh = ["paramiko"]
+tqdm = ["tqdm"]
+full = [
+    'fsspec[abfs]',
+    'fsspec[adl]',
+    'fsspec[arrow]',
+    'fsspec[dask]',
+    'fsspec[dropbox]',
+    'fsspec[entrypoints]',
+    'fsspec[fuse]',
+    'fsspec[gcs]',
+    'fsspec[git]',
+    'fsspec[github]',
+    'fsspec[gs]',
+    'fsspec[gui]',
+    'fsspec[hdfs]',
+    'fsspec[http]',
+    'fsspec[libarchive]',
+    'fsspec[oci]',
+    'fsspec[s3]',
+    'fsspec[sftp]',
+    'fsspec[smb]',
+    'fsspec[ssh]',
+    'fsspec[tqdm]',
+]
+
+# dev-only
+dev = ["ruff >= 0.5", "pre-commit"]
+doc = [
+    'sphinx',
+    'numpydoc',
+    'sphinx-design',
+    'sphinx-rtd-theme',
+    'yarl',
+]
 test = [
-    "aiohttp!=4.0.0a0, !=4.0.0a1",
+    "fsspec[http]",
     "numpy",
     "pytest",
     "requests",
@@ -79,42 +92,20 @@ test = [
     "pytest-asyncio !=0.22.0",
 ]
 test_full = [
+    'fsspec[test]',
+    'fsspec[full]',
     'Jinja2',
-    'adlfs',
-    'aiohttp !=4.0.0a0, !=4.0.0a1',
-    'aiohttp!=4.0.0a0, !=4.0.0a1',
     'cloudpickle',
-    'dask',
-    'distributed',
-    'dropbox',
-    'dropboxdrivefs',
     'fastparquet',
-    'fusepy',
-    'gcsfs',
     "kerchunk",
-    'libarchive-c',
     'lz4',
     'notebook',
     'numpy',
-    'ocifs',
     'pandas <3.0.0',
     'panel',
-    'paramiko',
-    'pyarrow',
-    'pyarrow >= 1',
     'pyftpdlib',
-    'pygit2',
     'pytest',
-    'pytest-asyncio !=0.22.0',
-    'pytest-benchmark',
-    'pytest-cov',
-    'pytest-mock',
-    'pytest-rerunfailures',
-    'pytest-recording',
-    'requests',
-    'smbprotocol',
     'python-snappy',
-    'tqdm',
     'urllib3',
     'zarr',
     'backports.zstd; python_version < "3.14"',
@@ -127,7 +118,6 @@ test_downstream = [
     "xarray",
     "aiobotocore>=2.5.4,<3.0.0",
 ]
-tqdm = ["tqdm"]
 
 [project.urls]
 Changelog = "https://filesystem-spec.readthedocs.io/en/latest/changelog.html"

From 3838dc825bb7de071cb64f0e94ad9786c79a233f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= <cr52@protonmail.com>
Date: Sun, 3 May 2026 19:55:16 +0200
Subject: [PATCH 2/3] DEP: bump and harmonize requirement on gcsfs

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1ce46e3fc..da6f0f630 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,10 +32,10 @@ dask = ["dask", "distributed"]
 dropbox = ["dropbox", "dropboxdrivefs", "requests"]
 entrypoints = []
 fuse = ["fusepy"]
-gcs = ["gcsfs >2024.2.0"]
+gcs = ["gcsfs >=2026.4.0"]
 git = ["pygit2"]
 github = ["requests"]
-gs = ["gcsfs"]
+gs = ["fsspec[gcs]"]
 gui = ["panel"]
 hdfs = ["pyarrow >= 1"]
 http = ["aiohttp !=4.0.0a0, !=4.0.0a1"]

From ca597fb8f55eedc847706835e35c58382a68b277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= <cr52@protonmail.com>
Date: Sun, 3 May 2026 22:38:04 +0200
Subject: [PATCH 3/3] DEP: bump s3fs

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index da6f0f630..d21e33c1d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,7 +41,7 @@ hdfs = ["pyarrow >= 1"]
 http = ["aiohttp !=4.0.0a0, !=4.0.0a1"]
 libarchive = ["libarchive-c"]
 oci = ["ocifs"]
-s3 = ["s3fs >2024.2.0"]
+s3 = ["s3fs >=2026.4.0"]
 sftp = ["paramiko"]
 smb = ["smbprotocol"]
 ssh = ["paramiko"]