Address pytest warnings (#101)

* Fix old style assertEquals

* Remove unused import

* Add session tags for filtering

* Add tests

* Fix pypy warnings

* Fail on warnings from within the project

* Add pointer to noxfile help

* Fix formatting

Author: fayazkhan

docs/CONTRIBUTING.rst

@@ -38,6 +38,7 @@ To run the tests and linters, you can use the following command:
 
     $ uv run noxfile.py
 
+For futher details, refer to the ``noxfile.py`` script.
 
 .. |IRC Freenode| image:: https://img.shields.io/badge/irc-freenode-blue.svg
    :target: https://webchat.freenode.net/?channels=sacrud

noxfile.py

@@ -25,6 +25,11 @@
         $ uv run noxfile.py
       Run all tests with coverage and linting:
         $ uv run noxfile.py -- --coverage
+      Run tests for a specific SQLAlchemy version:
+        $ uv run noxfile.py -t sqla12
+      Run tests for a specific Python version:
+        $ uv run noxfile.py -s test -p 3.X
+        $ uv run noxfile.py -s test -p pypy-3.X    # For PyPy
 
       Set up a development environment with the default Python version (3.8):
         $ uv run noxfile.py -s dev
@@ -56,7 +61,7 @@ def lint(session):
         "flake8", ".", "--count", "--select=E9,F63,F7,F82", "--show-source", "--statistics", "--extend-exclude", ".venv")
     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
     session.run(
-        "flake8", ".", "--count", "--exit-zero", "--max-complexity=10",
+        "flake8", ".", "--count", "--exit-zero", "--max-complexity=10", "--extend-ignore=E711",
         "--max-line-length=127", "--statistics", "--extend-exclude", ".venv")
 
 
@@ -81,7 +86,10 @@ def parametrize_test_versions():
     ]
 
     return [
-        (f"{interpreter}3.{python_minor}", str(sqlalchemy_version))
+        nox.param(
+            f"{interpreter}3.{python_minor}", str(sqlalchemy_version),
+            tags=[f"sqla{sqlalchemy_version.major}{sqlalchemy_version.minor}"]
+        )
         for interpreter in ("", "pypy-")
         for python_minor in range(PYTHON_MINOR_VERSION_MIN, PYTHON_MINOR_VERSION_MAX + 1)
         for sqlalchemy_version in filtered_sqlalchemy_versions
@@ -95,15 +103,27 @@ def test(session, sqlalchemy):
     """Run tests with pytest.
 
     Use the --coverage option to run tests with coverage.
+
+    For running tests for a specific SQLAlchemy version, use the tags option:
+
+        $ uv run noxfile.py -s test -t sqla12
+
     For fine-grained control over running the tests, refer the nox documentation: https://nox.thea.codes/en/stable/usage.html
     """
     session.install("-r", "requirements-test.txt")
     session.install(f"sqlalchemy~={sqlalchemy}.0")
-    if "--coverage" in session.posargs:
-        session.run("coverage", "run", "--source=sqlalchemy_mptt", "-m", "pytest", "sqlalchemy_mptt/")
-        session.run("coverage", "xml")
+    session.install("-e", ".")
+    try:
+        session.posargs.remove("--coverage")
+    except ValueError:
+        with_coverage = False
     else:
-        session.run("pytest", "sqlalchemy_mptt/")
+        with_coverage = True
+    pytest_cmd = [
+        "pytest", "--pyargs", "sqlalchemy_mptt",
+        "--cov", "sqlalchemy_mptt", "--cov-report", "term-missing:skip-covered"
+    ] + ["--cov-report", "xml"] if with_coverage else [] + session.posargs
+    session.run(*pytest_cmd)
 
 
 @nox.session(default=False)

sqlalchemy_mptt/tests/__init__.py

@@ -56,8 +56,8 @@ def __init__(self, session):
 
     def add(self, model, fixtures):
         here = os.path.dirname(os.path.realpath(__file__))
-        file = open(os.path.join(here, fixtures))
-        fixtures = json.loads(file.read())
+        with open(os.path.join(here, fixtures)) as file:
+            fixtures = json.loads(file.read())
         for fixture in fixtures:
             if hasattr(model, "sqlalchemy_mptt_pk_name"):
                 fixture[model.sqlalchemy_mptt_pk_name] = fixture.pop("id")

sqlalchemy_mptt/tests/cases/get_node.py

@@ -5,7 +5,6 @@
 # Copyright © 2015 uralbash <root@uralbash.ru>
 #
 # Distributed under terms of the MIT license.
-import os
 
 
 class GetNodes(object):

sqlalchemy_mptt/tests/cases/get_tree.py

@@ -267,6 +267,24 @@ def go(id):
         ]
         self.assertEqual(tree, reference_tree)
 
+    def test_drilldown_tree_without_session(self):
+        def go(id):
+            return get_obj(self.session, self.model, id)
+        node = go(7)
+        tree = node.drilldown_tree()
+        reference_tree = [
+            {'node': go(7),
+             'children': [
+                 {'node': go(8),
+                  'children': [
+                      {'node': go(9)}]},
+                 {'node': go(10),
+                  'children': [
+                      {'node': go(11)}]}]
+             }
+        ]
+        self.assertEqual(tree, reference_tree)
+
     def test_path_to_root(self):
         r"""Generate path from a leaf or intermediate node to the root.
 

sqlalchemy_mptt/tests/test_inheritance.py

@@ -90,14 +90,14 @@ def test_create_delete(self):
         self.session.delete(child1)
         self.session.commit()
 
-        self.assertEquals(None, self.session.query(SpecializedTree).get(2))
+        self.assertEqual(None, self.session.query(SpecializedTree).get(2))
 
         self.session.delete(child2)
         self.session.commit()
 
-        self.assertEquals(None, self.session.query(SpecializedTree).get(3))
-        self.assertEquals(None, self.session.query(SpecializedTree).get(4))
-        self.assertEquals(None, self.session.query(SpecializedTree).get(5))
+        self.assertEqual(None, self.session.query(SpecializedTree).get(3))
+        self.assertEqual(None, self.session.query(SpecializedTree).get(4))
+        self.assertEqual(None, self.session.query(SpecializedTree).get(5))
 
 
 class TestGenericTree(TreeTestingMixin, unittest.TestCase):