pool/python-flake8
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
a15f4220a7
python-flake8/remove_mock_dependency.patch
Matej Cepl a15f4220a7 Accepting request 671477 from home:alarrosa:branches:devel:languages:python 
- Update to version 3.7.5:
  * Bugs Fixed
    + Fix reporting of pyflakes "referenced before assignment" error
      (See also GitLab!301, GitLab#503)
- Update to version 3.7.4:
  * Bugs Fixed
    + Fix performance regression with lots of per-file-ignores and errors
      (See also GitLab!299, GitLab#501)
- Update to version 3.7.3:
  * Bugs Fixed
    + Fix imports of typing in python 3.5.0 / 3.5.1 (See also GitLab!294,
      GitLab#498)
    + Fix flake8 --statistics (See also GitLab!295, GitLab#499)
    + Gracefully ignore flake8-per-file-ignores plugin if installed
      (See also GitLab!297, GitLab#495)
    + Improve error message for malformed per-file-ignores
      (See also GitLab!298, GitLab#489)
- Update to version 3.7.2:
  * Bugs Fixed
    + Fix broken flake8 --diff (regressed in 3.7.0) (See also GitLab!292,
      GitLab#490)
    + Fix typo in plugin exception reporting (See also GitLab!275, GitLab#491)
    + Fix AttributeError while attempting to use the legacy api
      (regressed in 3.7.0) (See also GitLab!293, GitLab#497)
- Update to version 3.7.1:
  * Bugs Fixed
    + Fix capitalized filenames in per-file-ignores setting (See also GitLab!290, GitLab#488)
- Update to version 3.7.0:
  * New Dependency Information
    + Add dependency on entrypoints >= 0.3, < 0.4

OBS-URL: https://build.opensuse.org/request/show/671477
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flake8?expand=0&rev=44
2019-02-05 10:24:45 +00:00

285 lines
6.1 KiB
Diff
Raw Blame History

--- a/tests/integration/test_checker.py
+++ b/tests/integration/test_checker.py
@@ -1,5 +1,8 @@
"""Integration tests for the checker submodule."""
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import checker
--- a/tests/unit/test_application.py
+++ b/tests/unit/test_application.py
@@ -1,7 +1,10 @@
"""Tests for the Application class."""
import optparse
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8.main import application as app
--- a/tests/unit/test_base_formatter.py
+++ b/tests/unit/test_base_formatter.py
@@ -1,7 +1,10 @@
"""Tests for the BaseFormatter object."""
import optparse
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import style_guide
--- a/tests/unit/test_checker_manager.py
+++ b/tests/unit/test_checker_manager.py
@@ -1,7 +1,10 @@
"""Tests for the Manager object for FileCheckers."""
import errno
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import checker
--- a/tests/unit/test_config_file_finder.py
+++ b/tests/unit/test_config_file_finder.py
@@ -4,7 +4,10 @@ import configparser
import os
import sys
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8.options import config
--- a/tests/unit/test_debug.py
+++ b/tests/unit/test_debug.py
@@ -1,6 +1,9 @@
"""Tests for our debugging module."""
import entrypoints
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8.main import debug
--- a/tests/unit/test_file_checker.py
+++ b/tests/unit/test_file_checker.py
@@ -1,5 +1,8 @@
"""Unit tests for the FileChecker class."""
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
import flake8
--- a/tests/unit/test_file_processor.py
+++ b/tests/unit/test_file_processor.py
@@ -5,7 +5,10 @@ import tokenize
import ast
import tokenize
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import processor
--- a/tests/unit/test_get_local_plugins.py
+++ b/tests/unit/test_get_local_plugins.py
@@ -1,5 +1,8 @@
"""Tests for get_local_plugins."""
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
from flake8.options import config
--- a/tests/unit/test_git.py
+++ b/tests/unit/test_git.py
@@ -1,5 +1,8 @@
"""Tests around functionality in the git integration."""
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8.main import git
--- a/tests/unit/test_legacy_api.py
+++ b/tests/unit/test_legacy_api.py
@@ -1,5 +1,8 @@
"""Tests for Flake8's legacy API."""
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8.api import legacy as api
--- a/tests/unit/test_merged_config_parser.py
+++ b/tests/unit/test_merged_config_parser.py
@@ -1,7 +1,10 @@
"""Unit tests for flake8.options.config.MergedConfigParser."""
import os
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8.options import config
--- a/tests/unit/test_option.py
+++ b/tests/unit/test_option.py
@@ -1,5 +1,8 @@
"""Unit tests for flake8.options.manager.Option."""
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8.options import manager
--- a/tests/unit/test_option_manager.py
+++ b/tests/unit/test_option_manager.py
@@ -2,7 +2,10 @@
import optparse
import os
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import utils
--- a/tests/unit/test_plugin.py
+++ b/tests/unit/test_plugin.py
@@ -1,7 +1,10 @@
"""Tests for flake8.plugins.manager.Plugin."""
import optparse
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import exceptions
--- a/tests/unit/test_plugin_manager.py
+++ b/tests/unit/test_plugin_manager.py
@@ -1,5 +1,8 @@
"""Tests for flake8.plugins.manager.PluginManager."""
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
from flake8.plugins import manager
--- a/tests/unit/test_plugin_type_manager.py
+++ b/tests/unit/test_plugin_type_manager.py
@@ -1,7 +1,10 @@
"""Tests for flake8.plugins.manager.PluginTypeManager."""
import sys
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import exceptions
--- a/tests/unit/test_style_guide.py
+++ b/tests/unit/test_style_guide.py
@@ -1,7 +1,10 @@
"""Tests for the flake8.style_guide.StyleGuide class."""
import optparse
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import statistics
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -1,7 +1,10 @@
"""Tests for flake8's utils module."""
import os
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import exceptions
--- a/tests/unit/test_violation.py
+++ b/tests/unit/test_violation.py
@@ -1,5 +1,8 @@
"""Tests for the flake8.style_guide.Violation class."""
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
import pytest
from flake8 import style_guide
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,12 @@
import flake8
+PY2 = sys.version_info[0] == 2
+tests_require = ['pytest']
+
+if PY2:
+ tests_require.append('mock >= 2.0.0')
+
# NOTE(sigmavirus24): When updating these requirements, update them in
# setup.cfg as well.
@@ -147,4 +153,5 @@
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Software Development :: Quality Assurance",
],
+ tests_require=tests_require,
)
Reference in New Issue View Git Blame Copy Permalink