Merge pull request #218 from MassimoCimmino/issue217_version-2-2-0

Issue217 version 2 2 0
MassimoCimmino · Jul 10, 2022 · 927a994 · 927a994
2 parents 24dc8a5 + b2606f7
commit 927a994
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current version
 
+## Version 2.2.0 (2022-07-10)
+
 ### New features
 
 * [Issue 50](https://github.com/MassimoCimmino/pygfunction/issues/50) - Implemented inclined boreholes for the evaluation of *g*-functions. The implementation includes an approximation of the FLS solution for inclined boreholes based on the method of Cimmino (2021) (see [Issue 138](https://github.com/MassimoCimmino/pygfunction/issues/138)). The `'equivalent'` solver is not yet supported.

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,5 +1,5 @@
 
-Copyright (c) 2017-2021, Massimo Cimmino
+Copyright (c) 2017-2022, Massimo Cimmino
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -43,14 +43,14 @@ fluid temperatures in the boreholes for several U-tube pipe configurations.
 *pygfunction* was developed and tested using Python 3.7. In addition, the
 following packages are needed to run *pygfunction* and its examples:
 - Coolprop (>= 6.4.1)
-- matplotlib (>= 3.3.4),
-- numpy (>= 1.20.1)
-- scipy (>= 1.6.2)
+- matplotlib (>= 3.5.1),
+- numpy (>= 1.21.5)
+- scipy (>= 1.7.3)
 
 The documentation is generated using [Sphinx](http://www.sphinx-doc.org). The
 following packages are needed to build the documentation:
-- sphinx (>= 4.0.1)
-- numpydoc (>= 1.1.0)
+- sphinx (>= 4.4.0)
+- numpydoc (>= 1.2.0)
 
 
 ## Quick start

diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -1,7 +1,7 @@
-numpy >= 1.20.1
-scipy >= 1.6.2
-matplotlib >= 3.3.4
-numpydoc >= 1.1.0
+numpy >= 1.21.5
+scipy >= 1.7.3
+matplotlib >= 3.5.1
+numpydoc >= 1.2.0
 recommonmark >= 0.6.0
-sphinx >= 4.0.1
+sphinx >= 4.4.0
 CoolProp >= 6.4.1
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -66,17 +66,17 @@
 
 # General information about the project.
 project = u'pygfunction'
-copyright = u'2017-2021, Massimo Cimmino'
+copyright = u'2017-2022, Massimo Cimmino'
 author = u'Massimo Cimmino'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'2.1'
+version = u'2.2'
 # The full version, including alpha/beta/rc tags.
-release = u'2.1.0'
+release = u'2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/source/install.rst b/doc/source/install.rst
@@ -6,13 +6,13 @@ Setting up pygfunction
 
 *pygfunction* uses Python 3.7, along with the following packages:
 	- Coolprop (>= 6.4.1)
-	- matplotlib (>= 3.3.4),
-	- numpy (>= 1.20.1)
-	- scipy (>= 1.6.2)
+	- matplotlib (>= 3.5.1),
+	- numpy (>= 1.21.5)
+	- scipy (>= 1.7.3)
 
 *pygfunction*'s- documentation is built using:
-	- sphinx (>= 4.0.1)
-	- numpydoc (>= 1.1.0)
+	- sphinx (>= 4.4.0)
+	- numpydoc (>= 1.2.0)
 
 **Users** - `Download pip <https://pip.pypa.io/en/latest/>`_ and install the
 latest release:

diff --git a/pygfunction/heat_transfer.py b/pygfunction/heat_transfer.py
@@ -1056,8 +1056,6 @@ def finite_line_source_inclined_vectorized(
             a = 1.0 / np.sqrt(4.0*alpha*time)
             h = 0.5 / H2 * quad_vec(f, a, np.inf, epsabs=1e-4, epsrel=1e-6)[0]
         else:
-            # The real and image parts are split to avoid overflow in the
-            # integrand function
             # Lower bound of integration
             a = 1.0 / np.sqrt(4.0*alpha*time)
             # Upper bound of integration

diff --git a/pygfunction/media.py b/pygfunction/media.py
@@ -27,7 +27,7 @@ class Fluid:
             Default is 101325 Pa.
 
         Examples
-        ----------
+        --------
         >>> import pygfunction as gt
         >>> T_f = 20.     # Temp at 20 C
         >>> gage_P = 20  # PsiG

diff --git a/pygfunction/pipes.py b/pygfunction/pipes.py
@@ -2768,7 +2768,7 @@ def convective_heat_transfer_coefficient_circular_pipe(
     --------
 
     References
-    -----------
+    ----------
     .. [#Gnielinksi2013] Gnielinski, V. (2013). On heat transfer in tubes.
         International Journal of Heat and Mass Transfer, 63, 134–140.
         https://doi.org/10.1016/j.ijheatmasstransfer.2013.04.015
@@ -2875,7 +2875,7 @@ def convective_heat_transfer_coefficient_concentric_annulus(
         region (in W/m2-K).
 
     References
-    -----------
+    ----------
     .. [#Grundman2007] Grundman, R. (2007) Improved design methods for ground
         heat exchangers. Oklahoma State University, M.S. Thesis.
     .. [#ConvCoeff-CengelGhajar2015] Çengel, Y.A., & Ghajar, A.J. (2015). Heat

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,6 +1,6 @@
-numpydoc == 1.1.0
+numpydoc == 1.2.0
 recommonmark == 0.6.0
-sphinx == 4.0.1
-pytest == 6.2.3
+sphinx == 4.4.0
+pytest == 7.1.1
 pytest-cov == 3.0.0
 tox == 3.24.5
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = pygfunction
-version = 2.1.0
+version = 2.2.0
 description = A g-function calculator for Python
 author = Massimo Cimmino
 author_email = massimo.cimmino@polymtl.ca
@@ -25,17 +25,17 @@ classifiers =
 packages = pygfunction
 install_requires =
     coolprop >= 6.4.1
-    matplotlib >= 3.3.4
-    numpy >= 1.20.1
-    scipy >= 1.6.2
+    matplotlib >= 3.5.1
+    numpy >= 1.21.5
+    scipy >= 1.7.3
 python_requires = >=3.7
 
 [options.extras_require]
 doc =
-    numpydoc >= 1.1.0
+    numpydoc >= 1.2.0
     recommonmark >= 0.6.0
-    sphinx >= 4.0.1
+    sphinx >= 4.4.0
 testing =
-    pytest >= 6.2.3
+    pytest >= 7.1.1
     pytest-cov >= 3.0.0
     tox >= 3.24.5