From 4e7490c9a5113c81f20dc8660c16492cef33778f Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Thu, 11 Nov 2021 14:34:06 -0500 Subject: [PATCH 1/2] Update requirements --- README.md | 8 ++++---- doc/source/install.rst | 4 ++-- setup.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ddcc0e8e..f4192334 100644 --- a/README.md +++ b/README.md @@ -41,16 +41,16 @@ fluid temperatures in the boreholes for several U-tube pipe configurations. ## Requirements -*pygfunction* was developed and tested using Python 3.6. In addition, the +*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) +- Coolprop (>= 6.4.1) - matplotlib (>= 3.3.4), -- numpy (>= 1.19.2) +- numpy (>= 1.20.1) - scipy (>= 1.6.2) The documentation is generated using [Sphinx](http://www.sphinx-doc.org). The following packages are needed to build the documentation: -- sphinx (>= 3.5.4) +- sphinx (>= 4.0.1) - numpydoc (>= 1.1.0) diff --git a/doc/source/install.rst b/doc/source/install.rst index 5a3e5438..424813d4 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -7,11 +7,11 @@ Setting up pygfunction *pygfunction* uses Python 3.7, along with the following packages: - Coolprop (>=6.4.1) - matplotlib (>= 3.3.4), - - numpy (>= 1.19.2) + - numpy (>= 1.20.1) - scipy (>= 1.6.2) *pygfunction*'s- documentation is built using: - - sphinx (>= 3.5.4) + - sphinx (>= 4.0.1) - numpydoc (>= 1.1.0) **Users** - `Download pip `_ and install the diff --git a/setup.py b/setup.py index 9c1b412c..a1f645d0 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ def read(fname): include_package_data=True, install_requires=['coolprop>=6.4.1', 'matplotlib>=3.3.4', - 'numpy>=1.19.2', + 'numpy>=1.20.1', 'scipy>=1.6.2'], test_suite='tests', From 6c0da98cd3768cb6b42ba25b3d9c53a3b27ccc26 Mon Sep 17 00:00:00 2001 From: Massimo Cimmino Date: Thu, 11 Nov 2021 14:38:09 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd09adbf..0a7d3f74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ * [Issue 100](https://github.com/MassimoCimmino/pygfunction/issues/100) - Replaced calls to `numpy.asscalar()` with calls to `array.item()`. `numpy.asscalar()` is deprecated as of `numpy` version `1.16`. * [Issue 124](https://github.com/MassimoCimmino/pygfunction/issues/124) - Reformatted `pipes`and `networks` modules to clarify the expected values for `m_flow` parameters. These are replaced by any of `m_flow_pipe`, `m_flow_borehole` or `m_flow_network` depending on the function or class method. Added a nomenclature of commonly used variables to the documentation. * [Issue 125](https://github.com/MassimoCimmino/pygfunction/issues/125) - Refactored class methods and docstrings in `Pipe` and `Network` objects to better represent the expected shapes of array inputs and outputs. +* [Issue 139](https://github.com/MassimoCimmino/pygfunction/issues/139) - Updated requirements for numpy from version `1.19.2` to `1.20.1`. Clarified the Python version `3.7` requirement in the `README.md` file. * [Issue 154](https://github.com/MassimoCimmino/pygfunction/issues/154) - Replaced `numpy.int` and `numpy.bool` dtypes in array initializations with built-in types `int` and `bool`. `numpy.int` and `numpy.bool` are deprecated as of `numpy` version `1.20`. * [Issue 158](https://github.com/MassimoCimmino/pygfunction/issues/158) - Changed default parameter values for *g*-function calculations. The `gFunction` class now uses the `'equivalent'` solver by default and a non-uniform discretization of `nSegments=8` given by `utilities.segment_ratios()`. * [Issue 160](https://github.com/MassimoCimmino/pygfunction/issues/160) - Deprecated functions `gfunction.uniform_heat_extraction`, `gfunction.uniform_temperature`, `gfunction.equal_inlet_temperature` and `gfunction.mixed_inlet_temperature`. They will be removed in `v3.0.0`.