diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2ce50997..d2649188 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.1.1
+current_version = 6.2.1
 commit = True
 tag = True
 
diff --git a/.cookiecutterrc b/.cookiecutterrc
index 3703b848..324a99de 100644
--- a/.cookiecutterrc
+++ b/.cookiecutterrc
@@ -40,7 +40,7 @@ default_context:
     sphinx_doctest: 'no'
     sphinx_theme: sphinx-py3doc-enhanced-theme
     test_matrix_separate_coverage: 'no'
-    version: 6.1.1
+    version: 6.2.1
     version_manager: bump2version
     website: http://blog.ionelmc.ro
     year_from: '2010'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3f6b8dc4..0a81ed49 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,131 +60,509 @@ jobs:
             toxpython: 'python3.11'
             tox_env: 'docs'
             os: 'ubuntu-latest'
-          - name: 'py39-pytest83-xdist36-coverage77 (ubuntu)'
+          - name: 'py39-pytest83-xdist36-coverage78 (ubuntu)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'x64'
-            tox_env: 'py39-pytest83-xdist36-coverage77'
+            tox_env: 'py39-pytest83-xdist36-coverage78'
             os: 'ubuntu-latest'
-          - name: 'py39-pytest83-xdist36-coverage77 (windows)'
+          - name: 'py39-pytest83-xdist36-coverage78 (windows)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'x64'
-            tox_env: 'py39-pytest83-xdist36-coverage77'
+            tox_env: 'py39-pytest83-xdist36-coverage78'
             os: 'windows-latest'
-          - name: 'py39-pytest83-xdist36-coverage77 (macos)'
+          - name: 'py39-pytest83-xdist36-coverage78 (macos)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'arm64'
-            tox_env: 'py39-pytest83-xdist36-coverage77'
+            tox_env: 'py39-pytest83-xdist36-coverage78'
             os: 'macos-latest'
-          - name: 'py310-pytest83-xdist36-coverage77 (ubuntu)'
+          - name: 'py39-pytest83-xdist37-coverage78 (ubuntu)'
+            python: '3.9'
+            toxpython: 'python3.9'
+            python_arch: 'x64'
+            tox_env: 'py39-pytest83-xdist37-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py39-pytest83-xdist37-coverage78 (windows)'
+            python: '3.9'
+            toxpython: 'python3.9'
+            python_arch: 'x64'
+            tox_env: 'py39-pytest83-xdist37-coverage78'
+            os: 'windows-latest'
+          - name: 'py39-pytest83-xdist37-coverage78 (macos)'
+            python: '3.9'
+            toxpython: 'python3.9'
+            python_arch: 'arm64'
+            tox_env: 'py39-pytest83-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'py39-pytest84-xdist36-coverage78 (ubuntu)'
+            python: '3.9'
+            toxpython: 'python3.9'
+            python_arch: 'x64'
+            tox_env: 'py39-pytest84-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py39-pytest84-xdist36-coverage78 (windows)'
+            python: '3.9'
+            toxpython: 'python3.9'
+            python_arch: 'x64'
+            tox_env: 'py39-pytest84-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'py39-pytest84-xdist36-coverage78 (macos)'
+            python: '3.9'
+            toxpython: 'python3.9'
+            python_arch: 'arm64'
+            tox_env: 'py39-pytest84-xdist36-coverage78'
+            os: 'macos-latest'
+          - name: 'py39-pytest84-xdist37-coverage78 (ubuntu)'
+            python: '3.9'
+            toxpython: 'python3.9'
+            python_arch: 'x64'
+            tox_env: 'py39-pytest84-xdist37-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py39-pytest84-xdist37-coverage78 (windows)'
+            python: '3.9'
+            toxpython: 'python3.9'
+            python_arch: 'x64'
+            tox_env: 'py39-pytest84-xdist37-coverage78'
+            os: 'windows-latest'
+          - name: 'py39-pytest84-xdist37-coverage78 (macos)'
+            python: '3.9'
+            toxpython: 'python3.9'
+            python_arch: 'arm64'
+            tox_env: 'py39-pytest84-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'py310-pytest83-xdist36-coverage78 (ubuntu)'
+            python: '3.10'
+            toxpython: 'python3.10'
+            python_arch: 'x64'
+            tox_env: 'py310-pytest83-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py310-pytest83-xdist36-coverage78 (windows)'
+            python: '3.10'
+            toxpython: 'python3.10'
+            python_arch: 'x64'
+            tox_env: 'py310-pytest83-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'py310-pytest83-xdist36-coverage78 (macos)'
+            python: '3.10'
+            toxpython: 'python3.10'
+            python_arch: 'arm64'
+            tox_env: 'py310-pytest83-xdist36-coverage78'
+            os: 'macos-latest'
+          - name: 'py310-pytest83-xdist37-coverage78 (ubuntu)'
+            python: '3.10'
+            toxpython: 'python3.10'
+            python_arch: 'x64'
+            tox_env: 'py310-pytest83-xdist37-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py310-pytest83-xdist37-coverage78 (windows)'
+            python: '3.10'
+            toxpython: 'python3.10'
+            python_arch: 'x64'
+            tox_env: 'py310-pytest83-xdist37-coverage78'
+            os: 'windows-latest'
+          - name: 'py310-pytest83-xdist37-coverage78 (macos)'
+            python: '3.10'
+            toxpython: 'python3.10'
+            python_arch: 'arm64'
+            tox_env: 'py310-pytest83-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'py310-pytest84-xdist36-coverage78 (ubuntu)'
+            python: '3.10'
+            toxpython: 'python3.10'
+            python_arch: 'x64'
+            tox_env: 'py310-pytest84-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py310-pytest84-xdist36-coverage78 (windows)'
+            python: '3.10'
+            toxpython: 'python3.10'
+            python_arch: 'x64'
+            tox_env: 'py310-pytest84-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'py310-pytest84-xdist36-coverage78 (macos)'
+            python: '3.10'
+            toxpython: 'python3.10'
+            python_arch: 'arm64'
+            tox_env: 'py310-pytest84-xdist36-coverage78'
+            os: 'macos-latest'
+          - name: 'py310-pytest84-xdist37-coverage78 (ubuntu)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'x64'
-            tox_env: 'py310-pytest83-xdist36-coverage77'
+            tox_env: 'py310-pytest84-xdist37-coverage78'
             os: 'ubuntu-latest'
