From 8ddc51549a6c33204c5cab24c17f707eae5b712a1c2abc80ffef0825526e8120 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 2 Jan 2023 16:42:02 +0000 Subject: [PATCH 1/2] - update to 3.3.2: * support flake8 6.0 - drop support-flake8-6.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flake8-quotes?expand=0&rev=18 --- flake8-quotes-3.3.1.tar.gz | 3 --- flake8-quotes-3.3.2.tar.gz | 3 +++ python-flake8-quotes.changes | 7 +++++++ python-flake8-quotes.spec | 8 +++----- 4 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 flake8-quotes-3.3.1.tar.gz create mode 100644 flake8-quotes-3.3.2.tar.gz diff --git a/flake8-quotes-3.3.1.tar.gz b/flake8-quotes-3.3.1.tar.gz deleted file mode 100644 index 1e37956..0000000 --- a/flake8-quotes-3.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:633adca6fb8a08131536af0d750b44d6985b9aba46f498871e21588c3e6f525a -size 13302 diff --git a/flake8-quotes-3.3.2.tar.gz b/flake8-quotes-3.3.2.tar.gz new file mode 100644 index 0000000..b9fb1a6 --- /dev/null +++ b/flake8-quotes-3.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e26892b632dacba517bf27219c459a8396dcfac0f5e8204904c5a4ba9b480e1 +size 12530 diff --git a/python-flake8-quotes.changes b/python-flake8-quotes.changes index fe88775..824dfdc 100644 --- a/python-flake8-quotes.changes +++ b/python-flake8-quotes.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 2 16:39:55 UTC 2023 - Dirk Müller + +- update to 3.3.2: + * support flake8 6.0 +- drop support-flake8-6.patch (upstream) + ------------------------------------------------------------------- Mon Dec 19 09:01:02 UTC 2022 - Martin Liška diff --git a/python-flake8-quotes.spec b/python-flake8-quotes.spec index b99e0bf..2e8e083 100644 --- a/python-flake8-quotes.spec +++ b/python-flake8-quotes.spec @@ -1,7 +1,7 @@ # # spec file for package python-flake8-quotes # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global skip_python2 1 Name: python-flake8-quotes -Version: 3.3.1 +Version: 3.3.2 Release: 0 Summary: Flake8 lint for quotes License: MIT Group: Development/Languages/Python URL: https://github.com/zheller/flake8-quotes/ Source: https://files.pythonhosted.org/packages/source/f/flake8-quotes/flake8-quotes-%{version}.tar.gz -Patch0: support-flake8-6.patch -BuildRequires: %{python_module flake8 >= 3.3.0} +BuildRequires: %{python_module flake8 >= 3.5.0} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -41,7 +40,6 @@ Flake8 Extension to lint for quotes. %prep %setup -q -n flake8-quotes-%{version} -%patch0 -p1 %build %python_build From 0e075309641178a977c602c89493e8002b683535dac598aca453a5690ee849c7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 2 Jan 2023 16:42:08 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flake8-quotes?expand=0&rev=19 --- support-flake8-6.patch | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 support-flake8-6.patch diff --git a/support-flake8-6.patch b/support-flake8-6.patch deleted file mode 100644 index 6fd53b4..0000000 --- a/support-flake8-6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 46d1fdba5c8fb08ae95cdba07b443cd770f8feee Mon Sep 17 00:00:00 2001 -From: Alexandru Fikl -Date: Thu, 24 Nov 2022 08:48:03 +0200 -Subject: [PATCH] update add_options for flake8 6.0 - ---- - flake8_quotes/__init__.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/flake8_quotes/__init__.py b/flake8_quotes/__init__.py -index 3113d7c..7344e3d 100644 ---- a/flake8_quotes/__init__.py -+++ b/flake8_quotes/__init__.py -@@ -107,19 +107,19 @@ def _register_opt(parser, *args, **kwargs): - @classmethod - def add_options(cls, parser): - cls._register_opt(parser, '--quotes', action='store', -- parse_from_config=True, type='choice', -+ parse_from_config=True, - choices=sorted(cls.INLINE_QUOTES.keys()), - help='Deprecated alias for `--inline-quotes`') - cls._register_opt(parser, '--inline-quotes', default="'", -- action='store', parse_from_config=True, type='choice', -+ action='store', parse_from_config=True, - choices=sorted(cls.INLINE_QUOTES.keys()), - help="Quote to expect in all files (default: ')") - cls._register_opt(parser, '--multiline-quotes', default=None, action='store', -- parse_from_config=True, type='choice', -+ parse_from_config=True, - choices=sorted(cls.MULTILINE_QUOTES.keys()), - help='Quote to expect in all files (default: """)') - cls._register_opt(parser, '--docstring-quotes', default=None, action='store', -- parse_from_config=True, type='choice', -+ parse_from_config=True, - choices=sorted(cls.DOCSTRING_QUOTES.keys()), - help='Quote to expect in all files (default: """)') - cls._register_opt(parser, '--avoid-escape', default=None, action='store_true',