Remove unnecessary coding, use a few f-strings

docs/source/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # GeoStatTools documentation build configuration file, created by
 # sphinx-quickstart on Fri Jan  5 14:20:43 2018.
@@ -111,7 +110,7 @@ def setup(app):
 # General information about the project.
 curr_year = datetime.datetime.now().year
 project = "GSTools"
-copyright = "2018 - {}, Sebastian Müller, Lennart Schüler".format(curr_year)
+copyright = f"2018 - {curr_year}, Sebastian Müller, Lennart Schüler"
 author = "Sebastian Müller, Lennart Schüler"
 
 # The version info for the project you're documenting, acts as replacement for

examples/00_misc/02_check_rand_meth_sampling.py

@@ -57,7 +57,7 @@ def plot_rand_meth_samples(generator):
     sample_in = np.sum(rad <= np.max(x))
     ax.hist(rad[rad <= np.max(x)], bins=sample_in // 50, density=True)
     ax.set_xlim([0, np.max(x)])
-    ax.set_title("Radius samples shown {}/{}".format(sample_in, len(rad)))
+    ax.set_title(f"Radius samples shown {sample_in}/{len(rad)}")
     ax.legend()
     plt.show()
 

examples/01_random_field/00_gaussian.py

@@ -1,4 +1,4 @@
-"""
+r"""
 A Very Simple Example
 ---------------------
 

examples/01_random_field/05_mesh_ensemble.py

@@ -46,13 +46,13 @@
 # You can specify the field name by the keyword `name`.
 
 for i in range(fields_no):
-    srf.mesh(mesh, points="centroids", name="c-field-{}".format(i), seed=i)
+    srf.mesh(mesh, points="centroids", name=f"c-field-{i}", seed=i)
 
 ###############################################################################
 # Now we generate fields on the mesh-points again controlled by a seed.
 
 for i in range(fields_no):
-    srf.mesh(mesh, points="points", name="p-field-{}".format(i), seed=i)
+    srf.mesh(mesh, points="points", name=f"p-field-{i}", seed=i)
 
 ###############################################################################
 # To get an impression we now want to plot the generated fields.

setup.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """GSTools: A geostatistical toolbox."""
 import os
 

src/gstools/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Purpose
 =======

src/gstools/config.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing global variables.
 

src/gstools/covmodel/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing a set of handy covariance models.
 

src/gstools/covmodel/base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing the base class for covariance models.
 

src/gstools/covmodel/fit.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing tools for the covariance-model.
 

src/gstools/covmodel/models.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing different covariance models.
 

src/gstools/covmodel/plot.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing plotting routines for the covariance models.
 

src/gstools/covmodel/tools.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing tools for the covariance-model.
 

src/gstools/covmodel/tpl_models.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing truncated power law covariance models.
 

src/gstools/field/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing tools for spatial random fields.
 

src/gstools/field/base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing a base class for spatial fields.
 

src/gstools/field/cond_srf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing a class for conditioned spatial random fields.
 

src/gstools/field/generator.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing generators for spatial random fields.
 

src/gstools/field/plot.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing plotting routines for spatial fields.
 

src/gstools/field/srf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing a class for standard spatial random fields.
 

src/gstools/field/summator.pyx

@@ -1,5 +1,4 @@
 #cython: language_level=3, boundscheck=False, wraparound=False, cdivision=True
-# -*- coding: utf-8 -*-
 """
 This is the randomization method summator, implemented in cython.
 """

src/gstools/field/tools.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing tools for Fields.
 

src/gstools/field/upscaling.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing upscaling routines for the spatial random field.
 

src/gstools/krige/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing kriging.
 

src/gstools/krige/base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing a base class for kriging.
 

src/gstools/krige/krigesum.pyx

@@ -1,5 +1,4 @@
 #cython: language_level=3, boundscheck=False, wraparound=False, cdivision=True
-# -*- coding: utf-8 -*-
 """
 This is a summator for the kriging routines
 """

src/gstools/krige/methods.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing a class for simple kriging.
 

src/gstools/krige/tools.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing tools for Kriging.
 

src/gstools/normalizer/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing normalization routines.
 

src/gstools/normalizer/base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing the base class for normalizers.
 

src/gstools/normalizer/methods.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing different normalizer transformations.
 

src/gstools/normalizer/tools.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing tools for Normalizers.
 

src/gstools/random/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage for random number generation.
 

src/gstools/random/rng.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing the core of the spatial random field generation.
 

src/gstools/random/tools.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing tools for random sampling.
 

src/gstools/tools/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing miscellaneous tools.
 

src/gstools/tools/export.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing export routines.
 

src/gstools/tools/geometric.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing geometric tools.
 

src/gstools/tools/misc.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing miscellaneous tools.
 

src/gstools/tools/special.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing special functions.
 

src/gstools/transform/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing transformations to post-process normal fields.
 

src/gstools/transform/array.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing array transformations.
 

src/gstools/transform/field.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing field transformations.
 

src/gstools/variogram/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing tools for estimating and fitting variograms.
 

src/gstools/variogram/binning.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing binning routines.
 

src/gstools/variogram/estimator.pyx

@@ -1,6 +1,5 @@
 #cython: language_level=3, boundscheck=False, wraparound=False, cdivision=True
 # distutils: language = c++
-# -*- coding: utf-8 -*-
 """
 This is the variogram estimater, implemented in cython.
 """
@@ -251,7 +250,7 @@ def unstructured(
     else:
         distance = dist_haversine
         if dim != 2:
-            raise ValueError('Haversine: dim = {0} != 2'.format(dim))
+            raise ValueError('Haversine: dim = {} != 2'.format(dim))
 
     if pos.shape[1] != f.shape[1]:
         raise ValueError('len(pos) = {0} != len(f) = {1} '.

src/gstools/variogram/variogram.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 GStools subpackage providing tools for estimating and fitting variograms.
 

tests/test_condition.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """This is the unittest of CondSRF class."""
 import unittest
 from copy import copy

tests/test_covmodel.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This is the unittest of CovModel class.
 """

tests/test_field.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 This is the unittest of SRF class.
 """

tests/test_incomprrandmeth.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This is the unittest of the RandMeth class.
 """

tests/test_krige.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This is the unittest of the kriging module.
 """

tests/test_latlon.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This is the unittest for latlon related routines.
 """

tests/test_normalizer.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This is the unittest of the Normalizer class.
 """

tests/test_randmeth.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This is the unittest of the RandMeth class.
 """

tests/test_rng.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This is the unittest of the RNG class.
 """

tests/test_srf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 This is the unittest of SRF class.
 """

tests/test_transform.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """This is the unittest of the transform submodule."""
 import unittest
 

tests/test_variogram_structured.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This is a unittest of the variogram module.
 """

tests/test_variogram_unstructured.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This is a unittest of the variogram module.
 """