From 29e390b69fb8a48a89757d638dffbd811eb5f03423990e88acf18a102e6ea8bf Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 2 Jul 2022 17:35:00 +0000 Subject: [PATCH 1/2] Accepting request 985758 from home:bnavigator:branches:devel:languages:python:aws - Update to 2022.5.0 * invalidate listings cache for simple put/pipe (#474) * conform _mkdir and _cat_file to upstream (#471) OBS-URL: https://build.opensuse.org/request/show/985758 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gcsfs?expand=0&rev=18 --- gcsfs-2022.3.0-gh.tar.gz | 3 --- gcsfs-2022.5.0-gh.tar.gz | 3 +++ python-gcsfs.changes | 7 +++++++ python-gcsfs.spec | 26 ++++---------------------- 4 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 gcsfs-2022.3.0-gh.tar.gz create mode 100644 gcsfs-2022.5.0-gh.tar.gz diff --git a/gcsfs-2022.3.0-gh.tar.gz b/gcsfs-2022.3.0-gh.tar.gz deleted file mode 100644 index 3e1d97a..0000000 --- a/gcsfs-2022.3.0-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24ffda1323342370cdc55258aa985ce27c2e2a38d3bdc102ac27b390adebb2d1 -size 67211 diff --git a/gcsfs-2022.5.0-gh.tar.gz b/gcsfs-2022.5.0-gh.tar.gz new file mode 100644 index 0000000..bfa8c16 --- /dev/null +++ b/gcsfs-2022.5.0-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82e8479900786743c25ecab47b648e94c04ac5c9adccdeb71b674ecae3478cff +size 67686 diff --git a/python-gcsfs.changes b/python-gcsfs.changes index 83a86ee..41b05bd 100644 --- a/python-gcsfs.changes +++ b/python-gcsfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 29 10:18:06 UTC 2022 - Ben Greiner + +- Update to 2022.5.0 + * invalidate listings cache for simple put/pipe (#474) + * conform _mkdir and _cat_file to upstream (#471) + ------------------------------------------------------------------- Wed Apr 27 21:15:17 UTC 2022 - Ben Greiner diff --git a/python-gcsfs.spec b/python-gcsfs.spec index b81c389..377b828 100644 --- a/python-gcsfs.spec +++ b/python-gcsfs.spec @@ -21,7 +21,7 @@ %bcond_with fulltest %define skip_python2 1 Name: python-gcsfs -Version: 2022.3.0 +Version: 2022.5.0 Release: 0 Summary: Filesystem interface over GCS License: BSD-3-Clause @@ -87,27 +87,9 @@ sed -i 's/--color=yes//' setup.cfg %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -## # Tests test_map_simple, test_map_with_data and test_map_clear_empty require a network connection -## %%pytest -k "not network" gcsfs/tests -## # export GCSFS_RECORD_MODE=none -## # export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/gcsfs/tests/fake-secret.json -## # %%%%pytest -rfEs -## -## - name: Install dependencies -## shell: bash -l {0} -## run: | -## pip install git+https://github.com/fsspec/filesystem_spec --no-deps -## conda list -## conda --version -## - name: Install -## shell: bash -l {0} -## run: pip install .[crc] -## -## - name: Run Tests -## shell: bash -l {0} -## run: | -## export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/gcsfs/tests/fake-secret.json -## py.test -vv gcsfs +# The full test suite requires to start a docker container via fake-gcs-server +# see https://github.com/fsspec/gcsfs/blob/main/docs/source/developer.rst +# and the gcs fixtures in conftest.py export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/gcsfs/tests/fake-secret.json %if %{with fulltest} %pytest -rfEs From b52f860edbc3326a386f6f127286acac4fc1e8dafeacad49ea6ca11fe368074f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 3 Jul 2022 15:34:23 +0000 Subject: [PATCH 2/2] Accepting request 986389 from home:bnavigator:branches:devel:languages:python:aws - Enable the test suite with fake-gcs-server running OBS-URL: https://build.opensuse.org/request/show/986389 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gcsfs?expand=0&rev=19 --- python-gcsfs.changes | 5 +++++ python-gcsfs.spec | 28 ++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/python-gcsfs.changes b/python-gcsfs.changes index 41b05bd..f5c04e7 100644 --- a/python-gcsfs.changes +++ b/python-gcsfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 2 18:49:11 UTC 2022 - Ben Greiner + +- Enable the test suite with fake-gcs-server running + ------------------------------------------------------------------- Wed Jun 29 10:18:06 UTC 2022 - Ben Greiner diff --git a/python-gcsfs.spec b/python-gcsfs.spec index 377b828..5bcea3b 100644 --- a/python-gcsfs.spec +++ b/python-gcsfs.spec @@ -17,8 +17,6 @@ %{?!python_module:%define python_module() python3-%{**}} -# the test suite moved to a docker simulator which we cannot run inside an obs environment -%bcond_with fulltest %define skip_python2 1 Name: python-gcsfs Version: 2022.5.0 @@ -44,9 +42,7 @@ Recommends: python-gcsfs-fuse = %{version} Suggests: python-crcmod BuildArch: noarch # SECTION test requirements -# always import in order to detect dependency breakages at build time BuildRequires: %{python_module aiohttp} -BuildRequires: %{python_module black} BuildRequires: %{python_module click} BuildRequires: %{python_module decorator > 4.1.2} BuildRequires: %{python_module fsspec == %{version}} @@ -56,8 +52,10 @@ BuildRequires: %{python_module google-api-python-client} BuildRequires: %{python_module google-auth >= 1.2} BuildRequires: %{python_module google-auth-oauthlib} BuildRequires: %{python_module google-cloud-storage} +BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests} +BuildRequires: fake-gcs-server # /SECTION %python_subpackages @@ -87,15 +85,21 @@ sed -i 's/--color=yes//' setup.cfg %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# The full test suite requires to start a docker container via fake-gcs-server -# see https://github.com/fsspec/gcsfs/blob/main/docs/source/developer.rst -# and the gcs fixtures in conftest.py +# https://github.com/fsspec/gcsfs/blob/main/docs/source/developer.rst +fake-gcs-server \ + -backend memory \ + -scheme http \ + -public-host http://localhost:4443 \ + -external-url http://localhost:4443 \ + >$PWD/fake-gcs-server.stdout 2>$PWD/fake-gcs-server.stderr & +trap "jobs; kill %1 || true" EXIT +export STORAGE_EMULATOR_HOST=http://localhost:4443 export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/gcsfs/tests/fake-secret.json -%if %{with fulltest} -%pytest -rfEs -%else -%pytest -rfEs -k test_checkers -%endif +# Don't test fuse, it hangs on mounting inside obs +donttest="test_fuse" +# finds an existing path on the non-first multiflavor test runs" +donttest+=" or test_mkdir_with_path" +%pytest -rfEs -k "not ($donttest)" %files %{python_files} %doc README.rst