-          - name: 'py310-pytest83-xdist36-coverage77 (windows)'
+          - name: 'py310-pytest84-xdist37-coverage78 (windows)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'x64'
-            tox_env: 'py310-pytest83-xdist36-coverage77'
+            tox_env: 'py310-pytest84-xdist37-coverage78'
             os: 'windows-latest'
-          - name: 'py310-pytest83-xdist36-coverage77 (macos)'
+          - name: 'py310-pytest84-xdist37-coverage78 (macos)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'arm64'
-            tox_env: 'py310-pytest83-xdist36-coverage77'
+            tox_env: 'py310-pytest84-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'py311-pytest83-xdist36-coverage78 (ubuntu)'
+            python: '3.11'
+            toxpython: 'python3.11'
+            python_arch: 'x64'
+            tox_env: 'py311-pytest83-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py311-pytest83-xdist36-coverage78 (windows)'
+            python: '3.11'
+            toxpython: 'python3.11'
+            python_arch: 'x64'
+            tox_env: 'py311-pytest83-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'py311-pytest83-xdist36-coverage78 (macos)'
+            python: '3.11'
+            toxpython: 'python3.11'
+            python_arch: 'arm64'
+            tox_env: 'py311-pytest83-xdist36-coverage78'
             os: 'macos-latest'
-          - name: 'py311-pytest83-xdist36-coverage77 (ubuntu)'
+          - name: 'py311-pytest83-xdist37-coverage78 (ubuntu)'
             python: '3.11'
             toxpython: 'python3.11'
             python_arch: 'x64'
-            tox_env: 'py311-pytest83-xdist36-coverage77'
+            tox_env: 'py311-pytest83-xdist37-coverage78'
             os: 'ubuntu-latest'
-          - name: 'py311-pytest83-xdist36-coverage77 (windows)'
+          - name: 'py311-pytest83-xdist37-coverage78 (windows)'
             python: '3.11'
             toxpython: 'python3.11'
             python_arch: 'x64'
