diff --git a/.gitignore b/.gitignore index c42caf7..aaec855 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /fsspec-0.4.4.tar.gz /fsspec-0.5.1.tar.gz /fsspec-0.5.2.tar.gz +/fsspec-0.6.0.tar.gz diff --git a/0001-Skip-ftp-tests-if-unavailable.patch b/0001-Skip-ftp-tests-if-unavailable.patch new file mode 100644 index 0000000..cd0659d --- /dev/null +++ b/0001-Skip-ftp-tests-if-unavailable.patch @@ -0,0 +1,25 @@ +From 5b6d0e00098f8710f5e9313036a495eed3c87b52 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Thu, 21 Nov 2019 22:42:59 -0500 +Subject: [PATCH] Skip ftp tests if unavailable. + +Signed-off-by: Elliott Sales de Andrade +--- + fsspec/implementations/tests/test_ftp.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fsspec/implementations/tests/test_ftp.py b/fsspec/implementations/tests/test_ftp.py +index 91968fb..b8e8c01 100644 +--- a/fsspec/implementations/tests/test_ftp.py ++++ b/fsspec/implementations/tests/test_ftp.py +@@ -13,6 +13,7 @@ here = os.path.dirname(os.path.abspath(__file__)) + + @pytest.fixture() + def ftp(): ++ pytest.importorskip("pyftpdlib") + P = subprocess.Popen( + [sys.executable, "-m", "pyftpdlib", "-d", here], + stderr=subprocess.STDOUT, +-- +2.21.0 + diff --git a/0001-Skip-fuse-tests-correctly.patch b/0001-Skip-fuse-tests-correctly.patch deleted file mode 100644 index 3862f2a..0000000 --- a/0001-Skip-fuse-tests-correctly.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a3bbf600ce1c4039cdd54cc1891bf010334eb1ef Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Thu, 17 Oct 2019 02:55:42 -0400 -Subject: [PATCH] Skip fuse tests correctly. - -Signed-off-by: Elliott Sales de Andrade ---- - fsspec/tests/test_fuse.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fsspec/tests/test_fuse.py b/fsspec/tests/test_fuse.py -index 9e23c01..5e4f8bb 100644 ---- a/fsspec/tests/test_fuse.py -+++ b/fsspec/tests/test_fuse.py -@@ -5,11 +5,11 @@ from multiprocessing import Process - - import pytest - -+pytest.importorskip("fuse") # noqa: E402 -+ - from fsspec.fuse import run - from fsspec.implementations.memory import MemoryFileSystem - --pytest.importorskip("fuse") -- - - def host_fuse(mountdir): - fs = MemoryFileSystem() --- -2.21.0 - diff --git a/python-fsspec.spec b/python-fsspec.spec index 5d5901b..7291deb 100644 --- a/python-fsspec.spec +++ b/python-fsspec.spec @@ -4,22 +4,24 @@ %global srcname fsspec Name: python-%{srcname} -Version: 0.5.2 +Version: 0.6.0 Release: 1%{?dist} Summary: Specification for Pythonic file system interfaces License: BSD URL: https://github.com/intake/filesystem_spec Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -# https://github.com/intake/filesystem_spec/pull/158 -Patch0001: 0001-Skip-fuse-tests-correctly.patch +# https://github.com/intake/filesystem_spec/pull/208 +Patch0001: 0001-Skip-ftp-tests-if-unavailable.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3dist(pytest) BuildRequires: python3dist(setuptools) +%if %{fedora} < 32 BuildRequires: python3dist(pyftpdlib) +%endif %if %{without bootstrap} BuildRequires: python3dist(distributed) %endif @@ -73,6 +75,9 @@ rm -rf %{srcname}.egg-info %changelog +* Thu Nov 21 2019 Elliott Sales de Andrade - 0.6.0-1 +- Update to latest version + * Thu Oct 17 2019 Elliott Sales de Andrade - 0.5.2-1 - Update to latest version diff --git a/sources b/sources index ce4861c..a319300 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fsspec-0.5.2.tar.gz) = af1d33692c40c577622b65d369cebe39c50a75236d0a515d6d8fea9f3ba2d257bb0386ddd1110cf57d7dea769e1f7ea0f789cf0cd18ff360103bf7da52fc1d15 +SHA512 (fsspec-0.6.0.tar.gz) = 6a8b75eb1bfe8f860dc3ba27fc955305017c076c09deecc5efd8dc742f51acebe4ebeadfdf24c07f3dfd7b49515295e585b74c66d634f2c08a67dd76021faec8