- 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
This commit is contained in:
Matej Cepl 2020-05-04 20:33:15 +00:00 committed by Git OBS Bridge
parent 211a3d8449
commit 7e3d2eeac6
4 changed files with 47 additions and 13 deletions

View File

@ -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 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. builtins in a module, but in python 3.4 the argument is still needed.
Index: flake8-3.7.5/tests/unit/test_debug.py --- a/tests/unit/test_debug.py
=================================================================== +++ b/tests/unit/test_debug.py
--- flake8-3.7.5.orig/tests/unit/test_debug.py
+++ flake8-3.7.5/tests/unit/test_debug.py
@@ -70,7 +70,7 @@ def test_information(system, pyversion, @@ -70,7 +70,7 @@ def test_information(system, pyversion,
system.assert_called_once_with() 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('flake8.main.debug.information', return_value={})
@mock.patch('json.dumps', return_value='{}') @mock.patch('json.dumps', return_value='{}')
def test_print_information_no_plugins(dumps, information, print_mock): 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 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('flake8.main.debug.information', return_value={})
@mock.patch('json.dumps', return_value='{}') @mock.patch('json.dumps', return_value='{}')
def test_print_information(dumps, information, print_mock): def test_print_information(dumps, information, print_mock):
Index: flake8-3.7.5/tests/unit/test_base_formatter.py --- a/tests/unit/test_base_formatter.py
=================================================================== +++ b/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
@@ -23,7 +23,7 @@ def test_start(filename): @@ -23,7 +23,7 @@ def test_start(filename):
"""Verify we open a new file in the start method.""" """Verify we open a new file in the start method."""
mock_open = mock.mock_open() mock_open = mock.mock_open()
@ -38,7 +34,7 @@ Index: flake8-3.7.5/tests/unit/test_base_formatter.py
formatter.start() formatter.start()
if filename is None: 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 = base.BaseFormatter(options(tee=tee))
formatter.output_fd = filemock formatter.output_fd = filemock
@ -47,7 +43,7 @@ Index: flake8-3.7.5/tests/unit/test_base_formatter.py
formatter.write(line, source) formatter.write(line, source)
if tee: if tee:
assert print_func.called 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):
] ]

31
pyflakes-version.patch Normal file
View File

@ -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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 4 20:02:18 UTC 2020 - Matej Cepl <mcepl@suse.com>
- Skip failing test_all_pyflakes_messages_have_flake8_codes_assigned test
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 20 14:56:16 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> Wed Nov 20 14:56:16 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-flake8 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 Source: https://files.pythonhosted.org/packages/source/f/flake8/flake8-%{version}.tar.gz
Patch0: remove_mock_dependency.patch Patch0: remove_mock_dependency.patch
Patch1: fix-mock-patch-with-python3.4.patch Patch1: fix-mock-patch-with-python3.4.patch
Patch2: pyflakes-version.patch
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
@ -100,7 +101,8 @@ This package provides documentation for %{name}.
%python_uninstall_alternative flake8 %python_uninstall_alternative flake8
%check %check
%pytest tests # gl#pycqa/flake8#633
%pytest -k 'not test_all_pyflakes_messages_have_flake8_codes_assigned' tests
%files %{python_files} %files %{python_files}
%license LICENSE %license LICENSE