Skip to content

Commit

Permalink
Merge pull request #143 from ocefpaf/avoid_setuptools
Browse files Browse the repository at this point in the history
Avoid setuptools
  • Loading branch information
ocefpaf committed Aug 9, 2023
2 parents ec783dc + 43c7a36 commit 5a237ec
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ repos:
- --ignore-words-list=nin,preformed,wih,

- repo: https://github.com/tox-dev/pyproject-fmt
rev: 0.12.1
rev: 0.13.0
hooks:
- id: pyproject-fmt


- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.274
rev: v0.0.283
hooks:
- id: ruff

Expand Down
2 changes: 1 addition & 1 deletion gsw/geostrophy.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def distance(lon, lat, p=0, axis=-1):
raise ValueError(f'lon, lat shapes must match; found {lon.shape}, {lat.shape}')
if not (lon.ndim in (1, 2) and lon.shape[axis] > 1):
raise ValueError('lon, lat must be 1-D or 2-D with more than one point'
' along axis; found shape {} and axis {}'.format(lon.shape, axis))
f' along axis; found shape {lon.shape} and axis {axis}')
if lon.ndim == 1:
one_d = True
# xarray requires expand_dims() rather than [newaxis, :]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
import os
import shutil
import sys
from distutils.command.build_ext import build_ext as _build_ext

import pkg_resources
from setuptools import Extension, setup
from setuptools.command.build_ext import build_ext as _build_ext

rootpath = os.path.abspath(os.path.dirname(__file__))

Expand Down

0 comments on commit 5a237ec

Please sign in to comment.