chore: update formatting (#28)

* chore: update formatting

* chore: test on 3.9 too

Author: henryiii

.github/workflows/ci.yml

@@ -18,6 +18,7 @@ jobs:
         - 2.7
         - 3.6
         - 3.8
+        - 3.9
     name: Check Python ${{ matrix.python-version }}
     steps:
     - uses: actions/checkout@v2

.pre-commit-config.yaml

@@ -17,7 +17,24 @@ repos:
   - id: mixed-line-ending
   - id: requirements-txt-fixer
   - id: trailing-whitespace
-  - id: fix-encoding-pragma
+
+- repo: https://github.com/asottile/pyupgrade
+  rev: v2.10.0
+  hooks:
+  - id: pyupgrade
+    # args: [--py36-plus]
+
+
+- repo: https://github.com/PyCQA/isort
+  rev: 5.7.0
+  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/mgedmin/check-manifest
   rev: "0.46"
@@ -38,5 +55,4 @@ repos:
     additional_dependencies:
     - flake8-bugbear
     - flake8-docstrings
-    - flake8-import-order
     - flake8-print

setup.cfg

@@ -1,42 +1,45 @@
 [metadata]
 name = vector
+description = Vector classes and utilities
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/scikit-hep/vector
 author = Eduardo Rodrigues
 author_email = [email protected]
 maintainer = The Scikit-HEP admins
 maintainer_email = [email protected]
-description = Vector classes and utilities
-long_description = file: README.md
-long_description_content_type = md
-url = https://github.com/scikit-hep/vector
-license = BSD 3-Clause License
-keywords =
-  vector
+license = BSD-3-Clause
+license_file = LICENSE
 platforms =
-  Any
+    Any
 classifiers =
-  Topic :: Scientific/Engineering
-  Intended Audience :: Science/Research
-  Intended Audience :: Developers
-  Operating System :: OS Independent
-  License :: OSI Approved :: BSD License
-  Programming Language :: Python
-  Programming Language :: Python :: 2
-  Programming Language :: Python :: 2.7
-  Programming Language :: Python :: 3
-  Programming Language :: Python :: 3.6
-  Programming Language :: Python :: 3.7
-  Programming Language :: Python :: 3.8
-  Development Status :: 1 - Planning
+    Development Status :: 1 - Planning
+    Intended Audience :: Developers
+    Intended Audience :: Science/Research
+    License :: OSI Approved :: BSD License
+    Operating System :: OS Independent
+    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
+    Topic :: Scientific/Engineering
+keywords =
+    vector
 
 [options]
-python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
 packages = find:
-package_dir =
-  =src
 install_requires =
-  numpy >=1.13.3
-  typing; python_version<"3.5"
-  typing_extensions; python_version<"3.8"
+    numpy>=1.13.3
+    typing;python_version<"3.5"
+    typing_extensions;python_version<"3.8"
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+package_dir =
+    =src
 
 [options.packages.find]
 where = src
@@ -46,9 +49,13 @@ addopts = -rs -s -Wd
 testpaths =
     tests
 
+[tool:isort]
+profile = black
+multi_line_output = 3
+
 [flake8]
 ignore = E203, E231, E501, E722, W503, B950
-select = C,E,F,W,T,B,B9,I
+select = C,E,F,W,T,B,B9
 per-file-ignores =
     tests/*: T
 
@@ -72,4 +79,4 @@ universal = 1
 
 [tool.check-manifest]
 ignore =
-  .github
+    .github

setup.py

@@ -11,7 +11,7 @@
     "dev": [
         "awkward>=1.0.0",
         "uproot>=4.0.0",
-        'numba>=0.50; python_version>="3"',
+        'numba>=0.50; python_version>="3" and python_version<"3.9"',
         "scikit-hep-testdata>=0.2.0",
         "pytest>=4.6",
     ],

src/vector/awkward/lorentz/xyzt.py

@@ -10,7 +10,6 @@
 from typing import Any, Dict
 
 import awkward as ak
-
 import numpy as np
 
 import vector.core.lorentz.xyzt
@@ -19,7 +18,7 @@
 
 class LorentzXYZT(ak.Record, LorentzXYZTMethodMixin):
     def __repr__(self):
-        return "Lxyz({0:.3g} {1:.3g} {2:.3g} {3:.3g})".format(
+        return "Lxyz({:.3g} {:.3g} {:.3g} {:.3g})".format(
             self.x, self.y, self.z, self.t
         )
 

src/vector/core/lorentz/xyzt.py

@@ -13,7 +13,6 @@
 
 from vector.core import numpy as np
 
-
 # Functions that return a value
 
 # x: already included

src/vector/numba/lorentz/xyzt.py

@@ -13,7 +13,6 @@
 from vector import core
 from vector.single.lorentz.xyzt import LorentzXYZTFree
 
-
 # Typing phase - Teaching Numba about our types
 
 

src/vector/numpy/lorentz/xyzt.py

@@ -6,7 +6,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-from typing import Any, TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, Any, cast
 
 import vector.mixins.lorentz.xyzt
 from vector.core import numpy as np
@@ -32,15 +32,15 @@ def __init__(self, x, y, z, t):
 
     def __repr__(self):
         # type: () -> str
-        return "Lxyz({0}, {1}, {2}, {3})".format(self.x, self.y, self.z, self.t)
+        return "Lxyz({}, {}, {}, {})".format(self.x, self.y, self.z, self.t)
 
     def __getitem__(self, attr):
         # type: (str) -> ArrayLike
         # It has to behave the same way as the bound objects or users will get confused.
         if attr in ("x", "y", "z", "t"):
             return getattr(self, attr)
         else:
-            raise ValueError("key {0} does not exist in x,y,z,t".format(attr))
+            raise ValueError("key {} does not exist in x,y,z,t".format(attr))
 
 
 if TYPE_CHECKING:

src/vector/protocols/lorentz.py

@@ -3,7 +3,6 @@
 
 from typing import Protocol, Tuple, TypeVar, overload
 
-
 Self = TypeVar("Self", bound="Scalar")
 
 

src/vector/single/lorentz/xyzt.py

@@ -25,7 +25,7 @@ def __init__(self, x, y, z, t):
 
     def __repr__(self):
         # type: () -> str
-        return "Lxyz({0:.3g} {1:.3g} {2:.3g} {3:.3g})".format(
+        return "Lxyz({:.3g} {:.3g} {:.3g} {:.3g})".format(
             self.x, self.y, self.z, self.t
         )
 
@@ -36,7 +36,7 @@ def __getitem__(self, attr):
             return getattr(self, attr)
         else:
             raise ValueError(
-                "key {0} does not exist (not in record)".format(json.dumps(attr))
+                "key {} does not exist (not in record)".format(json.dumps(attr))
             )