From 7e3d2eeac60e81cc776d881645a38a45f18e72d97a21648f13cf132eb78e1036 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 4 May 2020 20:33:15 +0000 Subject: [PATCH] - Skip failing test_all_pyflakes_messages_have_flake8_codes_assigned test OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flake8?expand=0&rev=56 --- fix-mock-patch-with-python3.4.patch | 18 +++++++---------- pyflakes-version.patch | 31 +++++++++++++++++++++++++++++ python-flake8.changes | 5 +++++ python-flake8.spec | 6 ++++-- 4 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 pyflakes-version.patch diff --git a/fix-mock-patch-with-python3.4.patch b/fix-mock-patch-with-python3.4.patch index acc523e..38eebff 100644 --- a/fix-mock-patch-with-python3.4.patch +++ b/fix-mock-patch-with-python3.4.patch @@ -3,10 +3,8 @@ Subject: Fix mock.patch with python3.4 In python 3.5, mock.patch uses create=True automatically if you are patching builtins in a module, but in python 3.4 the argument is still needed. -Index: flake8-3.7.5/tests/unit/test_debug.py -=================================================================== ---- flake8-3.7.5.orig/tests/unit/test_debug.py -+++ flake8-3.7.5/tests/unit/test_debug.py +--- a/tests/unit/test_debug.py ++++ b/tests/unit/test_debug.py @@ -70,7 +70,7 @@ def test_information(system, pyversion, system.assert_called_once_with() @@ -16,7 +14,7 @@ Index: flake8-3.7.5/tests/unit/test_debug.py @mock.patch('flake8.main.debug.information', return_value={}) @mock.patch('json.dumps', return_value='{}') def test_print_information_no_plugins(dumps, information, print_mock): -@@ -85,7 +85,7 @@ def test_print_information_no_plugins(du +@@ -84,7 +84,7 @@ def test_print_information_no_plugins(du assert print_mock.called is False @@ -25,10 +23,8 @@ Index: flake8-3.7.5/tests/unit/test_debug.py @mock.patch('flake8.main.debug.information', return_value={}) @mock.patch('json.dumps', return_value='{}') def test_print_information(dumps, information, print_mock): -Index: flake8-3.7.5/tests/unit/test_base_formatter.py -=================================================================== ---- flake8-3.7.5.orig/tests/unit/test_base_formatter.py -+++ flake8-3.7.5/tests/unit/test_base_formatter.py +--- a/tests/unit/test_base_formatter.py ++++ b/tests/unit/test_base_formatter.py @@ -23,7 +23,7 @@ def test_start(filename): """Verify we open a new file in the start method.""" mock_open = mock.mock_open() @@ -38,7 +34,7 @@ Index: flake8-3.7.5/tests/unit/test_base_formatter.py formatter.start() if filename is None: -@@ -90,7 +90,7 @@ def test_write_uses_an_output_file(tee): +@@ -93,7 +93,7 @@ def test_write_uses_an_output_file(tee): formatter = base.BaseFormatter(options(tee=tee)) formatter.output_fd = filemock @@ -47,7 +43,7 @@ Index: flake8-3.7.5/tests/unit/test_base_formatter.py formatter.write(line, source) if tee: assert print_func.called -@@ -109,7 +109,7 @@ def test_write_uses_an_output_file(tee): +@@ -112,7 +112,7 @@ def test_write_uses_an_output_file(tee): ] diff --git a/pyflakes-version.patch b/pyflakes-version.patch new file mode 100644 index 0000000..bb3809c --- /dev/null +++ b/pyflakes-version.patch @@ -0,0 +1,31 @@ +--- a/setup.cfg ++++ b/setup.cfg +@@ -9,7 +9,7 @@ requires-dist = + configparser; python_version<"3.2" + functools32; python_version<"3.2" + entrypoints >= 0.3.0, < 0.4.0 +- pyflakes >= 2.1.0, < 2.2.0 ++ pyflakes >= 2.1.0, <= 2.2.0 + pycodestyle >= 2.5.0, < 2.6.0 + mccabe >= 0.6.0, < 0.7.0 + +--- a/setup.py ++++ b/setup.py +@@ -26,7 +26,7 @@ requires = [ + # And in which releases we will update those ranges here: + # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8 + "entrypoints >= 0.3.0, < 0.4.0", +- "pyflakes >= 2.1.0, < 2.2.0", ++ "pyflakes >= 2.1.0, <= 2.2.0", + "pycodestyle >= 2.5.0, < 2.6.0", + "mccabe >= 0.6.0, < 0.7.0", + ] +--- a/src/flake8.egg-info/requires.txt ++++ b/src/flake8.egg-info/requires.txt +@@ -1,5 +1,5 @@ + entrypoints<0.4.0,>=0.3.0 +-pyflakes<2.2.0,>=2.1.0 ++pyflakes<=2.2.0,>=2.1.0 + pycodestyle<2.6.0,>=2.5.0 + mccabe<0.7.0,>=0.6.0 + diff --git a/python-flake8.changes b/python-flake8.changes index 6656e18..5e9233e 100644 --- a/python-flake8.changes +++ b/python-flake8.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 4 20:02:18 UTC 2020 - Matej Cepl + +- Skip failing test_all_pyflakes_messages_have_flake8_codes_assigned test + ------------------------------------------------------------------- Wed Nov 20 14:56:16 UTC 2019 - Tomáš Chvátal diff --git a/python-flake8.spec b/python-flake8.spec index c1d9353..e87e94c 100644 --- a/python-flake8.spec +++ b/python-flake8.spec @@ -1,7 +1,7 @@ # # spec file for package python-flake8 # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ URL: https://gitlab.com/pycqa/flake8 Source: https://files.pythonhosted.org/packages/source/f/flake8/flake8-%{version}.tar.gz Patch0: remove_mock_dependency.patch Patch1: fix-mock-patch-with-python3.4.patch +Patch2: pyflakes-version.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -100,7 +101,8 @@ This package provides documentation for %{name}. %python_uninstall_alternative flake8 %check -%pytest tests +# gl#pycqa/flake8#633 +%pytest -k 'not test_all_pyflakes_messages_have_flake8_codes_assigned' tests %files %{python_files} %license LICENSE