-            tox_env: 'py311-pytest83-xdist36-coverage77'
+            tox_env: 'py311-pytest83-xdist37-coverage78'
             os: 'windows-latest'
-          - name: 'py311-pytest83-xdist36-coverage77 (macos)'
+          - name: 'py311-pytest83-xdist37-coverage78 (macos)'
+            python: '3.11'
+            toxpython: 'python3.11'
+            python_arch: 'arm64'
+            tox_env: 'py311-pytest83-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'py311-pytest84-xdist36-coverage78 (ubuntu)'
+            python: '3.11'
+            toxpython: 'python3.11'
+            python_arch: 'x64'
+            tox_env: 'py311-pytest84-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py311-pytest84-xdist36-coverage78 (windows)'
             python: '3.11'
             toxpython: 'python3.11'
+            python_arch: 'x64'
+            tox_env: 'py311-pytest84-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'py311-pytest84-xdist36-coverage78 (macos)'
+            python: '3.11'
+            toxpython: 'python3.11'
+            python_arch: 'arm64'
+            tox_env: 'py311-pytest84-xdist36-coverage78'
+            os: 'macos-latest'
+          - name: 'py311-pytest84-xdist37-coverage78 (ubuntu)'
+            python: '3.11'
+            toxpython: 'python3.11'
+            python_arch: 'x64'
+            tox_env: 'py311-pytest84-xdist37-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py311-pytest84-xdist37-coverage78 (windows)'
+            python: '3.11'
+            toxpython: 'python3.11'
+            python_arch: 'x64'
+            tox_env: 'py311-pytest84-xdist37-coverage78'
+            os: 'windows-latest'
+          - name: 'py311-pytest84-xdist37-coverage78 (macos)'
+            python: '3.11'
+            toxpython: 'python3.11'
+            python_arch: 'arm64'
+            tox_env: 'py311-pytest84-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'py312-pytest83-xdist36-coverage78 (ubuntu)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312-pytest83-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py312-pytest83-xdist36-coverage78 (windows)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312-pytest83-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'py312-pytest83-xdist36-coverage78 (macos)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'arm64'
+            tox_env: 'py312-pytest83-xdist36-coverage78'
+            os: 'macos-latest'
+          - name: 'py312-pytest83-xdist37-coverage78 (ubuntu)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312-pytest83-xdist37-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py312-pytest83-xdist37-coverage78 (windows)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312-pytest83-xdist37-coverage78'
+            os: 'windows-latest'
+          - name: 'py312-pytest83-xdist37-coverage78 (macos)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'arm64'
+            tox_env: 'py312-pytest83-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'py312-pytest84-xdist36-coverage78 (ubuntu)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312-pytest84-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py312-pytest84-xdist36-coverage78 (windows)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312-pytest84-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'py312-pytest84-xdist36-coverage78 (macos)'
+            python: '3.12'
+            toxpython: 'python3.12'
             python_arch: 'arm64'
-            tox_env: 'py311-pytest83-xdist36-coverage77'
+            tox_env: 'py312-pytest84-xdist36-coverage78'
             os: 'macos-latest'
-          - name: 'py312-pytest83-xdist36-coverage77 (ubuntu)'
+          - name: 'py312-pytest84-xdist37-coverage78 (ubuntu)'
             python: '3.12'
             toxpython: 'python3.12'
             python_arch: 'x64'
-            tox_env: 'py312-pytest83-xdist36-coverage77'
+            tox_env: 'py312-pytest84-xdist37-coverage78'
             os: 'ubuntu-latest'
-          - name: 'py312-pytest83-xdist36-coverage77 (windows)'
+          - name: 'py312-pytest84-xdist37-coverage78 (windows)'
             python: '3.12'
             toxpython: 'python3.12'
             python_arch: 'x64'
-            tox_env: 'py312-pytest83-xdist36-coverage77'
+            tox_env: 'py312-pytest84-xdist37-coverage78'
             os: 'windows-latest'
