From 10b2f5560add0eb9df275ba17659e43735800c7f Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sat, 6 Jan 2024 22:42:01 +0100 Subject: [PATCH 1/2] Temporarily skip client test. (#326) * Temporarily skip client test. * Remove version from fsspec --- Makefile | 2 +- requirements.txt | 2 +- tests/test_clip_client.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a528feb3..3e0c3426 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ black: ## [Local development] Auto-format python code using black build-pex: python3 -m venv .pexing . .pexing/bin/activate && python -m pip install -U pip && python -m pip install pex - . .pexing/bin/activate && python -m pex --layout packed -f https://download.pytorch.org/whl/cu113/torch_stable.html setuptools gcsfs==2022.11.0 charset-normalizer==2.1.1 s3fs==2022.11.0 pyspark==3.2.0 torch==1.10.2+cu113 torchvision==0.11.3+cu113 . -o clip_retrieval.pex -v + . .pexing/bin/activate && python -m pex --layout packed -f https://download.pytorch.org/whl/cu113/torch_stable.html setuptools gcsfs charset-normalizer==2.1.1 s3fs pyspark==3.2.0 torch==1.10.2+cu113 torchvision==0.11.3+cu113 . -o clip_retrieval.pex -v rm -rf .pexing tar czf clip_retrieval_torch.tgz clip_retrieval.pex/.deps/torch-1.10.2+cu113-cp38-cp38-linux_x86_64.whl tar czf clip_retrieval.tgz --exclude clip_retrieval.pex/.deps/torch-1.10.2+cu113-cp38-cp38-linux_x86_64.whl clip_retrieval.pex diff --git a/requirements.txt b/requirements.txt index 8387636a..e9ca0e48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ autofaiss>=2.9.6,<3 webdataset>=0.2,<0.3 h5py>=3.1.0,<4 prometheus-client>=0.13.1,<1 -fsspec==2022.11.0 +fsspec sentence-transformers>=2.2.0,<3 wandb>=0.12.10,<0.13 open-clip-torch>=2.0.0,<3.0.0 diff --git a/tests/test_clip_client.py b/tests/test_clip_client.py index 5f5829eb..06d5797a 100644 --- a/tests/test_clip_client.py +++ b/tests/test_clip_client.py @@ -1,5 +1,6 @@ """Test the ClipClient class.""" import logging +import pytest LOGGER = logging.getLogger(__name__) LOGGER.info("Test ClipClient.query()") @@ -14,6 +15,7 @@ # NOTE: This test may fail if the backend is down. +@pytest.mark.skip(reason="temporarily skipping this test while laion knn is down") def test_query(): """ Test the ClipClient.query() method. From 50f5d5290c37e037d5bc098d6815c94915688654 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sat, 6 Jan 2024 22:46:13 +0100 Subject: [PATCH 2/2] Release 2.38.0 --- HISTORY.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index e420d7f2..a04becc3 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,8 @@ +## 2.38.0 + +* Add webp to list of supported files in reader. +* Remove version constraint of fsspec. + ## 2.37.0 * Update versions to fix pex and npm build diff --git a/setup.py b/setup.py index 2261627e..57a897b8 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def _read_reqs(relpath): packages=find_packages(), package_data={"": extra_files}, include_package_data=True, - version="2.37.0", + version="2.38.0", license="MIT", description="Easily computing clip embeddings and building a clip retrieval system with them", long_description=long_description,