Skip to content

Commit 1267e69

Browse files
committed
Minor version increment: make trustregion dependency optional
1 parent 454e5a9 commit 1267e69

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+171
-151
lines changed

README.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,14 @@ Requirements
3939
DFO-LS requires the following software to be installed:
4040

4141
* Python 2.7 or Python 3 (http://www.python.org/)
42-
* Fortran compiler (e.g. `gfortran <https://gcc.gnu.org/wiki/GFortran>`_), required by the `trustregion <https://github.com/lindonroberts/trust-region>`_ package.
4342

4443
Additionally, the following python packages should be installed (these will be installed automatically if using *pip*, see `Installation using pip`_):
4544

4645
* NumPy 1.11 or higher (http://www.numpy.org/)
4746
* SciPy 0.18 or higher (http://www.scipy.org/)
4847
* Pandas 0.17 or higher (http://pandas.pydata.org/)
49-
* trustregion 1.1 or higher (https://github.com/lindonroberts/trust-region)
5048

51-
**Warning:** the trustregion package requires NumPy to already be installed. Please install NumPy before following the installation instructions below. This applies to DFO-LS versions 1.2 and higher.
49+
**Optional package:** DFO-LS versions 1.2 and higher also support the `trustregion <https://github.com/lindonroberts/trust-region>`_ package for fast trust-region subproblem solutions. To install this, make sure you have a Fortran compiler (e.g. `gfortran <https://gcc.gnu.org/wiki/GFortran>`_) and NumPy installed, then run :code:`pip install trustregion`. You do not have to have trustregion installed for DFO-LS to work, and it is not installed by default.
5250

5351
Installation using pip
5452
----------------------

dfols/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
2323
"""
2424

25-
__version__ = '1.2'
25+
__version__ = '1.2.1'

docs/build/doctrees/advanced.doctree

375 Bytes
Binary file not shown.
-6 Bytes
Binary file not shown.
981 Bytes
Binary file not shown.

docs/build/doctrees/history.doctree

1.67 KB
Binary file not shown.

docs/build/doctrees/index.doctree

-12 Bytes
Binary file not shown.

docs/build/doctrees/info.doctree

-54 Bytes
Binary file not shown.

docs/build/doctrees/install.doctree

-326 Bytes
Binary file not shown.

docs/build/doctrees/userguide.doctree

495 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)