Skip to content

Commit

Permalink
Merge pull request #166 from MassimoCimmino/issue139_updateRequirements
Browse files Browse the repository at this point in the history
Issue139 update requirements
  • Loading branch information
MassimoCimmino authored Nov 12, 2021
2 parents 0e67d4e + 6c0da98 commit d98325a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
4 changes: 2 additions & 2 deletions doc/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://pip.pypa.io/en/latest/>`_ and install the
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',

Expand Down

0 comments on commit d98325a

Please sign in to comment.