chore: format update before dropping Python 2/3.5 (#511)

Author: henryiii

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
   - id: black
 
 - repo: https://github.com/nbQA-dev/nbQA
-  rev: 0.5.7
+  rev: 0.5.9
   hooks:
   - id: nbqa-black
     additional_dependencies: [black==20.8b1]
@@ -34,7 +34,7 @@ repos:
     additional_dependencies: [pyyaml]
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.7.4
+  rev: v2.10.0
   hooks:
   - id: pyupgrade
 
@@ -43,6 +43,12 @@ repos:
   hooks:
   - id: isort
 
+- repo: https://github.com/asottile/setup-cfg-fmt
+  rev: v1.16.0
+  hooks:
+  - id: setup-cfg-fmt
+    args: [--min-py3-version, "3.5"]
+
 - repo: https://github.com/pycqa/flake8
   rev: 3.8.4
   hooks:
@@ -51,7 +57,7 @@ repos:
     additional_dependencies: [flake8-bugbear, flake8-print]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.800
+  rev: v0.812
   hooks:
   - id: mypy
     files: src

setup.cfg

@@ -1,34 +1,37 @@
 [metadata]
 name = boost_histogram
+description = The Boost::Histogram Python wrapper.
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/scikit-hep/boost-histogram
 author = Hans Dembinski and Henry Schreiner
 author_email = [email protected]
 maintainer = Hans Dembinski and Henry Schreiner
 maintainer_email = [email protected]
-url = https://github.com/scikit-hep/boost-histogram
-description = The Boost::Histogram Python wrapper.
-long_description = file: README.md
-long_description_content_type = text/markdown
-license = BSD 3-Clause License
+license = BSD-3-Clause
+license_file = LICENSE
 classifiers =
     Development Status :: 4 - Beta
     Intended Audience :: Developers
     Intended Audience :: Information Technology
     Intended Audience :: Science/Research
     License :: OSI Approved :: BSD License
-    Operating System :: Microsoft :: Windows
     Operating System :: MacOS
+    Operating System :: Microsoft :: Windows
     Operating System :: POSIX
     Operating System :: Unix
+    Programming Language :: C++
     Programming Language :: Python
+    Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
-    Programming Language :: C++
-    Programming Language :: Python :: Implementation :: PyPy
     Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: Implementation :: PyPy
     Topic :: Scientific/Engineering
     Topic :: Scientific/Engineering :: Information Analysis
     Topic :: Scientific/Engineering :: Mathematics
@@ -37,14 +40,14 @@ classifiers =
     Topic :: Utilities
 
 [options]
-python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
 packages = find:
+install_requires =
+    numpy>=1.13.3
+    enum34>=1.1;python_version < '3.4'
+    typing>=3.5;python_version < '3.5'
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
 package_dir =
     =src
-install_requires =
-    numpy >=1.13.3
-    typing >= 3.5; python_version < '3.5'
-    enum34 >= 1.1; python_version < '3.4'
 
 [options.packages.find]
 where = src
@@ -53,7 +56,7 @@ exclude =
     extern
 
 [tool:pytest]
-junit_family=xunit2
+junit_family = xunit2
 addopts = --benchmark-disable -Wd --strict-markers
 xfail_strict = True
 testpaths =
@@ -83,22 +86,7 @@ per-file-ignores =
 warn_unused_configs = True
 python_version = 2.7
 files = src
-
-# Currently (0.800) identical to --strict
-# disallow_any_generics = True
-# disallow_subclassing_any = True
-# disallow_untyped_calls = True
-# disallow_untyped_defs = True
-# disallow_incomplete_defs = True
 check_untyped_defs = True
-# disallow_untyped_decorators = True
-# no_implicit_optional = True
-# warn_redundant_casts = True
-# warn_unused_ignores = True
-# warn_return_any = True
-# no_implicit_reexport = True
-# strict_equality = True
-
 
 [mypy-numpy]
 ignore_missing_imports = True
@@ -114,40 +102,40 @@ ignore_missing_imports = True
 
 [check-manifest]
 ignore =
-  .all-contributorsrc
-  .clang-format
-  .cmake-format.yaml
-  .pre-commit-config.yaml
-  .pre-commit-nodocker.yaml
-  .readthedocs.yml
-  .clang-tidy
-  examples/**
-  notebooks/**
-  docs/**
-  scripts/**
-  dev-requirements.txt
-  extern/**/*.py
-  extern/**/*.md
-  extern/**/*.rst
-  extern/**/*.toml
-  extern/*/checks/**
-  extern/*/test/**
-  extern/*/benchmark/**
-  extern/*/doc/**
-  extern/*/examples/**
-  extern/*/tools/**
-  extern/pybind11/docs/**
-  extern/pybind11/tests/**
-  CMakeLists.txt
-  extern/*/README.md
-  CONTRIBUTING.md
-  Jamfile
-  configure
-  *.clang_complete
-  *.html
-  *.in
-  *.json
-  *.yml
-  src/boost_histogram/_core.*
-  src/boost_histogram/version.py
-  tests/.pytest_cache/**
+    .all-contributorsrc
+    .clang-format
+    .cmake-format.yaml
+    .pre-commit-config.yaml
+    .pre-commit-nodocker.yaml
+    .readthedocs.yml
+    .clang-tidy
+    examples/**
+    notebooks/**
+    docs/**
+    scripts/**
+    dev-requirements.txt
+    extern/**/*.py
+    extern/**/*.md
+    extern/**/*.rst
+    extern/**/*.toml
+    extern/*/checks/**
+    extern/*/test/**
+    extern/*/benchmark/**
+    extern/*/doc/**
+    extern/*/examples/**
+    extern/*/tools/**
+    extern/pybind11/docs/**
+    extern/pybind11/tests/**
+    CMakeLists.txt
+    extern/*/README.md
+    CONTRIBUTING.md
+    Jamfile
+    configure
+    *.clang_complete
+    *.html
+    *.in
+    *.json
+    *.yml
+    src/boost_histogram/_core.*
+    src/boost_histogram/version.py
+    tests/.pytest_cache/**

src/boost_histogram/_internal/hist.py

@@ -138,7 +138,7 @@ def __init__(self, *axes, **kwargs):
 
         # Support objects that provide a to_boost method, like Uproot
         elif len(axes) == 1 and hasattr(axes[0], "_to_boost_histogram_"):
-            self.__init__(axes[0]. _to_boost_histogram_())
+            self.__init__(axes[0]._to_boost_histogram_())  # type: ignore
             return
 
         # Keyword only trick (change when Python2 is dropped)
@@ -601,7 +601,7 @@ def to_numpy(self, flow=False, **kwargs):
         if dd:
             return hist, return_tuple[1:]
         else:
-            return (hist,) +  return_tuple[1:]
+            return (hist,) + return_tuple[1:]
 
     @inject_signature("self, *, deep=True")
     def copy(self, **kwargs):

tests/test_internal_histogram.py

@@ -135,6 +135,7 @@ def test_numpy_dd():
     assert_array_equal(x1, x2)
     assert_array_equal(y1, y2)
 
+
 def test_numpy_weights():
     h = bh.Histogram(
         bh.axis.Regular(10, 0, 1), bh.axis.Regular(5, 0, 1), storage=bh.storage.Weight()