Merge pull request #3 from GeoStat-Framework/develop

Bugfix 1.0.1

Author: MuellerSeb

CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to **AnaFlow** will be documented in this file.
 
 
+## [1.0.1] - 2020-04-02
+
+### Bugfixes
+- `ModuleNotFoundError` not present in py35
+- `np.asscalar` deprecated, use `array.item()`
+- `CHANGELOG.md` links updated
+
+
 ## [1.0.0] - 2020-03-22
 
 ### Enhancements
@@ -69,8 +77,9 @@ Containing:
 - lap_transgwflow_cyl - Solution for a diskmodel in laplace inversion
 
 
-[1.0.0]: https://github.com/GeoStat-Framework/gstools/compare/v0.4.0...v1.0.0
-[0.4.0]: https://github.com/GeoStat-Framework/gstools/compare/v0.3.0...v0.4.0
-[0.3.0]: https://github.com/GeoStat-Framework/gstools/compare/v0.2.4...v0.3.0
-[0.2.4]: https://github.com/GeoStat-Framework/gstools/compare/v0.1...v0.2.4
-[0.1.0]: https://github.com/GeoStat-Framework/gstools/releases/tag/v0.1
+[1.0.1]: https://github.com/GeoStat-Framework/AnaFlow/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/GeoStat-Framework/AnaFlow/compare/v0.4.0...v1.0.0
+[0.4.0]: https://github.com/GeoStat-Framework/AnaFlow/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/GeoStat-Framework/AnaFlow/compare/v0.2.4...v0.3.0
+[0.2.4]: https://github.com/GeoStat-Framework/AnaFlow/compare/v0.1...v0.2.4
+[0.1.0]: https://github.com/GeoStat-Framework/AnaFlow/releases/tag/v0.1

anaflow/__init__.py

@@ -110,7 +110,7 @@
 
 try:
     from anaflow._version import __version__
-except ModuleNotFoundError:  # pragma: nocover
+except ImportError:  # pragma: nocover
     # package is not installed
     __version__ = "0.0.0.dev0"
 

anaflow/flow/laplace.py

@@ -171,9 +171,9 @@ def grf_laplace(
     diff_sr0 = np.sqrt(S_part[0] / K_part[0])
     # set the general pumping-condtion depending on the well-radius
     if R_part[0] > 0.0:
-        Qs = -s ** (-0.5) / diff_sr0 * R_part[0] ** nu1 * cond(s, **cond_kw)
+        Qs = -(s ** (-0.5)) / diff_sr0 * R_part[0] ** nu1 * cond(s, **cond_kw)
     else:
-        Qs = -(2 / diff_sr0) ** nu * s ** (-nu / 2) * cond(s, **cond_kw)
+        Qs = -((2 / diff_sr0) ** nu) * s ** (-nu / 2) * cond(s, **cond_kw)
 
     # if there is a homgeneouse aquifer, compute the result by hand
     if parts == 1:

anaflow/tools/laplace.py

@@ -126,7 +126,7 @@ def integrand(val):
         result[phase_i] = quad(integ, 0, np.inf)[0]
 
     if is_scal:
-        result = np.asscalar(result)
+        result = result.item()
 
     return result
 

anaflow/tools/special.py

@@ -99,7 +99,7 @@ def reshape(self, result):
         elif self.rad_shape:
             result = np.diag(result).reshape(self.rad_shape)
         if self.time_scalar and self.rad_scalar:
-            result = np.asscalar(result)
+            result = result.item()
         return result
 
 

docs/Makefile

@@ -4,7 +4,7 @@
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = python3 -msphinx
-SPHINXPROJ    = GeoStatTools
+SPHINXPROJ    = AnaFlow
 SOURCEDIR     = source
 BUILDDIR      = build
 

docs/source/conf.py

@@ -21,10 +21,6 @@
 # pip install sphinx_rtd_theme
 # is needed in order to build the documentation
 import datetime
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath("../../"))
 from anaflow import __version__ as ver
 
 
@@ -173,6 +169,9 @@ def setup(app):
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = "AnaFlowdoc"
+# logos for the page
+html_logo = "pics/Anaflow_150.png"
+html_favicon = "pics/Anaflow.ico"
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -233,7 +232,7 @@ def setup(app):
 
 suppress_warnings = [
     "image.nonlocal_uri",
-    #    'app.add_directive',  # this evtl. suppresses the numpydoc induced warning
+    # 'app.add_directive',  # this evtl. suppresses the numpydoc induced warning
 ]
 
 # Example configuration for intersphinx: refer to the Python standard library.