Simplify code with ruff --fix

.github/workflows/test.yml

@@ -65,7 +65,7 @@ jobs:
             toxpython: 'python3.6'
             python_arch: 'x64'
             tox_env: 'py36-pytest70-xdist250-coverage62'
-            os: 'ubuntu-latest'
+            os: 'ubuntu-20.04'
           - name: 'py36-pytest70-xdist250-coverage62 (windows)'
             python: '3.6'
             toxpython: 'python3.6'

examples/adhoc-layout/tests/test_example.py

@@ -3,4 +3,4 @@
 
 def test_add():
     assert example.add(1, 1) == 2
-    assert not example.add(0, 1) == 2
+    assert example.add(0, 1) != 2

examples/src-layout/tests/test_example.py

@@ -3,4 +3,4 @@
 
 def test_add():
     assert example.add(1, 1) == 2
-    assert not example.add(0, 1) == 2
+    assert example.add(0, 1) != 2

src/pytest_cov/embed.py

@@ -31,36 +31,34 @@ def init():
     cov_branch = True if os.environ.get('COV_CORE_BRANCH') == 'enabled' else None
     cov_context = os.environ.get('COV_CORE_CONTEXT')
 
-    if cov_datafile:
-        if _active_cov:
-            cleanup()
-        # Import what we need to activate coverage.
-        import coverage
-
-        # Determine all source roots.
-        if cov_source in os.pathsep:
-            cov_source = None
-        else:
-            cov_source = cov_source.split(os.pathsep)
-        if cov_config == os.pathsep:
-            cov_config = True
-
-        # Activate coverage for this process.
-        cov = _active_cov = coverage.Coverage(
-            source=cov_source,
-            branch=cov_branch,
-            data_suffix=True,
-            config_file=cov_config,
-            auto_data=True,
-            data_file=cov_datafile
-        )
-        cov.load()
-        cov.start()
-        if cov_context:
-            cov.switch_context(cov_context)
-        cov._warn_no_data = False
-        cov._warn_unimported_source = False
-        return cov
+    if not cov_datafile:
+        return None
+
+    if _active_cov:
+        cleanup()
+    # Import what we need to activate coverage.
+    import coverage
+
+    # Determine all source roots.
+    cov_source = None if cov_source in os.pathsep else cov_source.split(os.pathsep)
+    if cov_config == os.pathsep:
+        cov_config = True
+    # Activate coverage for this process.
+    cov = _active_cov = coverage.Coverage(
+        source=cov_source,
+        branch=cov_branch,
+        data_suffix=True,
+        config_file=cov_config,
+        auto_data=True,
+        data_file=cov_datafile
+    )
+    cov.load()
+    cov.start()
+    if cov_context:
+        cov.switch_context(cov_context)
+    cov._warn_no_data = False
+    cov._warn_unimported_source = False
+    return cov
 
 
 def _cleanup(cov):

src/pytest_cov/plugin.py

@@ -247,7 +247,7 @@ def pytest_sessionstart(self, session):
         self.pid = os.getpid()
         if self._is_worker(session):
             nodeid = (
-                session.config.workerinput.get('workerid', getattr(session, 'nodeid'))
+                session.config.workerinput.get('workerid', session.nodeid)
             )
             self.start(engine.DistWorker, session.config, nodeid)
         elif not self._started:

tox.ini

@@ -87,12 +87,13 @@ commands =
 
 [testenv:check]
 deps =
-    docutils
     check-manifest
+    colorama  # TODO Remove when isort > v6.0.0b2 is released.
+    docutils
     flake8
-    readme-renderer
-    pygments
     isort
+    pygments
+    readme-renderer
 skip_install = true
 usedevelop = false
 commands =