Skip to content

Commit

Permalink
Mention 'iminuit<2' in README. Adapt requirements in setup.py and T…
Browse files Browse the repository at this point in the history
…ravis CI config.
  • Loading branch information
dsavoiu committed Feb 26, 2021
1 parent 42aefa1 commit 7773491
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ before_install:
# upgrade pip to latest version and install iminuit with pip
- pip install --upgrade pip
- pip install --upgrade matplotlib==$MPL_VERSION
- if [[ $CONDA_PYTHON_VERSION == 2.7 ]]; then pip uninstall minuit && pip install iminuit==1.2; else pip install --upgrade iminuit; fi
- if [[ $CONDA_PYTHON_VERSION == 2.7 ]]; then pip uninstall minuit && pip install iminuit==1.2; else pip install --upgrade 'iminuit<2'; fi

# output python version to log
- python --version
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Additionally, a function minimizer is needed. *kafe* implements interfaces to tw
function minimizers and requires at least one of them to be installed:

* *MINUIT*, which is included in *CERN*'s data analysis package `ROOT <http://root.cern.ch>`_ (>= 5.34), or
* `iminuit <https://github.com/iminuit/iminuit>`_ (>= 1.2), which is independent of ROOT
* `iminuit <https://github.com/iminuit/iminuit>`_ (>= 1.2, < 2.0), which is independent of ROOT


Finally, *kafe* requires a number of external programs:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def read_local(filename):
"NumPy >= 1.11.2",
"SciPy >= 0.17.0",
"matplotlib >= 1.5.0",
"iminuit >= 1.2",
"iminuit >= 1.2, <2",
],
test_suite='setup.discover_kafe_tests',
keywords = "data analysis lab courses education students physics fitting minimization",
Expand Down

0 comments on commit 7773491

Please sign in to comment.