Moving tests folder to root

guillaumeLepape · guillaumeLepape · commit 1711d8f33f69 · 2023-07-07T20:04:37.000+02:00
Mainly to avoid including it in python wheel
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 23.3.0
     hooks:
       - id: black
         language_version: python3.9
diff --git a/setup.py b/setup.py
@@ -44,8 +44,8 @@
     ),
     license="BSD",
     platforms=["any"],
-    packages=find_packages(),
-    test_suite="eve.tests",
+    packages=find_packages(exclude=["tests*"]),
+    test_suite="tests",
     install_requires=INSTALL_REQUIRES,
     extras_require=EXTRAS_REQUIRE,
     python_requires=">=3.7",
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -12,9 +12,14 @@
 
 import eve
 from eve import ETAG, ISSUES
-from eve.tests.test_settings import (DOMAIN, MONGO_DBNAME, MONGO_HOST,
-                                     MONGO_PASSWORD, MONGO_PORT,
-                                     MONGO_USERNAME)
+from .test_settings import (
+    DOMAIN,
+    MONGO_DBNAME,
+    MONGO_HOST,
+    MONGO_PASSWORD,
+    MONGO_PORT,
+    MONGO_USERNAME,
+)
 from eve.utils import date_to_str
 
 try:
@@ -23,7 +28,7 @@
     from urllib.parse import parse_qs, urlparse
 
 
-class ValueStack():
+class ValueStack:
     """
     Descriptor to store multiple assignments in an attribute.
 
@@ -67,6 +72,7 @@ def wrapped_add_url_rule(*args, **kwargs):
         app._got_first_request = False
         original_add_url_rule(*args, **kwargs)
         app._got_first_request = original_got_first_request
+
     return wrapped_add_url_rule
 
 
diff --git a/tests/auth.py b/tests/auth.py
@@ -7,8 +7,9 @@
 import eve
 from eve import Eve
 from eve.auth import BasicAuth, HMACAuth, TokenAuth
-from eve.tests import TestBase
-from eve.tests.test_settings import MONGO_DBNAME
+
+from . import TestBase
+from .test_settings import MONGO_DBNAME
 
 
 class ValidBasicAuth(BasicAuth):
diff --git a/tests/config.py b/tests/config.py
@@ -7,8 +7,9 @@
 from eve.flaskapp import Eve, RegexConverter
 from eve.io.base import DataLayer
 from eve.io.mongo import Mongo, Validator
-from eve.tests import TestBase
-from eve.tests.test_settings import MONGO_HOST, MONGO_PORT
+
+from . import TestBase
+from .test_settings import MONGO_HOST, MONGO_PORT
 
 
 class TestConfig(TestBase):
@@ -423,7 +424,6 @@ def test_auth_field_as_custom_idfield(self):
         )
 
     def test_oplog_config(self):
-
         # if OPLOG_ENDPOINT is enabled the endoint is included with the domain
         self.app.config["OPLOG_ENDPOINT"] = "oplog"
         self.app._init_oplog()
diff --git a/tests/endpoints.py b/tests/endpoints.py
@@ -10,11 +10,11 @@
 from eve import Eve
 from eve.io.base import BaseJSONEncoder
 from eve.io.mongo import Validator
-from eve.tests import TestBase, TestMinimal
-from eve.tests.test_settings import (MONGO_DBNAME, MONGO_PASSWORD,
-                                     MONGO_USERNAME)
 from eve.utils import config
 
+from . import TestBase, TestMinimal
+from .test_settings import MONGO_DBNAME, MONGO_PASSWORD, MONGO_USERNAME
+
 
 class UUIDEncoder(BaseJSONEncoder):
     """Propretary JSONEconder subclass used by the json render function.
@@ -80,9 +80,7 @@ def setUp(self):
         self.url = "/uuids/%s" % self.uuid_valid
         self.headers = [("Content-Type", "application/json")]
 
