From 9dde484c304b491b317aa2921d221bf0daf3ca3883890f68d28d5b0b03f5ae7b Mon Sep 17 00:00:00 2001
From: Daniel Garcia <daniel.garcia@suse.com>
Date: Sat, 8 Oct 2022 16:44:38 +0000
Subject: [PATCH] - Update to 2.0.0:   * Update dependencies. [gforcada]   *
 Test the code on GitHub actions. [gforcada]   * Drop python 2.7 and only
 support python 3.7+. [gforcada]   * Use linters and formatters to keep code
 sane and beautiful. [gforcada]   * Simplify the amount of code to write a
 test. [gforcada] - Delete 29.patch, not needed anymore

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flake8-pep3101?expand=0&rev=6
---
 29.patch                      | 25 -------------------------
 flake8-pep3101-1.3.0.tar.gz   |  3 ---
 flake8-pep3101-2.0.0.tar.gz   |  3 +++
 python-flake8-pep3101.changes | 11 +++++++++++
 python-flake8-pep3101.spec    |  6 ++----
 5 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 29.patch
 delete mode 100644 flake8-pep3101-1.3.0.tar.gz
 create mode 100644 flake8-pep3101-2.0.0.tar.gz

diff --git a/29.patch b/29.patch
deleted file mode 100644
index 30004a5..0000000
--- a/29.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c196256a0f24d43bc45afb4c2d88b2b1a0008f37 Mon Sep 17 00:00:00 2001
-From: Daniel Garcia Moreno <daniel.garcia@suse.com>
-Date: Tue, 4 Oct 2022 18:15:16 +0200
-Subject: [PATCH] tests: Fix test_multiline_formatter
-
-This test fails with the latest version of flake8 because it tries to
-write to sys.stdout.buffer and the OutputCapture by default uses
-StringIO. This patch changes this specific test to use files instead.
----
- run_tests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/run_tests.py b/run_tests.py
-index 95f5c28..9c5e911 100644
---- a/run_tests.py
-+++ b/run_tests.py
-@@ -62,7 +62,7 @@ def test_multiline_formatter(self):
-             '% (\'world\'))',
-         ]))
-         app = application.Application()
--        with OutputCapture() as output:
-+        with OutputCapture(fd=True) as output:
-             app.run([file_path, ])
- 
-         self.assertIn(
diff --git a/flake8-pep3101-1.3.0.tar.gz b/flake8-pep3101-1.3.0.tar.gz
deleted file mode 100644
index 4035252..0000000
--- a/flake8-pep3101-1.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86e3eb4e42de8326dcd98ebdeaf9a3c6854203a48f34aeb3e7e8ed948107f512
-size 11959
diff --git a/flake8-pep3101-2.0.0.tar.gz b/flake8-pep3101-2.0.0.tar.gz
new file mode 100644
index 0000000..1180cef
--- /dev/null
+++ b/flake8-pep3101-2.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae2ee1758734a473ca971b4bf9ff09c961b6099916db91fdb6b9718328dfcacb
+size 13179
diff --git a/python-flake8-pep3101.changes b/python-flake8-pep3101.changes
index eb1396c..bf2f8da 100644
--- a/python-flake8-pep3101.changes
+++ b/python-flake8-pep3101.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Oct  8 16:43:35 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Update to 2.0.0:
+  * Update dependencies. [gforcada]
+  * Test the code on GitHub actions. [gforcada]
+  * Drop python 2.7 and only support python 3.7+. [gforcada]
+  * Use linters and formatters to keep code sane and beautiful. [gforcada]
+  * Simplify the amount of code to write a test. [gforcada]
+- Delete 29.patch, not needed anymore
+
 -------------------------------------------------------------------
 Tue Oct  4 16:20:28 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
 
diff --git a/python-flake8-pep3101.spec b/python-flake8-pep3101.spec
index 0b14abe..c51fe65 100644
--- a/python-flake8-pep3101.spec
+++ b/python-flake8-pep3101.spec
@@ -18,15 +18,13 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-flake8-pep3101
-Version:        1.3.0
+Version:        2.0.0
 Release:        0
 Summary:        Checks for old string formatting
 License:        GPL-2.0-only
 Group:          Development/Languages/Python
 URL:            https://github.com/gforcada/flake8-pep3101
 Source:         https://files.pythonhosted.org/packages/source/f/flake8-pep3101/flake8-pep3101-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM 29.patch gh#gforcada/flake8-pep3101#29
-Patch:          https://github.com/gforcada/flake8-pep3101/pull/29.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -57,7 +55,7 @@ Checks for old string formatting.
 
 %files %{python_files}
 %doc CHANGES.rst README.rst
-%license LICENSE LICENSE.rst
+%license LICENSE
 %{python_sitelib}/*
 
 %changelog