diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f835e9c..9e94bc0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,13 +22,13 @@ repos: rev: 19.10b0 hooks: - id: black - args: ["-v", "--line-length", "79", "--skip-string-normalization", "--exclude", "flo_functions", '--exclude', "__init__.py"] + args: ["-v", "--line-length", "79", "--skip-string-normalization", "--exclude", "flo_functions.py", "--exclude", "__init__.py"] - repo: https://github.com/pre-commit/mirrors-isort rev: v4.3.21 hooks: - id: isort - args: ["-w", "79", "-s", "__init__.py"] + args: ["-w", "79", "-sg", "__init__.py", "-m", "3", "-tc"] # - repo: https://github.com/PyCQA/doc8 # rev: 0.8.1rc2 diff --git a/docs/requirements.txt b/docs/requirements.txt index 2f2be4b..e69de29 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +0,0 @@ -setuptools -setuptools_scm diff --git a/glidertools/__init__.py b/glidertools/__init__.py index 4fef44f..d54958f 100644 --- a/glidertools/__init__.py +++ b/glidertools/__init__.py @@ -5,16 +5,27 @@ import warnings as _warnings -from setuptools_scm import get_version +from pkg_resources import DistributionNotFound, get_distribution -from . import (calibration, cleaning, flo_functions, load, mapping, optics, - physics, utils) +from . import ( # NOQA + calibration, + cleaning, + flo_functions, + load, + mapping, + optics, + physics, + utils, +) from .mapping import grid_data, interp_obj from .plot import logo as make_logo from .plot import plot_functions as plot from .processing import * -__version__ = get_version(root='..', relative_to=__file__) -del get_version +try: + __version__ = get_distribution('glidertools').version +except DistributionNotFound: + __version__ = 'version_undefined' +del get_distribution, DistributionNotFound _warnings.filterwarnings('ignore', category=RuntimeWarning) diff --git a/glidertools/calibration.py b/glidertools/calibration.py index b55f7f5..3541b9a 100644 --- a/glidertools/calibration.py +++ b/glidertools/calibration.py @@ -3,9 +3,11 @@ from __future__ import print_function as _pf from __future__ import unicode_literals as _ul +from inspect import currentframe as getframe + import numpy as _np -from .helpers import getframe, transfer_nc_attrs +from .helpers import transfer_nc_attrs def bottle_matchup( diff --git a/glidertools/cleaning.py b/glidertools/cleaning.py index 0629ea5..b85ea11 100644 --- a/glidertools/cleaning.py +++ b/glidertools/cleaning.py @@ -3,7 +3,9 @@ from __future__ import print_function as _pf from __future__ import unicode_literals as _ul -from .helpers import getframe, transfer_nc_attrs +from inspect import currentframe as getframe + +from .helpers import transfer_nc_attrs def outlier_bounds_std(arr, multiplier=3): diff --git a/glidertools/helpers.py b/glidertools/helpers.py index 0003e65..63e5045 100644 --- a/glidertools/helpers.py +++ b/glidertools/helpers.py @@ -1,10 +1,11 @@ import inspect -from inspect import currentframe as getframe -from setuptools_scm import get_version +from pkg_resources import DistributionNotFound, get_distribution -version = get_version(root='..', relative_to=__file__) -del get_version +try: + version = get_distribution('glidertools').version +except DistributionNotFound: + version = 'version_undefined' class GliderToolsWarning(UserWarning): diff --git a/glidertools/mapping.py b/glidertools/mapping.py index 65dbcca..ef86b95 100644 --- a/glidertools/mapping.py +++ b/glidertools/mapping.py @@ -1,8 +1,10 @@ +from inspect import currentframe as getframe + import numpy as np from matplotlib import pyplot as plt from numexpr import evaluate -from .helpers import GliderToolsWarning, getframe, transfer_nc_attrs +from .helpers import GliderToolsWarning, transfer_nc_attrs class QuadTree: diff --git a/glidertools/optics.py b/glidertools/optics.py index 416a20b..eb9a5d3 100644 --- a/glidertools/optics.py +++ b/glidertools/optics.py @@ -3,7 +3,9 @@ from __future__ import print_function as _pf from __future__ import unicode_literals as _ul -from .helpers import getframe, transfer_nc_attrs +from inspect import currentframe as getframe + +from .helpers import transfer_nc_attrs def find_bad_profiles( diff --git a/glidertools/physics.py b/glidertools/physics.py index c9dbb8b..44dd5e6 100644 --- a/glidertools/physics.py +++ b/glidertools/physics.py @@ -4,8 +4,9 @@ from __future__ import unicode_literals as _ul import warnings +from inspect import currentframe as getframe -from .helpers import GliderToolsWarning, getframe, transfer_nc_attrs +from .helpers import GliderToolsWarning, transfer_nc_attrs try: _gsw_avail = True diff --git a/glidertools/processing.py b/glidertools/processing.py index d7ea6d5..d786725 100644 --- a/glidertools/processing.py +++ b/glidertools/processing.py @@ -3,7 +3,9 @@ from __future__ import print_function as _pf from __future__ import unicode_literals as _ul -from .helpers import getframe, printv, transfer_nc_attrs +from inspect import currentframe as getframe + +from .helpers import printv, transfer_nc_attrs def calc_physics( diff --git a/glidertools/utils.py b/glidertools/utils.py index af84595..4663dcc 100644 --- a/glidertools/utils.py +++ b/glidertools/utils.py @@ -3,7 +3,9 @@ from __future__ import print_function as _pf from __future__ import unicode_literals as _ul -from .helpers import getframe, transfer_nc_attrs +from inspect import currentframe as getframe + +from .helpers import transfer_nc_attrs def time_average_per_dive(dives, time): diff --git a/requirements.txt b/requirements.txt index 1ec1f66..ee175a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,3 @@ pandas astral netCDF4 numexpr -setuptools_scm