-        super().setUp(
-            settings_file=settings, url_converters=url_converters
-        )
+        super().setUp(settings_file=settings, url_converters=url_converters)
 
         self.app.validator = UUIDValidator
         self.app.data.json_encoder_class = UUIDEncoder
@@ -355,7 +353,9 @@ def test_schema_endpoint(self):
     def test_schema_endpoint_does_not_attempt_callable_serialization(self):
         self.domain[self.known_resource]["schema"]["lambda"] = {
             "type": "boolean",
-            "coerce": lambda v: v if isinstance(v, bool) else v.lower() in ["true", "1"],
+            "coerce": lambda v: v
+            if isinstance(v, bool)
+            else v.lower() in ["true", "1"],
         }
         known_schema_path = "/schema/%s" % self.known_resource
         self.app.config["SCHEMA_ENDPOINT"] = "schema"
diff --git a/tests/methods/__init__.py b/tests/methods/__init__.py
diff --git a/tests/methods/common.py b/tests/methods/common.py
@@ -7,13 +7,12 @@
 from bson import ObjectId, decimal128
 from bson.dbref import DBRef
 
-from eve.methods.common import (normalize_dotted_fields, serialize,
-                                sort_per_resource)
-from eve.tests import TestBase
-from eve.tests.auth import ValidBasicAuth, ValidHMACAuth, ValidTokenAuth
-from eve.tests.suite_generator import EmbeddedDoc
-from eve.tests.test_settings import MONGO_DBNAME
+from eve.methods.common import normalize_dotted_fields, serialize, sort_per_resource
 from eve.utils import config
+from tests import TestBase
+from tests.auth import ValidBasicAuth, ValidHMACAuth, ValidTokenAuth
+from tests.suite_generator import EmbeddedDoc
+from tests.test_settings import MONGO_DBNAME
 
 
 class TestSerializer(TestBase):
diff --git a/tests/methods/delete.py b/tests/methods/delete.py
@@ -5,10 +5,10 @@
 
 from eve import ETAG
 from eve.methods.delete import deleteitem_internal
-from eve.tests import TestBase
-from eve.tests.test_settings import MONGO_DBNAME
-from eve.tests.utils import DummyEvent
 from eve.utils import ParsedRequest
+from tests import TestBase
+from tests.test_settings import MONGO_DBNAME
+from tests.utils import DummyEvent
 
 
 class TestDelete(TestBase):
diff --git a/tests/methods/get.py b/tests/methods/get.py
@@ -10,10 +10,10 @@
 from werkzeug.datastructures import ImmutableMultiDict, MultiDict
 
 from eve.methods.get import get_internal, getitem_internal
-from eve.tests import TestBase
-from eve.tests.test_settings import MONGO_DBNAME
-from eve.tests.utils import DummyEvent
 from eve.utils import date_to_rfc1123, str_to_date
+from tests import TestBase
+from tests.test_settings import MONGO_DBNAME
+from tests.utils import DummyEvent
 
 
 class TestGet(TestBase):
@@ -48,14 +48,14 @@ def test_get_max_results(self):
     def test_get_max_results_overridden(self):
         # Generate 50 contacts.
         self.random_contacts(num=50)
-        
+
         # Set the max pagination limit to 7.
         self.app.config["DOMAIN"][self.known_resource]["pagination_limit"] = 7
-        
+
         # Attempt to get all 50 contacts in one request.
         response, status = self.get(self.known_resource, "?max_results=50")
         self.assert200(status)
-        
+
         # Validate that the response only contains 10 contacts.
         resource = response["_items"]
         self.assertEqual(len(resource), 7)
@@ -1463,7 +1463,6 @@ def test_get_subresource_with_custom_idfield(self):
         self.assertEqual(response["_items"][0]["parent_product"], parent_product_sku)
 
     def test_get_aggregation_endpoint(self):