-          - name: 'py312-pytest83-xdist36-coverage77 (macos)'
+          - name: 'py312-pytest84-xdist37-coverage78 (macos)'
             python: '3.12'
             toxpython: 'python3.12'
             python_arch: 'arm64'
-            tox_env: 'py312-pytest83-xdist36-coverage77'
+            tox_env: 'py312-pytest84-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'py313-pytest83-xdist36-coverage78 (ubuntu)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'x64'
+            tox_env: 'py313-pytest83-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py313-pytest83-xdist36-coverage78 (windows)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'x64'
+            tox_env: 'py313-pytest83-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'py313-pytest83-xdist36-coverage78 (macos)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'arm64'
+            tox_env: 'py313-pytest83-xdist36-coverage78'
             os: 'macos-latest'
-          - name: 'py313-pytest83-xdist36-coverage77 (ubuntu)'
+          - name: 'py313-pytest83-xdist37-coverage78 (ubuntu)'
             python: '3.13'
             toxpython: 'python3.13'
             python_arch: 'x64'
-            tox_env: 'py313-pytest83-xdist36-coverage77'
+            tox_env: 'py313-pytest83-xdist37-coverage78'
             os: 'ubuntu-latest'
-          - name: 'py313-pytest83-xdist36-coverage77 (windows)'
+          - name: 'py313-pytest83-xdist37-coverage78 (windows)'
             python: '3.13'
             toxpython: 'python3.13'
             python_arch: 'x64'
-            tox_env: 'py313-pytest83-xdist36-coverage77'
+            tox_env: 'py313-pytest83-xdist37-coverage78'
             os: 'windows-latest'
-          - name: 'py313-pytest83-xdist36-coverage77 (macos)'
+          - name: 'py313-pytest83-xdist37-coverage78 (macos)'
             python: '3.13'
             toxpython: 'python3.13'
             python_arch: 'arm64'
-            tox_env: 'py313-pytest83-xdist36-coverage77'
+            tox_env: 'py313-pytest83-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'py313-pytest84-xdist36-coverage78 (ubuntu)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'x64'
+            tox_env: 'py313-pytest84-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py313-pytest84-xdist36-coverage78 (windows)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'x64'
+            tox_env: 'py313-pytest84-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'py313-pytest84-xdist36-coverage78 (macos)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'arm64'
+            tox_env: 'py313-pytest84-xdist36-coverage78'
+            os: 'macos-latest'
+          - name: 'py313-pytest84-xdist37-coverage78 (ubuntu)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'x64'
+            tox_env: 'py313-pytest84-xdist37-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'py313-pytest84-xdist37-coverage78 (windows)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'x64'
+            tox_env: 'py313-pytest84-xdist37-coverage78'
+            os: 'windows-latest'
+          - name: 'py313-pytest84-xdist37-coverage78 (macos)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'arm64'
+            tox_env: 'py313-pytest84-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'pypy39-pytest83-xdist36-coverage78 (ubuntu)'
+            python: 'pypy-3.9'
+            toxpython: 'pypy3.9'
+            python_arch: 'x64'
+            tox_env: 'pypy39-pytest83-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'pypy39-pytest83-xdist36-coverage78 (windows)'
+            python: 'pypy-3.9'
+            toxpython: 'pypy3.9'
+            python_arch: 'x64'
+            tox_env: 'pypy39-pytest83-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'pypy39-pytest83-xdist36-coverage78 (macos)'
+            python: 'pypy-3.9'
+            toxpython: 'pypy3.9'
+            python_arch: 'arm64'
+            tox_env: 'pypy39-pytest83-xdist36-coverage78'
+            os: 'macos-latest'
+          - name: 'pypy39-pytest83-xdist37-coverage78 (ubuntu)'
+            python: 'pypy-3.9'
+            toxpython: 'pypy3.9'
+            python_arch: 'x64'
+            tox_env: 'pypy39-pytest83-xdist37-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'pypy39-pytest83-xdist37-coverage78 (windows)'
+            python: 'pypy-3.9'
+            toxpython: 'pypy3.9'
+            python_arch: 'x64'
+            tox_env: 'pypy39-pytest83-xdist37-coverage78'
+            os: 'windows-latest'
+          - name: 'pypy39-pytest83-xdist37-coverage78 (macos)'
+            python: 'pypy-3.9'
+            toxpython: 'pypy3.9'
+            python_arch: 'arm64'
+            tox_env: 'pypy39-pytest83-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'pypy39-pytest84-xdist36-coverage78 (ubuntu)'
+            python: 'pypy-3.9'
+            toxpython: 'pypy3.9'
+            python_arch: 'x64'
+            tox_env: 'pypy39-pytest84-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'pypy39-pytest84-xdist36-coverage78 (windows)'
+            python: 'pypy-3.9'
+            toxpython: 'pypy3.9'
+            python_arch: 'x64'
+            tox_env: 'pypy39-pytest84-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'pypy39-pytest84-xdist36-coverage78 (macos)'
+            python: 'pypy-3.9'
+            toxpython: 'pypy3.9'
+            python_arch: 'arm64'
+            tox_env: 'pypy39-pytest84-xdist36-coverage78'
             os: 'macos-latest'
