Merge pull request #222 from xylar/remove-future-imports

Clean-up on imports and pre-commit

.pre-commit-config.yaml

@@ -14,7 +14,6 @@ repos:
     rev: 5.13.2
     hooks:
       - id: isort
-        exclude: "geometric_features/__init__.py"
 
   # Can run individually with `flynt [file]` or `flynt [source]`
   - repo: https://github.com/ikamensh/flynt

docs/conf.py

@@ -12,11 +12,10 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
 from datetime import date
 
-import geometric_features
 from geometric_features.docs.parse_quick_start import build_quick_start
+from geometric_features.version import __version__
 
 # -- General configuration ------------------------------------------------
 
@@ -72,9 +71,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = geometric_features.__version__
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = geometric_features.__version__
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

examples/setup_antarctic_basins.py

@@ -3,10 +3,6 @@
 This script combines Antarctic basins into a single feature file.
 """
 
-# stuff to make scipts work for python 2 and python 3
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import matplotlib.pyplot as plt
 
 from geometric_features import GeometricFeatures

examples/setup_extended_antarctic_basins.py

@@ -4,10 +4,6 @@
 into a single feature file.
 """
 
-# stuff to make scipts work for python 2 and python 3
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import matplotlib.pyplot as plt
 
 from geometric_features import FeatureCollection, GeometricFeatures

examples/setup_ice_shelves.py

@@ -3,10 +3,6 @@
 This script creates region groups for ice shelves
 """
 
-# stuff to make scipts work for python 2 and python 3
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import matplotlib.pyplot as plt
 
 from geometric_features import FeatureCollection, GeometricFeatures

examples/setup_ocean_critical_passages.py

@@ -3,10 +3,6 @@
 This script combines transects defining cricial passages.
 """
 
-# stuff to make scipts work for python 2 and python 3
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 from geometric_features import GeometricFeatures
 
 # create a GeometricFeatures object that points to a local cache of geometric

examples/setup_ocean_land_coverage.py

@@ -7,10 +7,6 @@
 up sub-ice-shelf cavities in the ocean around Antarctica.
 """
 
-# stuff to make scipts work for python 2 and python 3
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import matplotlib.pyplot as plt
 
 from geometric_features import GeometricFeatures

examples/setup_ocean_region_groups.py

@@ -11,10 +11,6 @@
     regions.
 """
 
-# stuff to make scipts work for python 2 and python 3
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import copy
 
 import matplotlib.pyplot as plt

examples/setup_ocean_standard_transport_sections.py