-
         _db = self.connection[MONGO_DBNAME]
         _db.aggregate_test.insert_many(
             [
@@ -1547,7 +1546,6 @@ def assertOutput(doc, count, id):
         self.assertEqual(len(docs), 1)
 
     def test_get_aggregation_parsing(self):
-
         date = datetime.utcnow()
 
         _db = self.connection[MONGO_DBNAME]
@@ -1633,7 +1631,6 @@ def test_get_aggregation_with_lists(self):
         self.assertEqual(len(docs), 1)
 
     def test_get_aggregation_pruning(self):
-
         date = datetime.utcnow()
 
         _db = self.connection[MONGO_DBNAME]
diff --git a/tests/methods/patch.py b/tests/methods/patch.py
@@ -4,9 +4,9 @@
 
 from eve import ETAG, ISSUES, LAST_UPDATED, STATUS, STATUS_OK
 from eve.methods.patch import patch_internal
-from eve.tests import TestBase
-from eve.tests.test_settings import MONGO_DBNAME
-from eve.tests.utils import DummyEvent
+from tests import TestBase
+from tests.test_settings import MONGO_DBNAME
+from tests.utils import DummyEvent
 
 
 class TestPatch(TestBase):
diff --git a/tests/methods/patch_atomic_concurrency.py b/tests/methods/patch_atomic_concurrency.py
@@ -3,9 +3,10 @@
 import simplejson as json
 
 import eve.methods.common
-from eve.tests import TestBase
 from eve.utils import config
 
+from tests import TestBase
+
 """
 Atomic Concurrency Checks
 
diff --git a/tests/methods/post.py b/tests/methods/post.py
@@ -7,10 +7,10 @@
 
 from eve import DATE_CREATED, ETAG, ISSUES, LAST_UPDATED, STATUS, STATUS_OK
 from eve.methods.post import post, post_internal
-from eve.tests import TestBase
-from eve.tests.test_settings import MONGO_DBNAME
-from eve.tests.utils import DummyEvent
 from eve.utils import str_type
+from tests import TestBase
+from tests.test_settings import MONGO_DBNAME
+from tests.utils import DummyEvent
 
 
 class TestPost(TestBase):
diff --git a/tests/methods/put.py b/tests/methods/put.py
@@ -4,9 +4,9 @@
 
 from eve import ETAG, ISSUES, LAST_UPDATED, STATUS, STATUS_OK
 from eve.methods.put import put_internal
-from eve.tests import TestBase
-from eve.tests.test_settings import MONGO_DBNAME
-from eve.tests.utils import DummyEvent
+from tests import TestBase
+from tests.test_settings import MONGO_DBNAME
+from tests.utils import DummyEvent
 
 
 class TestPut(TestBase):
diff --git a/tests/methods/ratelimit.py b/tests/methods/ratelimit.py
@@ -1,6 +1,6 @@
 import time
 
-from eve.tests import TestBase
+from tests import TestBase
 
 
 class TestRateLimit(TestBase):
diff --git a/tests/renders.py b/tests/renders.py
@@ -3,10 +3,11 @@
 import simplejson as json
 from bson import ObjectId
 
-from eve.tests import TestBase
-from eve.tests.test_settings import MONGO_DBNAME
 from eve.utils import api_prefix
 
+from . import TestBase
+from .test_settings import MONGO_DBNAME
+
 
 class TestRenders(TestBase):
     def test_default_render(self):
diff --git a/tests/response.py b/tests/response.py
@@ -6,7 +6,8 @@
 import simplejson as json
 
 import eve
-from eve.tests import TestBase
+
+from . import TestBase
 
 
 class TestResponse(TestBase):
diff --git a/tests/suite_generator.py b/tests/suite_generator.py
diff --git a/tests/test.db b/tests/test.db
diff --git a/tests/test_io/__init__.py b/tests/test_io/__init__.py
diff --git a/tests/test_io/flask_pymongo.py b/tests/test_io/flask_pymongo.py
@@ -3,9 +3,14 @@
 from pymongo.errors import OperationFailure
 
 from eve.io.mongo.flask_pymongo import PyMongo
-from eve.tests import TestBase
-from eve.tests.test_settings import (MONGO1_DBNAME, MONGO1_PASSWORD,
-                                     MONGO1_USERNAME, MONGO_HOST, MONGO_PORT)
+from tests import TestBase
+from tests.test_settings import (
+    MONGO1_DBNAME,
+    MONGO1_PASSWORD,
+    MONGO1_USERNAME,
+    MONGO_HOST,
+    MONGO_PORT,
+)
 
 
 class TestPyMongo(TestBase):
diff --git a/tests/test_io/media.py b/tests/test_io/media.py
@@ -7,7 +7,7 @@
 from eve import ETAG, ISSUES, STATUS, STATUS_ERR, STATUS_OK
 from eve.io.media import MediaStorage
 from eve.io.mongo import GridFSMediaStorage
-from eve.tests import MONGO_DBNAME, TestBase
+from tests import MONGO_DBNAME, TestBase
 
 
 class TestMediaStorage(TestCase):
diff --git a/tests/test_io/mongo.py b/tests/test_io/mongo.py
@@ -9,8 +9,8 @@
 
 from eve.io.mongo import Mongo, MongoJSONEncoder, Validator
 from eve.io.mongo.parser import ParseError, parse
-from eve.tests import TestBase
-from eve.tests.test_settings import MONGO_DBNAME
+from tests import TestBase
+from tests.test_settings import MONGO_DBNAME
 
 
 class TestPythonParser(TestCase):
diff --git a/tests/test_io/multi_mongo.py b/tests/test_io/multi_mongo.py
@@ -9,10 +9,15 @@
 
 import eve
 from eve.auth import BasicAuth
-from eve.tests import TestBase
-from eve.tests.test_settings import (MONGO1_DBNAME, MONGO1_PASSWORD,
-                                     MONGO1_USERNAME, MONGO_DBNAME, MONGO_HOST,
-                                     MONGO_PORT)
+from tests import TestBase
+from tests.test_settings import (
+    MONGO1_DBNAME,
+    MONGO1_PASSWORD,
+    MONGO1_USERNAME,
+    MONGO_DBNAME,
+    MONGO_HOST,
+    MONGO_PORT,
+)
 
 
 class TestMultiMongo(TestBase):
diff --git a/tests/test_logging.py b/tests/test_logging.py
@@ -1,6 +1,6 @@
 from testfixtures import log_capture
 
-from eve.tests import TestBase
+from . import TestBase
 
 
 class TestUtils(TestBase):
diff --git a/tests/test_prefix.py b/tests/test_prefix.py
diff --git a/tests/test_prefix_version.py b/tests/test_prefix_version.py
diff --git a/tests/test_settings.py b/tests/test_settings.py
diff --git a/tests/test_settings_env.py b/tests/test_settings_env.py
diff --git a/tests/test_version.py b/tests/test_version.py
diff --git a/tests/utils.py b/tests/utils.py
@@ -6,10 +6,21 @@
 
 from bson.json_util import dumps
 
-from eve.tests import TestBase
-from eve.utils import (config, date_to_str, debug_error_message, document_etag,
-                       extract_key_values, import_from_string, parse_request,
-                       querydef, str_to_date, validate_filters, weak_date)
+from eve.utils import (
+    config,
+    date_to_str,
+    debug_error_message,
+    document_etag,
+    extract_key_values,
+    import_from_string,
+    parse_request,
+    querydef,
+    str_to_date,
+    validate_filters,
+    weak_date,
+)
+
+from . import TestBase
 
 
 class TestUtils(TestBase):
@@ -292,7 +303,7 @@ def test_import_from_string(self):
         self.assertEqual(dt, datetime)
 
 
-class DummyEvent():
+class DummyEvent:
     """
     Even handler that records the call parameters and asserts a check
 
diff --git a/tests/versioning.py b/tests/versioning.py
diff --git a/tox.ini b/tox.ini
