From 647460f0182b15a0a6eb55a413543c71a855008568fe3b5795568d2bf9c02cc6 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Thu, 15 Dec 2022 10:33:46 +0000 Subject: [PATCH] Accepting request 1043093 from home:david.anes:branches:devel:languages:python - Add config.cfg improvements to remove deprecation warnings * python-specfile-improve-setup-cfg.patch - Update to version 0.11.1 * Tags enclosed in conditional macro expansions are not ignored anymore. * Fixed context managers being shared between Specfile instances. 1q - Update to version 0.11.0 * Context managers (Specfile.sections(), Specfile.tags() etc.) can now be nested and combined together (with one exception - Specfile.macro_definitions()), and it is also possible to use tag properties (e.g. Specfile.version, Specfile.license) inside them. It is also possible to access the data directly, avoiding the with statement, by using the content property (e.g. Specfile.tags().content), but be aware that no modifications done to such data will be preserved. You must use with to make changes. OBS-URL: https://build.opensuse.org/request/show/1043093 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-specfile?expand=0&rev=7 --- python-specfile-improve-setup-cfg.patch | 14 ++++++++++++++ python-specfile.changes | 22 ++++++++++++++++++++++ python-specfile.spec | 18 +++++++++++++----- specfile-0.10.0.tar.gz | 3 --- specfile-0.11.1.tar.gz | 3 +++ 5 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 python-specfile-improve-setup-cfg.patch delete mode 100644 specfile-0.10.0.tar.gz create mode 100644 specfile-0.11.1.tar.gz diff --git a/python-specfile-improve-setup-cfg.patch b/python-specfile-improve-setup-cfg.patch new file mode 100644 index 0000000..259b949 --- /dev/null +++ b/python-specfile-improve-setup-cfg.patch @@ -0,0 +1,14 @@ +Index: specfile-0.11.1/setup.cfg +=================================================================== +--- specfile-0.11.1.orig/setup.cfg ++++ specfile-0.11.1/setup.cfg +@@ -7,7 +7,8 @@ url = https://github.com/packit/specfile + author = Red Hat + author_email = user-cont-team@redhat.com + license = MIT +-license_file = LICENSE ++license_files = ++ LICENSE + classifiers = + Development Status :: 4 - Beta + Environment :: Console diff --git a/python-specfile.changes b/python-specfile.changes index e2eabc6..8bae1b0 100644 --- a/python-specfile.changes +++ b/python-specfile.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Dec 13 08:20:36 UTC 2022 - David Anes + +- Add config.cfg improvements to remove deprecation warnings + * python-specfile-improve-setup-cfg.patch + +- Update to version 0.11.1 + * Tags enclosed in conditional macro expansions are not ignored + anymore. + * Fixed context managers being shared between Specfile instances. 1q + +- Update to version 0.11.0 + * Context managers (Specfile.sections(), Specfile.tags() etc.) can + now be nested and combined together (with one exception - + Specfile.macro_definitions()), and it is also possible to use + tag properties (e.g. Specfile.version, Specfile.license) inside + them. It is also possible to access the data directly, avoiding + the with statement, by using the content property + (e.g. Specfile.tags().content), but be aware that no + modifications done to such data will be preserved. You must use + with to make changes. + ------------------------------------------------------------------- Wed Nov 30 17:15:22 UTC 2022 - David Anes diff --git a/python-specfile.spec b/python-specfile.spec index 727f092..75214d2 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -18,7 +18,7 @@ %define skip_python38 1 Name: python-specfile -Version: 0.10.0 +Version: 0.11.1 Release: 0 Summary: A library for parsing and manipulating RPM spec files License: MIT @@ -38,7 +38,12 @@ BuildRequires: fdupes Requires: python-rpm Requires: python-typing-extensions +# PATCH-SUSE: some improvements that are still pending upstream +# https://github.com/packit/specfile/pull/162 +Patch0: python-specfile-improve-setup-cfg.patch + BuildArch: noarch + %python_subpackages %description @@ -46,19 +51,22 @@ A library for parsing and manipulating RPM spec files. %prep %autosetup -p1 -n specfile-%{version} +# we use our own package for "rpm" module (see Requires) sed -i '/rpm-py-installer/d' setup.cfg %build %python_build +%check +# Following tests fail: +# * test_update_tag +# * test_macros_reinit +%pytest -k "not (test_update_tag or test_macros_reinit)" + %install %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -%check -# test_macros_reinit fails -%pytest -k 'not test_macros_reinit' - %files %{python_files} %doc CHANGELOG.md README.md %license LICENSE diff --git a/specfile-0.10.0.tar.gz b/specfile-0.10.0.tar.gz deleted file mode 100644 index 31b5932..0000000 --- a/specfile-0.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2623bf42c47faf6dad18eda53ff4d8b316cad54a44e7e50d3ee91a3ae632be01 -size 72258 diff --git a/specfile-0.11.1.tar.gz b/specfile-0.11.1.tar.gz new file mode 100644 index 0000000..107741d --- /dev/null +++ b/specfile-0.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e3564b447da2b4e4f7d276dcdfee9c8d06cfc4ecc2bed2b8e4febc1f3d51a00 +size 74695