Merge branch '3.0.x'

diff --cc .pre-commit-config.yaml
Simple merge

diff --cc setup.cfg
index c23d9390950daa6194d40b6d64ef059f37d00d47,b4031360611e3f53a8af7c67201f9a3406328518..fcc2b4b43392b32a9ab65884d17ef93ac2840399
--- 1/setup.cfg
--- 2/setup.cfg
+++ b/setup.cfg
@@@ -32,8 -32,8 +32,8 @@@ classifiers 
  [options]
  packages = find:
  package_dir = = src
- include_package_data = true
+ include_package_data = True
 -python_requires = >= 3.6
 +python_requires = >= 3.7
  # Dependencies are in setup.py for GitHub's dependency graph.
  
  [options.packages.find]