From acef30e262ff061a082cb1cfbacf3df75dbd745d50a6a84ecb9922e90deb5f47 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 17 Jan 2024 21:32:23 +0000 Subject: [PATCH 1/3] - Update to 0.11.1: - Typo caused reading from stdin to fail - Add arguments --encoding and --encoding-errors OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-screenplain?expand=0&rev=17 --- python-screenplain.changes | 7 +++++++ python-screenplain.spec | 18 ++++++------------ screenplain-0.10.0.tar.gz | 3 --- screenplain-0.11.1.tar.gz | 3 +++ 4 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 screenplain-0.10.0.tar.gz create mode 100644 screenplain-0.11.1.tar.gz diff --git a/python-screenplain.changes b/python-screenplain.changes index 7dcc21d..d065d31 100644 --- a/python-screenplain.changes +++ b/python-screenplain.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 17 21:28:06 UTC 2024 - Matej Cepl + +- Update to 0.11.1: + - Typo caused reading from stdin to fail + - Add arguments --encoding and --encoding-errors + ------------------------------------------------------------------- Wed Nov 29 14:51:09 UTC 2023 - Matej Cepl diff --git a/python-screenplain.spec b/python-screenplain.spec index 4e8a529..3ab489e 100644 --- a/python-screenplain.spec +++ b/python-screenplain.spec @@ -1,7 +1,7 @@ # # spec file for package python-screenplain # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,13 @@ # -%if 0%{?suse_version} > 1500 -%bcond_with python2 -%else -%bcond_without python2 -%endif Name: python-screenplain -Version: 0.10.0 +Version: 0.11.1 Release: 0 Summary: Convert text file to viewable screenplay License: MIT Group: Development/Languages/Python -URL: http://www.screenplain.com/ +URL: https://www.screenplain.com/ Source: https://files.pythonhosted.org/packages/source/s/screenplain/screenplain-%{version}.tar.gz # Tarball generated from gh#vilcans/screenplain#62 # Source: screenplain-%%{version}.tar.gz @@ -40,11 +35,10 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildArch: noarch Requires: python-reportlab Requires(post): update-alternatives Requires(postun):update-alternatives - +BuildArch: noarch %python_subpackages %description @@ -69,10 +63,10 @@ be supported in a not too distant future. sed -i '1{/^#!.*env python/d}' screenplain/main.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/screenplain %python_expand %fdupes %{buildroot}%{$python_sitelib} diff --git a/screenplain-0.10.0.tar.gz b/screenplain-0.10.0.tar.gz deleted file mode 100644 index e405993..0000000 --- a/screenplain-0.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32c64d82380d160901c7a4e4d9a58ae14233b2a2007a5c1b57e1578048b9b991 -size 17752 diff --git a/screenplain-0.11.1.tar.gz b/screenplain-0.11.1.tar.gz new file mode 100644 index 0000000..5eea0cf --- /dev/null +++ b/screenplain-0.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b729def0b14b14d32ebbe0d8639b264b942003c58dd687b18fd77937ac399da +size 18029 From 7247e3bd40f19d6fba46493f990b08832e77d1764063173d38700c44dbc811d2 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 17 Jan 2024 21:40:41 +0000 Subject: [PATCH 2/3] - Update to version 0.11.1+git.1701424578.13b79f2: * Typo caused reading from stdin to fail * Add arguments --encoding and --encoding-errors OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-screenplain?expand=0&rev=18 --- _service | 12 +++++------- _servicedata | 4 +++- python-screenplain.changes | 8 ++++---- python-screenplain.spec | 6 +++--- screenplain-0.11.1+git.1701424578.13b79f2.tar.gz | 3 +++ screenplain-0.11.1.tar.gz | 3 --- 6 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 screenplain-0.11.1+git.1701424578.13b79f2.tar.gz delete mode 100644 screenplain-0.11.1.tar.gz diff --git a/_service b/_service index f7ce2bc..1dad155 100644 --- a/_service +++ b/_service @@ -1,17 +1,15 @@ - - 0.9.0+git - - https://git.sr.ht/~mcepl/screenplain - cleanup-testing + + 0.11.1+git + https://github.com/vilcans/screenplain.git git .git* enable mcepl@cepl.eu - + *.tar gz - + diff --git a/_servicedata b/_servicedata index db9826f..d67a2b5 100644 --- a/_servicedata +++ b/_servicedata @@ -5,4 +5,6 @@ https://git.sr.ht/~mcepl/screenplay 302bfdd3362f4287a471cff80908e018bc09f990 https://git.sr.ht/~mcepl/screenplain - 353e6c94e996055880c07a3846cb51b98e19dfa2 \ No newline at end of file + 353e6c94e996055880c07a3846cb51b98e19dfa2 + https://github.com/vilcans/screenplain.git + 13b79f2dd0bf8f584965269137893dea50378b39 \ No newline at end of file diff --git a/python-screenplain.changes b/python-screenplain.changes index d065d31..d277328 100644 --- a/python-screenplain.changes +++ b/python-screenplain.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- -Wed Jan 17 21:28:06 UTC 2024 - Matej Cepl +Wed Jan 17 21:39:48 UTC 2024 - mcepl@cepl.eu -- Update to 0.11.1: - - Typo caused reading from stdin to fail - - Add arguments --encoding and --encoding-errors +- Update to version 0.11.1+git.1701424578.13b79f2: + * Typo caused reading from stdin to fail + * Add arguments --encoding and --encoding-errors ------------------------------------------------------------------- Wed Nov 29 14:51:09 UTC 2023 - Matej Cepl diff --git a/python-screenplain.spec b/python-screenplain.spec index 3ab489e..3948f3e 100644 --- a/python-screenplain.spec +++ b/python-screenplain.spec @@ -17,15 +17,15 @@ Name: python-screenplain -Version: 0.11.1 +Version: 0.11.1+git.1701424578.13b79f2 Release: 0 Summary: Convert text file to viewable screenplay License: MIT Group: Development/Languages/Python URL: https://www.screenplain.com/ -Source: https://files.pythonhosted.org/packages/source/s/screenplain/screenplain-%{version}.tar.gz +# Source: https://files.pythonhosted.org/packages/source/s/screenplain/screenplain-%{version}.tar.gz # Tarball generated from gh#vilcans/screenplain#62 -# Source: screenplain-%%{version}.tar.gz +Source: screenplain-%{version}.tar.gz # PATCH-FIX-UPSTREAM fix_entry_point.patch mcepl@suse.com # entry point lead to incorrect function. Patch0: fix_entry_point.patch diff --git a/screenplain-0.11.1+git.1701424578.13b79f2.tar.gz b/screenplain-0.11.1+git.1701424578.13b79f2.tar.gz new file mode 100644 index 0000000..aa33d5b --- /dev/null +++ b/screenplain-0.11.1+git.1701424578.13b79f2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa0f47447785c62f89c5d2a6b9eff93ed7a215d62b0c9b907b2e9956a5207591 +size 25677 diff --git a/screenplain-0.11.1.tar.gz b/screenplain-0.11.1.tar.gz deleted file mode 100644 index 5eea0cf..0000000 --- a/screenplain-0.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b729def0b14b14d32ebbe0d8639b264b942003c58dd687b18fd77937ac399da -size 18029 From d5089f31a1e82d2455adbb9125117a86177d0202178831687179abe50a9433cb Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 17 Jan 2024 23:07:16 +0000 Subject: [PATCH 3/3] Clean up patches. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-screenplain?expand=0&rev=19 --- fix_entry_point.patch | 15 +-------------- python-screenplain.spec | 4 ++-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/fix_entry_point.patch b/fix_entry_point.patch index 8abf4f6..34a8afc 100644 --- a/fix_entry_point.patch +++ b/fix_entry_point.patch @@ -1,7 +1,6 @@ --- screenplain/main.py | 2 +- - setup.cfg | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) + 1 file changed, 1 insertion(+), 1 deletion(-) --- a/screenplain/main.py +++ b/screenplain/main.py @@ -14,15 +13,3 @@ parser = OptionParser(usage=usage) parser.add_option( '-f', '--format', dest='output_format', ---- a/setup.cfg -+++ b/setup.cfg -@@ -1,6 +1,9 @@ - [metadata] - license_files = LICENSE.txt - -+[pycodestyle] -+ignore = E275,E402,W504 -+ - [egg_info] - tag_build = - tag_date = 0 diff --git a/python-screenplain.spec b/python-screenplain.spec index 3948f3e..2ad4923 100644 --- a/python-screenplain.spec +++ b/python-screenplain.spec @@ -23,7 +23,7 @@ Summary: Convert text file to viewable screenplay License: MIT Group: Development/Languages/Python URL: https://www.screenplain.com/ -# Source: https://files.pythonhosted.org/packages/source/s/screenplain/screenplain-%{version}.tar.gz +# Source: https://files.pythonhosted.org/packages/source/s/screenplain/screenplain-%%{version}.tar.gz # Tarball generated from gh#vilcans/screenplain#62 Source: screenplain-%{version}.tar.gz # PATCH-FIX-UPSTREAM fix_entry_point.patch mcepl@suse.com @@ -83,6 +83,6 @@ sed -i '1{/^#!.*env python/d}' screenplain/main.py %files %{python_files} %python_alternative %{_bindir}/screenplain %{python_sitelib}/screenplain -%{python_sitelib}/screenplain-%{version}*-info +%{python_sitelib}/screenplain-0.11.1*-info %changelog