From c9e6577f0fd68ef16b52deb612b489025e6aae71 Mon Sep 17 00:00:00 2001 From: Matt Newville Date: Fri, 1 Jul 2016 16:07:32 -0500 Subject: [PATCH 1/7] specific versions in INSTALL --- INSTALL | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 712b01213..7179fb6bb 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,14 @@ To install the lmfit python module, use:: python setup.py build python setup.py install -Python 2.6 or higher is required, as are numpy and scipy. +For lmfit 0.9.4, the following versions are required: + Python: 2.6, 2.7, 3.3, 3.4, or 3.5 + Numpy: 1.5 or higher + Scipy: 0.13 or higher + +Note that Python 2.6 and scipy 0.13 are deprecated, and +support and testing with them will be dropped in 0.9.5. + Matt Newville -Last Update: 2013-Dec-15 +Last Update: 2016-July-1 From f116b9481d4f9e783129cb90dd3607e16616614d Mon Sep 17 00:00:00 2001 From: Matt Newville Date: Fri, 1 Jul 2016 16:08:12 -0500 Subject: [PATCH 2/7] add deprecation warning for scipy 0.13 to main doc --- doc/index.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/index.rst b/doc/index.rst index 129b61fbd..0b2d8c569 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -13,7 +13,8 @@ Non-Linear Least-Square Minimization and Curve-Fitting for Python .. warning:: - Support for Python 2.6.x will be officially dropped following version 0.9.4 (in 0.9.5) + Support for Python 2.6 and scipy 0.13 will be dropped with version 0.9.5. + Lmfit provides a high-level interface to non-linear optimization and curve fitting problems for Python. Lmfit builds on and extends many of the From fd736f63f9b0985d0d5dfbeb087911f9883b5dc1 Mon Sep 17 00:00:00 2001 From: Matt Newville Date: Fri, 1 Jul 2016 16:10:06 -0500 Subject: [PATCH 3/7] add scipy 0.13 deprecation, make warning loud (DeprecationWarning is suppressed by default: WTF\?) --- lmfit/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lmfit/__init__.py b/lmfit/__init__.py index a8c859ca8..c7e8d6957 100644 --- a/lmfit/__init__.py +++ b/lmfit/__init__.py @@ -57,4 +57,12 @@ # PY26 Depreciation Warning if sys.version_info[:2] == (2, 6): - warnings.warn('Support for Python 2.6.x is depreciated in Lmfit 0.9.4 and will be dropped in 0.9.5', DeprecationWarning) + warnings.warn('Support for Python 2.6.x will be dropped in lmfit 0.9.5') + +# SCIPY 0.13 Depreciation Warning +import scipy +scipy_major, scipy_minor, scipy_other = scipy.__version__.split('.', 2) + +if in(scipy_major) == 0 and int(scipy_minor) < 14: + print '--> warn' + warnings.warn('Support for Scipy 0.13 will be dropped in lmfit 0.9.5') From 051e13df7c886e5e94e7c2558ee9d8dbafd0486e Mon Sep 17 00:00:00 2001 From: Matt Newville Date: Fri, 1 Jul 2016 16:20:22 -0500 Subject: [PATCH 4/7] update installation doc --- doc/installation.rst | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/installation.rst b/doc/installation.rst index 26eec6d61..465cbffdf 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -10,37 +10,43 @@ Downloading and Installation Prerequisites ~~~~~~~~~~~~~~~ -The lmfit package requires Python, Numpy, and Scipy. Scipy version 0.13 or -higher is recommended, but extensive testing on compatibility with various -versions of scipy has not been done. Lmfit works with Python 2.7, 3.3 and -3.4. Lmfit works with Python 2.6 only for versions <= 0.9.4. No testing has -been done with Python 3.5, but as the package is pure Python, relying only on -scipy and numpy, no significant troubles are expected. The `nose`_ framework -is required for running the test suite, and IPython and matplotib are -recommended. If Pandas is available, it will be used in portions of lmfit. +The lmfit package requires Python, Numpy, and Scipy. + + +Lmfit works with Python 2.7, 3.3, 3.4, and 3.5 Lmfit currently does work +with Python 2.6, but support will dropped with version 0.9.5. Scipy +version 0.13 or higher is required, with 0.17 or higher recommended to be +able to use the latest optimization features from scipy. Support for scipy +0.13 will be dropped in version 0.9.5. Numpy version 1.5 or higher is +required. + +In order to run the test suite, the `nose`_ framework is required. Some +parts of lmfit will be able to make use of IPython (version 4 or higher), +matplotlib, and pandas if those libraries are installed, but no core +functionality of lmfit requires these. Downloads ~~~~~~~~~~~~~ - -The latest stable version of lmfit is available from `PyPi `_. +The latest stable version of lmfit is |release| is available from `PyPi +`_. Installation ~~~~~~~~~~~~~~~~~ -If you have `pip`_ installed, you can install lmfit with:: +If you have `pip`_ installed, you can install lmfit with:: pip install lmfit -or, if you have `Python Setup Tools`_ installed, you install lmfit with:: - - easy_install -U lmfit +or you can download the source kit, unpack it and install with:: + python setup.py install -or, you can download the source kit, unpack it and install with:: +For Anaconda Python, lmfit is not an official packages, but several +Anaconda channels provide it, allowing installation with (for example):: - python setup.py install + conda install -c newville lmfit Development Version @@ -50,7 +56,6 @@ To get the latest development version, use:: git clone http://github.com/lmfit/lmfit-py.git - and install using:: python setup.py install From d90ffabb47b4207503dc4bec5b79f191f8d40340 Mon Sep 17 00:00:00 2001 From: Matt Newville Date: Fri, 1 Jul 2016 16:24:08 -0500 Subject: [PATCH 5/7] fix typo --- lmfit/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lmfit/__init__.py b/lmfit/__init__.py index c7e8d6957..5a0a05ef0 100644 --- a/lmfit/__init__.py +++ b/lmfit/__init__.py @@ -63,6 +63,6 @@ import scipy scipy_major, scipy_minor, scipy_other = scipy.__version__.split('.', 2) -if in(scipy_major) == 0 and int(scipy_minor) < 14: +if int(scipy_major) == 0 and int(scipy_minor) < 14: print '--> warn' warnings.warn('Support for Scipy 0.13 will be dropped in lmfit 0.9.5') From 675f55311d908641febb00c54198b222ee6d9322 Mon Sep 17 00:00:00 2001 From: Matt Newville Date: Fri, 1 Jul 2016 16:27:24 -0500 Subject: [PATCH 6/7] fix typo --- lmfit/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lmfit/__init__.py b/lmfit/__init__.py index 5a0a05ef0..655b8f77e 100644 --- a/lmfit/__init__.py +++ b/lmfit/__init__.py @@ -25,8 +25,8 @@ * Many pre-built models for common lineshapes are included and ready to use. - version: 0.8.0 - last update: 2014-Sep-21 + version: 0.9.4 + last update: 2016-Jul-1 License: MIT Authors: Matthew Newville, The University of Chicago Till Stensitzki, Freie Universitat Berlin @@ -64,5 +64,4 @@ scipy_major, scipy_minor, scipy_other = scipy.__version__.split('.', 2) if int(scipy_major) == 0 and int(scipy_minor) < 14: - print '--> warn' warnings.warn('Support for Scipy 0.13 will be dropped in lmfit 0.9.5') From 4baaae8cfd9086b322b9b136023e363b9f0065e5 Mon Sep 17 00:00:00 2001 From: Matt Newville Date: Thu, 7 Jul 2016 11:19:26 -0500 Subject: [PATCH 7/7] fix typos --- doc/installation.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/installation.rst b/doc/installation.rst index 465cbffdf..ac222f3e3 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -12,9 +12,8 @@ Prerequisites The lmfit package requires Python, Numpy, and Scipy. - -Lmfit works with Python 2.7, 3.3, 3.4, and 3.5 Lmfit currently does work -with Python 2.6, but support will dropped with version 0.9.5. Scipy +Lmfit works with Python 2.7, 3.3, 3.4, and 3.5. Lmfit version 0.9.4 works +with Python 2.6, but support for it will dropped in version 0.9.5. Scipy version 0.13 or higher is required, with 0.17 or higher recommended to be able to use the latest optimization features from scipy. Support for scipy 0.13 will be dropped in version 0.9.5. Numpy version 1.5 or higher is