Skip to content

Commit

Permalink
LNT: Update pre-commit pins (#1025)
Browse files Browse the repository at this point in the history
  • Loading branch information
snowman2 committed Feb 13, 2022
1 parent acaee8e commit 8f0e1f7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .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]
Expand Down
2 changes: 1 addition & 1 deletion 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.)
Expand Down
1 change: 0 additions & 1 deletion pyproj/database.pyi
Expand Up @@ -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]: ...
12 changes: 6 additions & 6 deletions pyproj/geod.py
Expand Up @@ -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


Expand Down Expand Up @@ -86,26 +86,26 @@ 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)
eccentricity_squared = 1.0 - (semi_minor_axis / semi_major_axis) ** 2
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:
Expand Down

0 comments on commit 8f0e1f7

Please sign in to comment.