-          - name: 'pypy39-pytest83-xdist36-coverage77 (ubuntu)'
+          - name: 'pypy39-pytest84-xdist37-coverage78 (ubuntu)'
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
             python_arch: 'x64'
-            tox_env: 'pypy39-pytest83-xdist36-coverage77'
+            tox_env: 'pypy39-pytest84-xdist37-coverage78'
             os: 'ubuntu-latest'
-          - name: 'pypy39-pytest83-xdist36-coverage77 (windows)'
+          - name: 'pypy39-pytest84-xdist37-coverage78 (windows)'
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
             python_arch: 'x64'
-            tox_env: 'pypy39-pytest83-xdist36-coverage77'
+            tox_env: 'pypy39-pytest84-xdist37-coverage78'
             os: 'windows-latest'
-          - name: 'pypy39-pytest83-xdist36-coverage77 (macos)'
+          - name: 'pypy39-pytest84-xdist37-coverage78 (macos)'
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
             python_arch: 'arm64'
-            tox_env: 'pypy39-pytest83-xdist36-coverage77'
+            tox_env: 'pypy39-pytest84-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'pypy310-pytest83-xdist36-coverage78 (ubuntu)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-pytest83-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'pypy310-pytest83-xdist36-coverage78 (windows)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-pytest83-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'pypy310-pytest83-xdist36-coverage78 (macos)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'arm64'
+            tox_env: 'pypy310-pytest83-xdist36-coverage78'
+            os: 'macos-latest'
+          - name: 'pypy310-pytest83-xdist37-coverage78 (ubuntu)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-pytest83-xdist37-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'pypy310-pytest83-xdist37-coverage78 (windows)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-pytest83-xdist37-coverage78'
+            os: 'windows-latest'
+          - name: 'pypy310-pytest83-xdist37-coverage78 (macos)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'arm64'
+            tox_env: 'pypy310-pytest83-xdist37-coverage78'
+            os: 'macos-latest'
+          - name: 'pypy310-pytest84-xdist36-coverage78 (ubuntu)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-pytest84-xdist36-coverage78'
+            os: 'ubuntu-latest'
+          - name: 'pypy310-pytest84-xdist36-coverage78 (windows)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-pytest84-xdist36-coverage78'
+            os: 'windows-latest'
+          - name: 'pypy310-pytest84-xdist36-coverage78 (macos)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'arm64'
+            tox_env: 'pypy310-pytest84-xdist36-coverage78'
             os: 'macos-latest'
-          - name: 'pypy310-pytest83-xdist36-coverage77 (ubuntu)'
+          - name: 'pypy310-pytest84-xdist37-coverage78 (ubuntu)'
             python: 'pypy-3.10'
             toxpython: 'pypy3.10'
             python_arch: 'x64'
-            tox_env: 'pypy310-pytest83-xdist36-coverage77'
+            tox_env: 'pypy310-pytest84-xdist37-coverage78'
             os: 'ubuntu-latest'
-          - name: 'pypy310-pytest83-xdist36-coverage77 (windows)'
+          - name: 'pypy310-pytest84-xdist37-coverage78 (windows)'
             python: 'pypy-3.10'
             toxpython: 'pypy3.10'
             python_arch: 'x64'