@@ -4,10 +4,6 @@
 all of which have the "standard_transport_sections" tag.
 """
 
-# stuff to make scipts work for python 2 and python 3
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 from geometric_features import GeometricFeatures
 
 # create a GeometricFeatures object that points to a local cache of geometric

geometric_features/__init__.py

@@ -1,17 +1,9 @@
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
+from geometric_features.__main__ import (combine_features, difference_features,
+                                         fix_features_at_antimeridian,
+                                         merge_features, plot_features,
+                                         set_group_name, simplify_features,
+                                         split_features, tag_features)
+from geometric_features.feature_collection import (FeatureCollection,
+                                                   read_feature_collection)
 from geometric_features.geometric_features import GeometricFeatures
-
-from geometric_features.feature_collection import FeatureCollection, \
-     read_feature_collection
-
-from geometric_features.__main__ import combine_features, difference_features, \
-    fix_features_at_antimeridian, merge_features, plot_features, \
-    set_group_name, split_features, simplify_features, tag_features
-
 from geometric_features.utils import write_feature_names_and_tags
-
-
-__version_info__ = (1, 6, 0)
-__version__ = '.'.join(str(vi) for vi in __version_info__)

geometric_features/__main__.py

@@ -1,13 +1,10 @@
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import argparse
 import os
 
-import geometric_features
-from geometric_features import GeometricFeatures
 from geometric_features.feature_collection import (FeatureCollection,
                                                    read_feature_collection)
+from geometric_features.geometric_features import GeometricFeatures
+from geometric_features.version import __version__
 
 
 def combine_features():
@@ -28,7 +25,7 @@ def combine_features():
                         metavar="PATH", default="features.geojson")
     parser.add_argument('-v', '--version',
                         action='version',
-                        version=f'geometric_features {geometric_features.__version__}',
+                        version=f'geometric_features {__version__}',
                         help="Show version number and exit")
 
     args = parser.parse_args()
@@ -57,7 +54,7 @@ def difference_features():
                         metavar="PATH", default="features.geojson")
     parser.add_argument('-v', '--version',
                         action='version',
-                        version=f'geometric_features {geometric_features.__version__}',
+                        version=f'geometric_features {__version__}',
                         help="Show version number and exit")
 
     args = parser.parse_args()
@@ -82,7 +79,7 @@ def fix_features_at_antimeridian():
                         metavar="PATH", default="features.geojson")
     parser.add_argument('-v', '--version',
                         action='version',
-                        version=f'geometric_features {geometric_features.__version__}',
+                        version=f'geometric_features {__version__}',
                         help="Show version number and exit")
 
     args = parser.parse_args()
@@ -124,7 +121,7 @@ def merge_features():
                         metavar="PATH")
     parser.add_argument('-v', '--version',
                         action='version',
-                        version=f'geometric_features {geometric_features.__version__}',
+                        version=f'geometric_features {__version__}',
                         help="Show version number and exit")
 
     args = parser.parse_args()
@@ -169,7 +166,7 @@ def plot_features():
                         " (0.0 indicates skip subdivision)")
     parser.add_argument('-v', '--version',
                         action='version',
-                        version=f'geometric_features {geometric_features.__version__}',
+                        version=f'geometric_features {__version__}',
                         help="Show version number and exit")
 
     args = parser.parse_args()
@@ -191,7 +188,8 @@ def plot_features():
             figsize = (12, 9)
         fig = fc.plot(mapType, args.max_length, figsize)
 
-        plotFileName = f'{os.path.splitext(args.feature_file)[0]}_{mapType}.png'
+        plotFileName = \
+            f'{os.path.splitext(args.feature_file)[0]}_{mapType}.png'
 
         fig.savefig(plotFileName)
 
@@ -211,7 +209,7 @@ def set_group_name():
                         required=True)
     parser.add_argument('-v', '--version',
                         action='version',
-                        version=f'geometric_features {geometric_features.__version__}',
+                        version=f'geometric_features {__version__}',
                         help="Show version number and exit")
 
     args = parser.parse_args()
@@ -240,7 +238,7 @@ def simplify_features():
                         metavar="PATH", default="features.geojson")
     parser.add_argument('-v', '--version',
                         action='version',
-                        version=f'geometric_features {geometric_features.__version__}',
+                        version=f'geometric_features {__version__}',
                         help="Show version number and exit")
     args = parser.parse_args()
 
@@ -265,7 +263,7 @@ def split_features():
                         metavar="PATH", default="./geometric_data")
     parser.add_argument('-v', '--version',
                         action='version',
-                        version=f'geometric_features {geometric_features.__version__}',
+                        version=f'geometric_features {__version__}',
                         help="Show version number and exit")
     args = parser.parse_args()
 
@@ -294,7 +292,7 @@ def tag_features():
                         metavar="PATH", default="features.geojson")
     parser.add_argument('-v', '--version',
                         action='version',
-                        version=f'geometric_features {geometric_features.__version__}',
+                        version=f'geometric_features {__version__}',
                         help="Show version number and exit")
     args = parser.parse_args()
 

geometric_features/download.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import os
 from urllib.request import pathname2url
 

geometric_features/feature_collection.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import json
 
 try:

geometric_features/geometric_features.py

@@ -1,14 +1,11 @@
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import json
 import os
 from importlib.resources import files as imp_res_files
 
-import geometric_features
 from geometric_features.download import download_files
 from geometric_features.feature_collection import (FeatureCollection,
                                                    read_feature_collection)
+from geometric_features.version import __version__
 
 
 class GeometricFeatures(object):
@@ -57,7 +54,7 @@ def __init__(self, cacheLocation=None, remoteBranchOrTag=None):
         else:
             self.cacheLocation = cacheLocation
         if remoteBranchOrTag is None:
-            self.remoteBranch = geometric_features.__version__
+            self.remoteBranch = __version__
         else:
             self.remoteBranch = remoteBranchOrTag
 
@@ -262,7 +259,8 @@ def _get_feature_names(self, componentName, objectType, featureNames,
         component = self.allFeaturesAndTags[componentName]
 
         if objectType not in component:
-            raise KeyError(f'invalid object {objectType} in component {componentName}')
+            raise KeyError(
+                f'invalid object {objectType} in component {componentName}')
 
         availableFeaturesAndTags = component[objectType]
 

geometric_features/plot.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import cartopy.crs
 import cartopy.feature
 import matplotlib.pyplot as plt

geometric_features/utils.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-
 import datetime
 import glob
 import json

geometric_features/version.py

@@ -0,0 +1,2 @@
+__version_info__ = (1, 6, 0)
+__version__ = '.'.join(str(vi) for vi in __version_info__)

setup.py

@@ -6,7 +6,7 @@
 from setuptools import find_packages, setup
 
 here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, 'geometric_features', '__init__.py')) as f:
+with open(os.path.join(here, 'geometric_features', 'version.py')) as f:
     init_file = f.read()
 
 version = re.search(r'{}\s*=\s*[(]([^)]*)[)]'.format('__version_info__'),
@@ -49,7 +49,7 @@
                      'difference_features = '
                      'geometric_features.__main__:difference_features',
                      'fix_features_at_antimeridian = '
-                     'geometric_features.__main__:fix_features_at_antimeridian',
+                     'geometric_features.__main__:fix_features_at_antimeridian',  # noqa: E501
                      'merge_features = '
                      'geometric_features.__main__:merge_features',
                      'plot_features = '