From 41701bbe21a720d1c84e8629671ed98ceca01229cb2805143e9a9f41b0fe02dd Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Fri, 26 Aug 2022 07:47:54 +0000 Subject: [PATCH 1/3] - Inject multibuild to avoid a build cycle. - Update to 5.9.0: * as_file now also supports a Traversable representing a directory and (when needed) renders the full tree to a temporary directory. * In MultiplexedPath, restore expectation that a compound path with a non-existent directory does not raise an exception. * Now Traversable.joinpath provides a concrete implementation, replacing the implementation in .simple and converging with the behavior in MultiplexedPath. * abc.Traversable.joinpath now allows for multiple arguments and specifies that posixpath.sep is allowed in any argument to accept multiple arguments, matching the behavior found in zipfile.Path and pathlib.Path. * Add type declarations in ABCs. * Fix error when no __pycache__ directories exist when testing update-zips. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-importlib-resources?expand=0&rev=7 --- _multibuild | 3 +++ importlib_resources-5.4.0.tar.gz | 3 --- importlib_resources-5.9.0.tar.gz | 3 +++ python-importlib-resources.changes | 18 ++++++++++++++ python-importlib-resources.spec | 40 ++++++++++++++++++++++-------- 5 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 _multibuild delete mode 100644 importlib_resources-5.4.0.tar.gz create mode 100644 importlib_resources-5.9.0.tar.gz diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/importlib_resources-5.4.0.tar.gz b/importlib_resources-5.4.0.tar.gz deleted file mode 100644 index b2f75e9..0000000 --- a/importlib_resources-5.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d756e2f85dd4de2ba89be0b21dba2a3bbec2e871a42a3a16719258a11f87506b -size 30554 diff --git a/importlib_resources-5.9.0.tar.gz b/importlib_resources-5.9.0.tar.gz new file mode 100644 index 0000000..6aed1b1 --- /dev/null +++ b/importlib_resources-5.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5481e97fb45af8dcf2f798952625591c58fe599d0735d86b10f54de086a61681 +size 36314 diff --git a/python-importlib-resources.changes b/python-importlib-resources.changes index 22320e3..04e08f9 100644 --- a/python-importlib-resources.changes +++ b/python-importlib-resources.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Aug 26 07:47:05 UTC 2022 - Steve Kowalik + +- Inject multibuild to avoid a build cycle. +- Update to 5.9.0: + * as_file now also supports a Traversable representing a directory and + (when needed) renders the full tree to a temporary directory. + * In MultiplexedPath, restore expectation that a compound path with a + non-existent directory does not raise an exception. + * Now Traversable.joinpath provides a concrete implementation, replacing + the implementation in .simple and converging with the behavior in + MultiplexedPath. + * abc.Traversable.joinpath now allows for multiple arguments and specifies + that posixpath.sep is allowed in any argument to accept multiple + arguments, matching the behavior found in zipfile.Path and pathlib.Path. + * Add type declarations in ABCs. + * Fix error when no __pycache__ directories exist when testing update-zips. + ------------------------------------------------------------------- Sat Nov 6 18:19:08 UTC 2021 - Dirk Müller diff --git a/python-importlib-resources.spec b/python-importlib-resources.spec index b8a06ea..61ebbf4 100644 --- a/python-importlib-resources.spec +++ b/python-importlib-resources.spec @@ -1,7 +1,7 @@ # -# spec file for package python-importlib-resources +# spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,26 @@ %{?!python_module:%define python3-%{**}} %define skip_python2 1 -Name: python-importlib-resources -Version: 5.4.0 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +Name: python-importlib-resources%{psuffix} +Version: 5.9.0 Release: 0 Summary: Read resources from Python packages License: Apache-2.0 URL: https://importlib-resources.readthedocs.io/ Source: https://files.pythonhosted.org/packages/source/i/importlib_resources/importlib_resources-%{version}.tar.gz -BuildRequires: %{python_module pytest >= 6} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module poetry} BuildRequires: %{python_module setuptools_scm >= 3.4.1} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module testsuite} -BuildRequires: %{python_module toml} -BuildRequires: %{python_module zipp >= 3.1.0 if %python-base < 3.10} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Provides: python-importlib_resources = %{version} @@ -39,6 +46,13 @@ BuildArch: noarch %if 0%{python_version_nodots} < 310 Requires: python-zipp >= 3.1.0 %endif +%if %{with test} +BuildRequires: %{python_module importlib-resources = %{version}} +BuildRequires: %{python_module pytest >= 6} +BuildRequires: %{python_module testsuite} +BuildRequires: %{python_module toml} +BuildRequires: %{python_module zipp >= 3.1.0 if %python-base < 3.10} +%endif %python_subpackages %description @@ -56,21 +70,27 @@ consistent semantics. %setup -q -n importlib_resources-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%if !%{with test} +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif +%if %{with test} %check # create pycache so that update-zips.py does not fail with ValueError python3 -m compileall $PWD/importlib_resources/tests/ %pytest +%endif +%if !%{with test} %files %{python_files} %doc README.rst %license LICENSE %{python_sitelib}/importlib_resources %{python_sitelib}/importlib_resources-%{version}*-info +%endif %changelog From fe4b881e42c8c0a016ba2341539366ed48a25e0f5e2827c7f016b244d25bba5a Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Fri, 26 Aug 2022 07:58:06 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-importlib-resources?expand=0&rev=8 --- _multibuild | 3 --- importlib_resources-5.4.0.tar.gz | 3 +++ importlib_resources-5.9.0.tar.gz | 3 --- python-importlib-resources.changes | 18 -------------- python-importlib-resources.spec | 40 ++++++++---------------------- 5 files changed, 13 insertions(+), 54 deletions(-) delete mode 100644 _multibuild create mode 100644 importlib_resources-5.4.0.tar.gz delete mode 100644 importlib_resources-5.9.0.tar.gz diff --git a/_multibuild b/_multibuild deleted file mode 100644 index fcc7b97..0000000 --- a/_multibuild +++ /dev/null @@ -1,3 +0,0 @@ - - test - diff --git a/importlib_resources-5.4.0.tar.gz b/importlib_resources-5.4.0.tar.gz new file mode 100644 index 0000000..b2f75e9 --- /dev/null +++ b/importlib_resources-5.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d756e2f85dd4de2ba89be0b21dba2a3bbec2e871a42a3a16719258a11f87506b +size 30554 diff --git a/importlib_resources-5.9.0.tar.gz b/importlib_resources-5.9.0.tar.gz deleted file mode 100644 index 6aed1b1..0000000 --- a/importlib_resources-5.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5481e97fb45af8dcf2f798952625591c58fe599d0735d86b10f54de086a61681 -size 36314 diff --git a/python-importlib-resources.changes b/python-importlib-resources.changes index 04e08f9..22320e3 100644 --- a/python-importlib-resources.changes +++ b/python-importlib-resources.changes @@ -1,21 +1,3 @@ -------------------------------------------------------------------- -Fri Aug 26 07:47:05 UTC 2022 - Steve Kowalik - -- Inject multibuild to avoid a build cycle. -- Update to 5.9.0: - * as_file now also supports a Traversable representing a directory and - (when needed) renders the full tree to a temporary directory. - * In MultiplexedPath, restore expectation that a compound path with a - non-existent directory does not raise an exception. - * Now Traversable.joinpath provides a concrete implementation, replacing - the implementation in .simple and converging with the behavior in - MultiplexedPath. - * abc.Traversable.joinpath now allows for multiple arguments and specifies - that posixpath.sep is allowed in any argument to accept multiple - arguments, matching the behavior found in zipfile.Path and pathlib.Path. - * Add type declarations in ABCs. - * Fix error when no __pycache__ directories exist when testing update-zips. - ------------------------------------------------------------------- Sat Nov 6 18:19:08 UTC 2021 - Dirk Müller diff --git a/python-importlib-resources.spec b/python-importlib-resources.spec index 61ebbf4..b8a06ea 100644 --- a/python-importlib-resources.spec +++ b/python-importlib-resources.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-importlib-resources # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,26 +18,19 @@ %{?!python_module:%define python3-%{**}} %define skip_python2 1 -%global flavor @BUILD_FLAVOR@%{nil} -%if "%{flavor}" == "test" -%define psuffix -test -%bcond_without test -%else -%define psuffix %{nil} -%bcond_with test -%endif -Name: python-importlib-resources%{psuffix} -Version: 5.9.0 +Name: python-importlib-resources +Version: 5.4.0 Release: 0 Summary: Read resources from Python packages License: Apache-2.0 URL: https://importlib-resources.readthedocs.io/ Source: https://files.pythonhosted.org/packages/source/i/importlib_resources/importlib_resources-%{version}.tar.gz -BuildRequires: %{python_module pip} -BuildRequires: %{python_module poetry} +BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module setuptools_scm >= 3.4.1} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module wheel} +BuildRequires: %{python_module testsuite} +BuildRequires: %{python_module toml} +BuildRequires: %{python_module zipp >= 3.1.0 if %python-base < 3.10} BuildRequires: fdupes BuildRequires: python-rpm-macros Provides: python-importlib_resources = %{version} @@ -46,13 +39,6 @@ BuildArch: noarch %if 0%{python_version_nodots} < 310 Requires: python-zipp >= 3.1.0 %endif -%if %{with test} -BuildRequires: %{python_module importlib-resources = %{version}} -BuildRequires: %{python_module pytest >= 6} -BuildRequires: %{python_module testsuite} -BuildRequires: %{python_module toml} -BuildRequires: %{python_module zipp >= 3.1.0 if %python-base < 3.10} -%endif %python_subpackages %description @@ -70,27 +56,21 @@ consistent semantics. %setup -q -n importlib_resources-%{version} %build -%pyproject_wheel +%python_build %install -%if !%{with test} -%pyproject_install +%python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -%endif -%if %{with test} %check # create pycache so that update-zips.py does not fail with ValueError python3 -m compileall $PWD/importlib_resources/tests/ %pytest -%endif -%if !%{with test} %files %{python_files} %doc README.rst %license LICENSE %{python_sitelib}/importlib_resources %{python_sitelib}/importlib_resources-%{version}*-info -%endif %changelog From c363eb7410af9d56e1b8bd0b208a33a504c41f6bc382bf917c991b65d71cfc34 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 13 Sep 2022 06:51:34 +0000 Subject: [PATCH 3/3] - Update to 5.9.0: - #228: as_file now also supports a Traversable representing a directory and (when needed) renders the full tree to a temporary directory. - #253: In MultiplexedPath, restore expectation that a compound path with a non-existent directory does not raise an exception. - #250: Now Traversable.joinpath provides a concrete implementation, replacing the implementation in .simple and converging with the behavior in MultiplexedPath. - #249: In simple.ResourceContainer.joinpath, honor names split by posixpath.sep. - #248: abc.Traversable.joinpath now allows for multiple arguments and specifies that posixpath.sep is allowed in any argument to accept multiple arguments, matching the behavior found in zipfile.Path and pathlib.Path simple.ResourceContainer now honors this behavior - #244: Add type declarations in ABCs Require Python 3.7 or later - #243: Fix error when no __pycache__ directories exist when testing update-zips. - Remove BR on python-zipp to break a dependency cycle; it is strictly not needed for build (although it is Requires), because ZipReader is not tested. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-importlib-resources?expand=0&rev=9 --- importlib_resources-5.4.0.tar.gz | 3 --- importlib_resources-5.9.0.tar.gz | 3 +++ python-importlib-resources.changes | 28 ++++++++++++++++++++++++++++ python-importlib-resources.spec | 13 ++++++++----- 4 files changed, 39 insertions(+), 8 deletions(-) delete mode 100644 importlib_resources-5.4.0.tar.gz create mode 100644 importlib_resources-5.9.0.tar.gz diff --git a/importlib_resources-5.4.0.tar.gz b/importlib_resources-5.4.0.tar.gz deleted file mode 100644 index b2f75e9..0000000 --- a/importlib_resources-5.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d756e2f85dd4de2ba89be0b21dba2a3bbec2e871a42a3a16719258a11f87506b -size 30554 diff --git a/importlib_resources-5.9.0.tar.gz b/importlib_resources-5.9.0.tar.gz new file mode 100644 index 0000000..6aed1b1 --- /dev/null +++ b/importlib_resources-5.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5481e97fb45af8dcf2f798952625591c58fe599d0735d86b10f54de086a61681 +size 36314 diff --git a/python-importlib-resources.changes b/python-importlib-resources.changes index 22320e3..f315536 100644 --- a/python-importlib-resources.changes +++ b/python-importlib-resources.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Sep 13 06:45:26 UTC 2022 - Matej Cepl + +- Update to 5.9.0: + - #228: as_file now also supports a Traversable representing + a directory and (when needed) renders the full tree to a + temporary directory. + - #253: In MultiplexedPath, restore expectation that a compound + path with a non-existent directory does not raise an + exception. + - #250: Now Traversable.joinpath provides a concrete + implementation, replacing the implementation in .simple and + converging with the behavior in MultiplexedPath. + - #249: In simple.ResourceContainer.joinpath, honor names split + by posixpath.sep. + - #248: abc.Traversable.joinpath now allows for multiple + arguments and specifies that posixpath.sep is allowed + in any argument to accept multiple arguments, matching + the behavior found in zipfile.Path and pathlib.Path + simple.ResourceContainer now honors this behavior + - #244: Add type declarations in ABCs Require Python 3.7 or + later + - #243: Fix error when no __pycache__ directories exist when + testing update-zips. +- Remove BR on python-zipp to break a dependency cycle; it is + strictly not needed for build (although it is Requires), + because ZipReader is not tested. + ------------------------------------------------------------------- Sat Nov 6 18:19:08 UTC 2021 - Dirk Müller diff --git a/python-importlib-resources.spec b/python-importlib-resources.spec index b8a06ea..e42b7d3 100644 --- a/python-importlib-resources.spec +++ b/python-importlib-resources.spec @@ -1,7 +1,7 @@ # # spec file for package python-importlib-resources # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,18 +19,21 @@ %{?!python_module:%define python3-%{**}} %define skip_python2 1 Name: python-importlib-resources -Version: 5.4.0 +Version: 5.9.0 Release: 0 Summary: Read resources from Python packages License: Apache-2.0 URL: https://importlib-resources.readthedocs.io/ Source: https://files.pythonhosted.org/packages/source/i/importlib_resources/importlib_resources-%{version}.tar.gz +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module setuptools_scm >= 3.4.1} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module testsuite} BuildRequires: %{python_module toml} -BuildRequires: %{python_module zipp >= 3.1.0 if %python-base < 3.10} +BuildRequires: %{python_module wheel} +# Breaking the depcycle; not absolutely needed as ZipReader is not executed in tests. +# BuildRequires: %%{python_module zipp >= 3.1.0 if %%python-base < 3.10} BuildRequires: fdupes BuildRequires: python-rpm-macros Provides: python-importlib_resources = %{version} @@ -56,10 +59,10 @@ consistent semantics. %setup -q -n importlib_resources-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check