-            tox_env: 'pypy310-pytest83-xdist36-coverage77'
+            tox_env: 'pypy310-pytest84-xdist37-coverage78'
             os: 'windows-latest'
-          - name: 'pypy310-pytest83-xdist36-coverage77 (macos)'
+          - name: 'pypy310-pytest84-xdist37-coverage78 (macos)'
             python: 'pypy-3.10'
             toxpython: 'pypy3.10'
             python_arch: 'arm64'
-            tox_env: 'pypy310-pytest83-xdist36-coverage77'
+            tox_env: 'pypy310-pytest84-xdist37-coverage78'
             os: 'macos-latest'
     steps:
     - uses: actions/checkout@v4
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4cd7d3e5..1d2f108a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
 # Note the order is intentional to avoid multiple passes of the hooks
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.2
+    rev: v0.11.13
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --show-fixes, --unsafe-fixes]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 22e585d5..beac9eea 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,42 @@
 Changelog
 =========
 
+
+6.2.1 (2025-06-12)
+------------------
+
+* Added a version requirement for pytest's pluggy dependency (1.2.0, released 2023-06-21) that has the required new-style hookwrapper API.
+* Removed deprecated license classifier (packaging).
+* Disabled coverage warnings in two more situations where they have no value:
+
+  * "module-not-measured" in workers
+  * "already-imported" in subprocesses
+
+6.2.0 (2025-06-11)
+------------------
+
+* The plugin now adds 3 rules in the filter warnings configuration to prevent common coverage warnings being raised as obscure errors::
+
+    default:unclosed database in <sqlite3.Connection object at:ResourceWarning
+    once::PytestCovWarning
+    once::CoverageWarning
+
+  This fixes most of the bad interactions that are occurring on pytest 8.4 with ``filterwarnings=error``.
+
+  The plugin will check if there already matching rules for the 3 categories
+  (``ResourceWarning``, ``PytestCovWarning``, ``CoverageWarning``) and message (``unclosed database in <sqlite3.Connection object at``) before adding the filters.
+
+  This means you can have this in your pytest configuration for complete oblivion (not recommended, if that is not clear)::
+
+    filterwarnings = [
+        "error",
+        "ignore:unclosed database in <sqlite3.Connection object at:ResourceWarning",
+        "ignore::PytestCovWarning",
+        "ignore::CoverageWarning",
+    ]
+
+
+
 6.1.1 (2025-04-05)
 ------------------
 
diff --git a/README.rst b/README.rst
index 701de60c..61b0b4aa 100644
--- a/README.rst
+++ b/README.rst
@@ -39,9 +39,9 @@ Overview
     :alt: Supported implementations
     :target: https://pypi.org/project/pytest-cov
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/pytest-dev/pytest-cov/v6.1.1.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/pytest-dev/pytest-cov/v6.2.1.svg
     :alt: Commits since latest release
-    :target: https://github.com/pytest-dev/pytest-cov/compare/v6.1.1...master
+    :target: https://github.com/pytest-dev/pytest-cov/compare/v6.2.1...master
 
 .. end-badges
 
diff --git a/docs/conf.py b/docs/conf.py
index 24cd51ab..9ec7494d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@
 year = '2010-2024'
 author = 'pytest-cov contributors'
 copyright = f'{year}, {author}'
-version = release = '6.1.1'
+version = release = '6.2.1'
 
 pygments_style = 'trac'
 templates_path = ['.']
@@ -31,7 +31,9 @@
 }
 html_theme = 'furo'
 html_theme_options = {
-    'githuburl': 'https://github.com/pytest-dev/pytest-cov/',
+    'source_repository': 'https://github.com/pytest-dev/pytest-cov/',
+    'source_branch': 'master',
+    'source_directory': 'docs/',
 }
 
 html_use_smartypants = True
