From 8f0e1f7ddc5ba5a1992f939f91bb9ea023316219 Mon Sep 17 00:00:00 2001 From: "Alan D. Snow" Date: Sat, 12 Feb 2022 19:25:27 -0600 Subject: [PATCH] LNT: Update pre-commit pins (#1025) --- .pre-commit-config.yaml | 10 +++++----- pyproj/base.pxi | 2 +- pyproj/database.pyi | 1 - pyproj/geod.py | 12 ++++++------ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d1cde9dd3..87d784379 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,26 +1,26 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v4.1.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 22.1.0 hooks: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.6.1 + rev: 5.10.1 hooks: - id: isort args: [setup.py, pyproj/, test/, docs/] - repo: https://github.com/asottile/blacken-docs - rev: v1.8.0 + rev: v1.12.1 hooks: - id: blacken-docs args: [--skip-errors] - repo: https://gitlab.com/pycqa/flake8 - rev: 3.8.4 + rev: 4.0.1 hooks: - id: flake8 additional_dependencies: [flake8-comprehensions>=3.1.0] diff --git a/pyproj/base.pxi b/pyproj/base.pxi index 0f7ad516d..f7d38aa0a 100644 --- a/pyproj/base.pxi +++ b/pyproj/base.pxi @@ -1,6 +1,6 @@ from cpython.ref cimport PyObject -from math import radians, degrees +from math import degrees, radians cdef double _DG2RAD = radians(1.) diff --git a/pyproj/database.pyi b/pyproj/database.pyi index 7a33ff8e3..79779f2cd 100644 --- a/pyproj/database.pyi +++ b/pyproj/database.pyi @@ -38,5 +38,4 @@ def query_crs_info( contains: bool = False, allow_deprecated: bool = False, ) -> List[CRSInfo]: ... - def get_database_metadata(key: str) -> Optional[str]: ... diff --git a/pyproj/geod.py b/pyproj/geod.py index 23a10edb0..73a32cb4e 100644 --- a/pyproj/geod.py +++ b/pyproj/geod.py @@ -50,12 +50,12 @@ def _params_from_ellps_map(ellps): sphere = True if "b" in ellps_dict: semi_minor_axis: float = ellps_dict["b"] - eccentricity_squared: float = 1.0 - semi_minor_axis ** 2 / semi_major_axis ** 2 + eccentricity_squared: float = 1.0 - semi_minor_axis**2 / semi_major_axis**2 flattening: float = (semi_major_axis - semi_minor_axis) / semi_major_axis elif "rf" in ellps_dict: flattening = 1.0 / ellps_dict["rf"] semi_minor_axis = semi_major_axis * (1.0 - flattening) - eccentricity_squared = 1.0 - semi_minor_axis ** 2 / semi_major_axis ** 2 + eccentricity_squared = 1.0 - semi_minor_axis**2 / semi_major_axis**2 return semi_major_axis, semi_minor_axis, flattening, eccentricity_squared, sphere @@ -86,12 +86,12 @@ def _params_from_kwargs(kwargs): semi_major_axis = kwargs["a"] if "b" in kwargs: semi_minor_axis = kwargs["b"] - eccentricity_squared = 1.0 - semi_minor_axis ** 2 / semi_major_axis ** 2 + eccentricity_squared = 1.0 - semi_minor_axis**2 / semi_major_axis**2 flattening = (semi_major_axis - semi_minor_axis) / semi_major_axis elif "rf" in kwargs: flattening = 1.0 / kwargs["rf"] semi_minor_axis = semi_major_axis * (1.0 - flattening) - eccentricity_squared = 1.0 - semi_minor_axis ** 2 / semi_major_axis ** 2 + eccentricity_squared = 1.0 - semi_minor_axis**2 / semi_major_axis**2 elif "f" in kwargs: flattening = kwargs["f"] semi_minor_axis = semi_major_axis * (1.0 - flattening) @@ -99,13 +99,13 @@ def _params_from_kwargs(kwargs): elif "es" in kwargs: eccentricity_squared = kwargs["es"] semi_minor_axis = math.sqrt( - semi_major_axis ** 2 - eccentricity_squared * semi_major_axis ** 2 + semi_major_axis**2 - eccentricity_squared * semi_major_axis**2 ) flattening = (semi_major_axis - semi_minor_axis) / semi_major_axis elif "e" in kwargs: eccentricity_squared = kwargs["e"] ** 2 semi_minor_axis = math.sqrt( - semi_major_axis ** 2 - eccentricity_squared * semi_major_axis ** 2 + semi_major_axis**2 - eccentricity_squared * semi_major_axis**2 ) flattening = (semi_major_axis - semi_minor_axis) / semi_major_axis else: