Merge 13119c5 into 73babe3

MANIFEST.in

@@ -3,5 +3,5 @@ include README.rst
 include COPYING
 include COPYING.LESSER
 include pytest.ini
-recursive-include astroid/tests *.py *.zip *.egg *.pth
+recursive-include tests *.py *.zip *.egg *.pth
 recursive-include astroid/brain *.py

setup.cfg

@@ -2,4 +2,4 @@
 test = pytest
 
 [tool:pytest]
-testpaths = astroid/tests
+testpaths = tests

setup.py

@@ -42,7 +42,7 @@ def install():
         python_requires=">=3.5.*",
         install_requires=install_requires,
         extras_require=extras_require,
-        packages=find_packages(exclude=["astroid.tests"]) + ["astroid.brain"],
+        packages=find_packages() + ["astroid.brain"],
         setup_requires=["pytest-runner"],
         test_suite="test",
         tests_require=["pytest"],

astroid/tests/resources.py → tests/resources.py

@@ -9,22 +9,17 @@
 import os
 import sys
 
-import pkg_resources
-
 from astroid import builder
 from astroid import MANAGER
 from astroid.bases import BUILTINS
-from astroid import tests
 
 
 DATA_DIR = os.path.join("testdata", "python{}".format(sys.version_info[0]))
-RESOURCE_PATH = os.path.join(tests.__path__[0], DATA_DIR, "data")
+RESOURCE_PATH = os.path.join(os.path.dirname(__file__), DATA_DIR, "data")
 
 
 def find(name):
-    return pkg_resources.resource_filename(
-        "astroid.tests", os.path.normpath(os.path.join(DATA_DIR, name))
-    )
+    return os.path.normpath(os.path.join(os.path.dirname(__file__), DATA_DIR, name))
 
 
 def build_file(path, modname=None):

astroid/tests/unittest_builder.py → tests/unittest_builder.py

@@ -28,7 +28,7 @@
 from astroid import nodes
 from astroid import test_utils
 from astroid import util
-from astroid.tests import resources
+from . import resources
 
 MANAGER = manager.AstroidManager()
 BUILTINS = builtins.__name__

astroid/tests/unittest_inference.py → tests/unittest_inference.py

@@ -42,7 +42,7 @@
 from astroid import objects
 from astroid import test_utils
 from astroid import util
-from astroid.tests import resources
+from . import resources
 
 
 def get_node_of_class(start_from, klass):

astroid/tests/unittest_lookup.py → tests/unittest_lookup.py

@@ -16,7 +16,7 @@
 from astroid import exceptions
 from astroid import nodes
 from astroid import scoped_nodes
-from astroid.tests import resources
+from . import resources
 
 
 class LookupTest(resources.SysPathSetup, unittest.TestCase):

astroid/tests/unittest_manager.py → tests/unittest_manager.py

@@ -24,7 +24,7 @@
 import astroid
 from astroid import exceptions
 from astroid import manager
-from astroid.tests import resources
+from . import resources
 
 
 BUILTINS = six.moves.builtins.__name__

astroid/tests/unittest_modutils.py → tests/unittest_modutils.py

@@ -28,7 +28,7 @@
 import astroid
 from astroid.interpreter._import import spec
 from astroid import modutils
-from astroid.tests import resources
+from . import resources
 
 
 def _get_file_from_object(obj):

astroid/tests/unittest_nodes.py → tests/unittest_nodes.py

@@ -37,7 +37,7 @@
 from astroid import util
 from astroid import test_utils
 from astroid import transforms
-from astroid.tests import resources
+from . import resources
 
 
 abuilder = builder.AstroidBuilder()

astroid/tests/unittest_regrtest.py → tests/unittest_regrtest.py

@@ -22,8 +22,8 @@
 from astroid.raw_building import build_module
 from astroid.manager import AstroidManager
 from astroid.test_utils import require_version
-from astroid.tests import resources
 from astroid import transforms
+from . import resources
 
 try:
     import numpy  # pylint: disable=unused-import

astroid/tests/unittest_scoped_nodes.py → tests/unittest_scoped_nodes.py

@@ -46,7 +46,7 @@
 )
 from astroid.bases import BUILTINS, Instance, BoundMethod, UnboundMethod, Generator
 from astroid import test_utils
-from astroid.tests import resources
+from . import resources
 
 
 def _test_dict_interface(self, node, test_attr):

tox.ini

@@ -36,12 +36,12 @@ commands =
     ; installed astroid package
     ; This is important for tests' test data which create files
     ; inside the package
-    python -Wi {envsitepackagesdir}/coverage run -m pytest --pyargs astroid/tests {posargs:}
+    python -Wi {envsitepackagesdir}/coverage run -m pytest --pyargs {posargs:tests}
 
 [testenv:formatting]
 basepython = python3
 deps = black==18.6b4
-commands = black --check --exclude "tests/testdata" astroid
+commands = black --check --exclude "tests/testdata" astroid tests
 changedir = {toxinidir}
 
 [testenv:coveralls]