diff --git a/setup.py b/setup.py
index f85db87f..f95279d1 100755
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ def run(self):
 
 setup(
     name='pytest-cov',
-    version='6.1.1',
+    version='6.2.1',
     license='MIT',
     description='Pytest plugin for measuring coverage.',
     long_description='{}\n{}'.format(read('README.rst'), re.sub(':[a-z]+:`~?(.*?)`', r'``\1``', read('CHANGELOG.rst'))),
@@ -94,7 +94,6 @@ def run(self):
         'Development Status :: 5 - Production/Stable',
         'Framework :: Pytest',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX',
         'Operating System :: Unix',
@@ -125,8 +124,9 @@ def run(self):
     ],
     python_requires='>=3.9',
     install_requires=[
-        'pytest>=4.6',
+        'pytest>=6.2.5',
         'coverage[toml]>=7.5',
+        'pluggy>=1.2',
     ],
     extras_require={
         'testing': [
diff --git a/src/pytest_cov/__init__.py b/src/pytest_cov/__init__.py
index ca111a38..0487a25b 100644
--- a/src/pytest_cov/__init__.py
+++ b/src/pytest_cov/__init__.py
@@ -1,6 +1,6 @@
 """pytest-cov: avoid already-imported warning: PYTEST_DONT_REWRITE."""
 
-__version__ = '6.1.1'
+__version__ = '6.2.1'
 
 import pytest
 
diff --git a/src/pytest_cov/embed.py b/src/pytest_cov/embed.py
index 57c2f423..153cb83d 100644
--- a/src/pytest_cov/embed.py
+++ b/src/pytest_cov/embed.py
@@ -61,6 +61,7 @@ def init():
             cov.switch_context(cov_context)
         cov._warn_no_data = False
         cov._warn_unimported_source = False
+        cov._warn_preimported_source = False
         return cov
 
 
diff --git a/src/pytest_cov/engine.py b/src/pytest_cov/engine.py
index 64f5cafe..4d53c2fc 100644
--- a/src/pytest_cov/engine.py
+++ b/src/pytest_cov/engine.py
@@ -450,6 +450,8 @@ def start(self):
             data_suffix=_data_suffix(f'w{self.nodeid}'),
             config_file=self.cov_config,
         )
+        # Prevent workers from issuing module-not-measured type of warnings (expected for a workers to not have coverage in all the files).
+        self.cov._warn_unimported_source = False
         self.cov.start()
         self.set_env()
         super().start()
diff --git a/src/pytest_cov/plugin.py b/src/pytest_cov/plugin.py
index aca89403..6efc4694 100644
--- a/src/pytest_cov/plugin.py
+++ b/src/pytest_cov/plugin.py
@@ -2,6 +2,7 @@
 
 import argparse
 import os
+import re
 import warnings
 from io import StringIO
 from pathlib import Path
@@ -9,17 +10,21 @@
 
 import coverage
 import pytest
+from coverage.exceptions import CoverageWarning
 from coverage.results import display_covered
 from coverage.results import should_fail_under
 
 from . import CovDisabledWarning
 from . import CovReportWarning
+from . import PytestCovWarning
 from . import compat
 from . import embed
 
 if TYPE_CHECKING:
     from .engine import CovController
 
+COVERAGE_SQLITE_WARNING_RE = re.compile('unclosed database in <sqlite3.Connection object at', re.I)
+
 
 def validate_report(arg):
     file_choices = ['annotate', 'html', 'xml', 'json', 'lcov']
@@ -310,12 +315,29 @@ def _should_report(self):
 
     # we need to wrap pytest_runtestloop. by the time pytest_sessionfinish
     # runs, it's too late to set testsfailed
-    @pytest.hookimpl(hookwrapper=True)
+    @pytest.hookimpl(wrapper=True)
     def pytest_runtestloop(self, session):
-        yield
-
         if self._disabled:
-            return
+            return (yield)
+
+        # we add default warning configuration to prevent certain warnings to bubble up as errors due to rigid filterwarnings configuration
+        for _, message, category, _, _ in warnings.filters:
+            if category is ResourceWarning and message == COVERAGE_SQLITE_WARNING_RE:
+                break
+        else:
+            warnings.filterwarnings('default', 'unclosed database in <sqlite3.Connection object at', ResourceWarning)
+        for _, _, category, _, _ in warnings.filters:
+            if category is PytestCovWarning:
+                break
+        else:
+            warnings.simplefilter('once', PytestCovWarning)
+        for _, _, category, _, _ in warnings.filters:
+            if category is CoverageWarning:
+                break
+        else:
+            warnings.simplefilter('once', CoverageWarning)
+
+        result = yield
 
         compat_session = compat.SessionWrapper(session)
 
@@ -350,6 +372,8 @@ def pytest_runtestloop(self, session):
                 # make sure we get the EXIT_TESTSFAILED exit code
                 compat_session.testsfailed += 1
 
+        return result
+
     def write_heading(self, terminalreporter):
         if not self._wrote_heading:
             terminalreporter.write_sep('=', 'tests coverage')
diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
index 15348ce2..9a003bee 100644
--- a/tests/test_pytest_cov.py
+++ b/tests/test_pytest_cov.py
@@ -1343,6 +1343,27 @@ def test_cover_conftest(testdir):
     result.stdout.fnmatch_lines([CONF_RESULT])
 
 
+def test_filterwarnings_error(testdir):
+    testdir.makeini(r"""
+    [pytest]
+    filterwarnings =
+        error
+    """)
+    testdir.makepyfile(mod=MODULE)
+    testdir.makepyfile(plug=CONFTEST)
+    script = testdir.makepyfile(BASIC_TEST)
+    result = testdir.runpytest('-v', '--cov=mod', '--cov-report=xml', '--cov-report=term-missing', '-p', 'plug', script)
+    assert result.ret == 0
+    result.stdout.fnmatch_lines(['* 1 passed *'])
+    result.stderr.fnmatch_lines(
+        [
+            '* (module-not-measured)',
+            '* (no-data-collected)',
+            '* CovReportWarning: Failed to generate report: No data to report.',
+        ]
+    )
+
+
 @pytest.mark.skipif('sys.platform == "win32" and platform.python_implementation() == "PyPy"')
 def test_cover_looponfail(testdir, monkeypatch):
     testdir.makepyfile(mod=MODULE)
diff --git a/tox.ini b/tox.ini
index 3880ea27..a4465b5a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ envlist =
     clean,
     check,
     docs,
-    {py39,py310,py311,py312,py313,pypy39,pypy310}-{pytest83}-{xdist36}-{coverage77},
+    {py39,py310,py311,py312,py313,pypy39,pypy310}-{pytest83,pytest84}-{xdist36,xdist37}-{coverage78},
     report
 ignore_basepython_conflict = true
 
@@ -36,16 +36,19 @@ setenv =
     PYTHONUNBUFFERED=yes
 
     # Use env vars for (optional) pinning of deps.
+    pytest62:  _DEP_PYTEST=pytest==6.2.5
     pytest80:  _DEP_PYTEST=pytest==8.0.2
     pytest81:  _DEP_PYTEST=pytest==8.1.1
     pytest82:  _DEP_PYTEST=pytest==8.2.2
     pytest83:  _DEP_PYTEST=pytest==8.3.5
+    pytest84:  _DEP_PYTEST=pytest==8.4.0
 
     xdist32: _DEP_PYTESTXDIST=pytest-xdist==3.2.0
     xdist33: _DEP_PYTESTXDIST=pytest-xdist==3.3.1
     xdist34: _DEP_PYTESTXDIST=pytest-xdist==3.4.0
     xdist35: _DEP_PYTESTXDIST=pytest-xdist==3.5.0
     xdist36: _DEP_PYTESTXDIST=pytest-xdist==3.6.1
+    xdist37: _DEP_PYTESTXDIST=pytest-xdist==3.7.0
     xdistdev: _DEP_PYTESTXDIST=git+https://github.com/pytest-dev/pytest-xdist.git#egg=pytest-xdist
 
     coverage72: _DEP_COVERAGE=coverage==7.2.7
@@ -54,6 +57,7 @@ setenv =
     coverage75: _DEP_COVERAGE=coverage==7.5.4
     coverage76: _DEP_COVERAGE=coverage==7.6.12
     coverage77: _DEP_COVERAGE=coverage==7.7.1
+    coverage77: _DEP_COVERAGE=coverage==7.8.2
     # For testing against a coverage.py working tree.
     coveragedev: _DEP_COVERAGE=-e{env:COVERAGE_HOME}
 passenv =