fixing version finding bug

.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

docs/requirements.txt

@@ -1,2 +0,0 @@
-setuptools
-setuptools_scm

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)

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(

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):

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):

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:

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(

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

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(

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):

requirements.txt

@@ -9,4 +9,3 @@ pandas
 astral
 netCDF4
 numexpr
-setuptools_scm