From b6d1343db160d26456a5828552916cbc6143422c Mon Sep 17 00:00:00 2001 From: prisae Date: Fri, 5 Jul 2019 13:57:42 +0200 Subject: [PATCH] v1.8.3 --- CHANGELOG.rst | 9 +++++++-- README.rst | 19 ------------------- docs/manual.rst | 8 -------- empymod/__init__.py | 2 +- requirements.txt | 5 +---- setup.py | 6 +++--- 6 files changed, 12 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4ace9eb5..5da73a54 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,12 +1,16 @@ Changelog ######### -*latest* --------- + +v1.8.3 - *2019-07-05* +--------------------- - Use ``scooby`` for ``Versions`` (printinfo), change name to ``Report``. - DOC: Correct return statement if ``mrec=True``. - Typos and correct links for new asv/bench. +- Bump requirement to SciPy>=1.0.0, remove warning regarding memory leak in + SciPy 0.19.0. + v1.8.2 - *2019-04-26* --------------------- @@ -31,6 +35,7 @@ v1.8.2 - *2019-04-26* - Move credits for initial funding from the license-section of the manual to CREDITS.rst, where it belongs. + v1.8.1 - *2018-11-20* --------------------- diff --git a/README.rst b/README.rst index 85cd6f0a..c1ddba0f 100644 --- a/README.rst +++ b/README.rst @@ -5,25 +5,6 @@ ---- -.. image:: https://readthedocs.org/projects/empymod/badge/?version=latest - :target: http://empymod.readthedocs.io/en/latest - :alt: Documentation Status -.. image:: https://travis-ci.org/empymod/empymod.svg?branch=master - :target: https://travis-ci.org/empymod/empymod - :alt: Travis-CI -.. image:: https://coveralls.io/repos/github/empymod/empymod/badge.svg?branch=master - :target: https://coveralls.io/github/empymod/empymod?branch=master - :alt: Coveralls -.. image:: https://img.shields.io/codacy/grade/b28ed3989ed248fe95e34288e43667b9/master.svg - :target: https://www.codacy.com/app/prisae/empymod - :alt: Codacy -.. image:: https://img.shields.io/badge/benchmark-asv-blue.svg?style=flat - :target: https://empymod.github.io/empymod-asv - :alt: Airspeed Velocity -.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.593094.svg - :target: https://doi.org/10.5281/zenodo.593094 - :alt: Zenodo DOI - .. sphinx-inclusion-marker The electromagnetic modeller **empymod** can model electric or magnetic diff --git a/docs/manual.rst b/docs/manual.rst index 9eb74cdb..1f401a28 100644 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -48,14 +48,6 @@ of ``NumPy`` and ``SciPy``; I recommend using `Anaconda start the *Anaconda Navigator*, add the channel ``prisae`` and ``empymod`` will appear in the package list and can be installed with a click. -.. warning:: - - Do not use ``scipy == 0.19.0``. It has a memory leak in ``quad``, see - `github.com/scipy/scipy/pull/7216 - `_. So if you use QUAD (or - potentially QWE) in any of your transforms you might see your memory usage - going through the roof. - The structure of empymod is: diff --git a/empymod/__init__.py b/empymod/__init__.py index d8aa3e3e..e51d419e 100644 --- a/empymod/__init__.py +++ b/empymod/__init__.py @@ -48,4 +48,4 @@ 'DigitalFilter'] # Version -__version__ = '1.8.3dev0' +__version__ = '1.8.3' diff --git a/requirements.txt b/requirements.txt index bc5b85f4..65a0c4af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,5 @@ numpy +scipy >= 1.0.0 sphinx sphinxcontrib-napoleon numpydoc >= 0.9 - -# scipy 0.19.0 has a memory leak in quad -# github.com/scipy/scipy/pull/7216 -scipy != 0.19.0 diff --git a/setup.py b/setup.py index dbd4c427..9d6cd502 100644 --- a/setup.py +++ b/setup.py @@ -7,13 +7,13 @@ setup( name='empymod', - version='1.8.3.dev0', + version='1.8.3', description=description, long_description=readme, author='Dieter Werthmüller', author_email='dieter@werthmuller.org', url='https://empymod.github.io', - download_url='https://github.com/empymod/empymod/tarball/v1.8.2', + download_url='https://github.com/empymod/empymod/tarball/v1.8.3', license='Apache License V2.0', packages=['empymod', 'empymod.scripts'], classifiers=[ @@ -25,6 +25,6 @@ ], install_requires=[ 'numpy', - 'scipy!=0.19.0', + 'scipy>=1.0.0', ], )