From fb819df5c95dd3de765a96e9d8de04c11b7146ff Mon Sep 17 00:00:00 2001 From: Alan Du Date: Thu, 2 Nov 2023 11:44:39 -0400 Subject: [PATCH] Update torchx for fsspec 2023.10 (#784) --- dev-requirements.txt | 2 +- requirements.txt | 3 +-- torchx/workspace/test/dir_workspace_test.py | 7 +++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 5213954d7..1b0ae50a3 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,7 +5,7 @@ boto3 captum>=0.4.0 docker flake8==3.9.0 -fsspec[s3]==2023.1.0 +fsspec[s3]==2023.10.0 google-api-core google-cloud-batch>=0.5.0 google-cloud-logging>=3.0.0 diff --git a/requirements.txt b/requirements.txt index 35a2c0aca..b63f1ab8f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,7 @@ importlib-metadata pyyaml docker filelock -# more recent versions of fsspec causes torchx/workspace/test/dir_workspace_test#test_torchcxignore to fail -fsspec==2023.1.0 +fsspec==2023.10.0 # To resolve confliciting dependencies for urllib3: https://github.com/pytorch/torchx/actions/runs/3484190429/jobs/5828784263#step:4:552 urllib3<1.27,>=1.21.1 tabulate diff --git a/torchx/workspace/test/dir_workspace_test.py b/torchx/workspace/test/dir_workspace_test.py index b2160b77a..627ca458f 100644 --- a/torchx/workspace/test/dir_workspace_test.py +++ b/torchx/workspace/test/dir_workspace_test.py @@ -92,11 +92,10 @@ def test_torchxignore(self) -> None: files = fs.glob("torchxignoredest/*") + fs.glob("torchxignoredest/**/*") # strip prefix - files = [ + files = { os.path.normpath(file.partition("torchxignoredest/")[2]) for file in files - ] - print(files) - self.assertCountEqual( + } + self.assertSetEqual( files, { ".torchxignore",