From 059ec196f70db71c95474ca78cecc8dd0263d797 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Mar 16 2023 08:08:51 +0000 Subject: Update to 2.4.16 version --- diff --git a/.gitignore b/.gitignore index 8b22d65..19dda9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /fs-2.4.11.tar.gz +/fs-2.4.16.tar.gz diff --git a/fix-for-py3.9-release.patch b/fix-for-py3.9-release.patch deleted file mode 100644 index c30e964..0000000 --- a/fix-for-py3.9-release.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -urN pyfilesystem2-2.4.11-old/fs/test.py pyfilesystem2-2.4.11/fs/test.py ---- pyfilesystem2-2.4.11-old/fs/test.py 2019-09-07 20:26:42.000000000 +0530 -+++ pyfilesystem2-2.4.11/fs/test.py 2020-05-28 21:37:44.655506430 +0530 -@@ -1061,7 +1061,7 @@ - self.fs.makedirs("foo/bar/baz/") - - error_msg = "resource 'foo/bar/egg/test.txt' not found" -- with self.assertRaisesRegexp(errors.ResourceNotFound, error_msg): -+ with self.assertRaisesRegex(errors.ResourceNotFound, error_msg): - self.fs.remove("foo/bar/egg/test.txt") - - def test_removedir(self): -diff -urN pyfilesystem2-2.4.11-old/tests/test_iotools.py pyfilesystem2-2.4.11/tests/test_iotools.py ---- pyfilesystem2-2.4.11-old/tests/test_iotools.py 2019-09-07 20:26:42.000000000 +0530 -+++ pyfilesystem2-2.4.11/tests/test_iotools.py 2020-05-28 21:37:01.853039587 +0530 -@@ -26,7 +26,7 @@ - - with self.fs.openbin("foo.bin") as f: - data = f.read() -- self.assert_(isinstance(data, bytes)) -+ self.assertTrue(isinstance(data, bytes)) - - with self.fs.openbin("text.txt", "wb") as f: - f.write(UNICODE_TEXT.encode("utf-8")) -diff -urN pyfilesystem2-2.4.11-old/tests/test_path.py pyfilesystem2-2.4.11/tests/test_path.py ---- pyfilesystem2-2.4.11-old/tests/test_path.py 2019-09-07 20:26:42.000000000 +0530 -+++ pyfilesystem2-2.4.11/tests/test_path.py 2020-05-28 21:36:28.600676906 +0530 -@@ -152,14 +152,14 @@ - self.assertEqual(splitext(".foo"), (".foo", "")) - - def test_recursepath(self): -- self.assertEquals(recursepath("/"), ["/"]) -- self.assertEquals(recursepath("hello"), ["/", "/hello"]) -- self.assertEquals(recursepath("/hello/world/"), ["/", "/hello", "/hello/world"]) -- self.assertEquals( -+ self.assertEqual(recursepath("/"), ["/"]) -+ self.assertEqual(recursepath("hello"), ["/", "/hello"]) -+ self.assertEqual(recursepath("/hello/world/"), ["/", "/hello", "/hello/world"]) -+ self.assertEqual( - recursepath("/hello/world/", reverse=True), ["/hello/world", "/hello", "/"] - ) -- self.assertEquals(recursepath("hello", reverse=True), ["/hello", "/"]) -- self.assertEquals(recursepath("", reverse=True), ["/"]) -+ self.assertEqual(recursepath("hello", reverse=True), ["/hello", "/"]) -+ self.assertEqual(recursepath("", reverse=True), ["/"]) - - def test_isbase(self): - self.assertTrue(isbase("foo", "foo/bar")) -@@ -178,7 +178,7 @@ - - def test_isdotfile(self): - for path in [".foo", ".svn", "foo/.svn", "foo/bar/.svn", "/foo/.bar"]: -- self.assert_(isdotfile(path)) -+ self.assertTrue(isdotfile(path)) - - for path in ["asfoo", "df.svn", "foo/er.svn", "foo/bar/test.txt", "/foo/bar"]: - self.assertFalse(isdotfile(path)) -@@ -201,10 +201,10 @@ - self.assertEqual(basename(path), test_basename) - - def test_iswildcard(self): -- self.assert_(iswildcard("*")) -- self.assert_(iswildcard("*.jpg")) -- self.assert_(iswildcard("foo/*")) -- self.assert_(iswildcard("foo/{}")) -+ self.assertTrue(iswildcard("*")) -+ self.assertTrue(iswildcard("*.jpg")) -+ self.assertTrue(iswildcard("foo/*")) -+ self.assertTrue(iswildcard("foo/{}")) - self.assertFalse(iswildcard("foo")) - self.assertFalse(iswildcard("img.jpg")) - self.assertFalse(iswildcard("foo/bar")) diff --git a/python-fs.spec b/python-fs.spec index 1acdf7a..2c62049 100644 --- a/python-fs.spec +++ b/python-fs.spec @@ -1,26 +1,24 @@ %global srcname fs Name: python-%{srcname} -Version: 2.4.11 -Release: 13%{?dist} +Version: 2.4.16 +Release: 1%{?dist} Summary: Python's Filesystem abstraction layer License: MIT URL: https://pypi.org/project/fs/ Source0: https://github.com/PyFilesystem/pyfilesystem2/archive/v%{version}/%{srcname}-%{version}.tar.gz -Patch0: fix-for-py3.9-release.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3dist(appdirs) -BuildRequires: python3dist(pytz) BuildRequires: python3dist(six) # Required for running tests BuildRequires: python3dist(pytest) BuildRequires: python3dist(pytest-randomly) - +BuildRequires: python3dist(parameterized) %global _description %{expand: Think of PyFilesystem's FS objects as the next logical step to Python's file @@ -31,7 +29,6 @@ abstract an entire filesystem.} %package -n python3-%{srcname} Summary: %{summary} -%{?python_provide:%python_provide python3-%{srcname}} %description -n python3-%{srcname} %_description @@ -46,15 +43,18 @@ Summary: %{summary} %check # tests/test_ftpfs.py needs pyftpdlib (not packaged yet) -%{python3} -m pytest --ignore tests/test_ftpfs.py --ignore tests/test_osfs.py --ignore tests/test_subfs.py --ignore tests/test_tempfs.py +%{python3} -m pytest --ignore tests/test_ftpfs.py %files -n python3-%{srcname} %license LICENSE -%doc README.md +%doc README.md examples %{python3_sitelib}/%{srcname}-*.egg-info/ %{python3_sitelib}/%{srcname}/ %changelog +* Thu Mar 16 2023 Parag Nemade - 2.4.16-1 +- Update to 2.4.16 version + * Fri Jan 20 2023 Fedora Release Engineering - 2.4.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 1482a10..5a7a79a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fs-2.4.11.tar.gz) = fe4596bf213f9b1721cd3c665e6af180d6617eea07afbaa9d83847dc3f7dfe64bca16c8ccb337d48bbb49bf0d2fef90903e3c4aecc63f61faac6a2b6f6c59cf6 +SHA512 (fs-2.4.16.tar.gz) = 24a50fdbb668916e19ef26b21feb345beb6d734e841435de2bef32672e4f6b8329a44e827b6d3bb878c2522098499dea4915adcfa381b0a3c9e20f8c4f7352bb diff --git a/tests/tests.yml b/tests/tests.yml index 1221d83..a2d52ce 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -11,11 +11,11 @@ required_packages: - python3-pytest - python3-appdirs - - python3-pytz + - python3-parameterized - python3-six tests: - simple: dir: ./source - run: python3 -m pytest -v --ignore tests/test_ftpfs.py --ignore tests/test_osfs.py --ignore tests/test_subfs.py --ignore tests/test_tempfs.py + run: python3 -m pytest -v --ignore tests/test_ftpfs.py