From ec51a163a8277cfeec707fe481d485c66035bcf9087ced9f2c7dba32948da13d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 29 Feb 2024 09:02:22 +0000 Subject: [PATCH] Accepting request 1152490 from home:bnavigator:branches:devel:languages:python - Add flake8-comprehensions-pr559-notnormalized.patch gh#adamchainz/flake8-comprehensions#559 OBS-URL: https://build.opensuse.org/request/show/1152490 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flake8-comprehensions?expand=0&rev=28 --- ....tar.gz => flake8-comprehensions-3.14.0-gh.tar.gz | 0 flake8-comprehensions-pr559-notnormalized.patch | 12 ++++++++++++ python-flake8-comprehensions.changes | 6 ++++++ python-flake8-comprehensions.spec | 11 ++++++----- 4 files changed, 24 insertions(+), 5 deletions(-) rename 3.14.0.tar.gz => flake8-comprehensions-3.14.0-gh.tar.gz (100%) create mode 100644 flake8-comprehensions-pr559-notnormalized.patch diff --git a/3.14.0.tar.gz b/flake8-comprehensions-3.14.0-gh.tar.gz similarity index 100% rename from 3.14.0.tar.gz rename to flake8-comprehensions-3.14.0-gh.tar.gz diff --git a/flake8-comprehensions-pr559-notnormalized.patch b/flake8-comprehensions-pr559-notnormalized.patch new file mode 100644 index 0000000..8d57073 --- /dev/null +++ b/flake8-comprehensions-pr559-notnormalized.patch @@ -0,0 +1,12 @@ +diff -ur flake8-comprehensions-3.14.0.orig/tests/test_flake8_comprehensions.py flake8-comprehensions-3.14.0/tests/test_flake8_comprehensions.py +--- flake8-comprehensions-3.14.0.orig/tests/test_flake8_comprehensions.py 2024-02-27 20:40:03.434499715 +0100 ++++ flake8-comprehensions-3.14.0/tests/test_flake8_comprehensions.py 2024-02-27 20:40:14.791498740 +0100 +@@ -22,7 +22,7 @@ + + def test_version(flake8_path): + result = flake8_path.run_flake8(["--version"]) +- version_regex = r"flake8-comprehensions:( )*" + version("flake8-comprehensions") ++ version_regex = r"flake8[-_]comprehensions:( )*" + version("flake8-comprehensions") + unwrapped = "".join(result.out_lines) + assert re.search(version_regex, unwrapped) + diff --git a/python-flake8-comprehensions.changes b/python-flake8-comprehensions.changes index b3aa03a..afa91b3 100644 --- a/python-flake8-comprehensions.changes +++ b/python-flake8-comprehensions.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 27 19:41:44 UTC 2024 - Ben Greiner + +- Add flake8-comprehensions-pr559-notnormalized.patch + gh#adamchainz/flake8-comprehensions#559 + ------------------------------------------------------------------- Tue Jul 11 13:33:29 UTC 2023 - Dirk Müller diff --git a/python-flake8-comprehensions.spec b/python-flake8-comprehensions.spec index eb0d8ce..989ee6b 100644 --- a/python-flake8-comprehensions.spec +++ b/python-flake8-comprehensions.spec @@ -1,7 +1,7 @@ # # spec file for package python-flake8-comprehensions # -# 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,7 +16,6 @@ # -%define skip_python2 1 Name: python-flake8-comprehensions Version: 3.14.0 Release: 0 @@ -24,7 +23,9 @@ Summary: A flake8 plugin to help you write better list/set/dict comprehen License: ISC Group: Development/Languages/Python URL: https://github.com/adamchainz/flake8-comprehensions -Source: https://github.com/adamchainz/flake8-comprehensions/archive/%{version}.tar.gz +Source: https://github.com/adamchainz/flake8-comprehensions/archive/%{version}.tar.gz#/flake8-comprehensions-%{version}-gh.tar.gz +# PATCH-FIX-UPSTREAM flake8-comprehensions-pr559-notnormalized.patch gh#adamchainz/flake8-comprehensions#559 +Patch0: flake8-comprehensions-pr559-notnormalized.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} @@ -45,7 +46,7 @@ BuildRequires: %{python_module pytest} A flake8 plugin that helps you write better list/set/dict comprehensions. %prep -%setup -q -n flake8-comprehensions-%{version} +%autosetup -p1 -n flake8-comprehensions-%{version} %build %pyproject_wheel @@ -61,6 +62,6 @@ A flake8 plugin that helps you write better list/set/dict comprehensions. %license LICENSE %doc README.rst %{python_sitelib}/flake8_comprehensions -%{python_sitelib}/flake8_comprehensions-%{version}*-info +%{python_sitelib}/flake8_comprehensions-%{version}.dist-info %changelog