[med-svn] [pycorrfit] 02/05: Merge tag 'upstream/1.0.0+dfsg'

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository pycorrfit.

commit 8568e72dc4a98450ef20a075b374efbb1c5c20c3
Merge: b3dc746 8ee5ece
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jun 22 09:20:57 2017 +0200

    Merge tag 'upstream/1.0.0+dfsg'
    
    Upstream version 1.0.0+dfsg

 .travis/linux_build-wheels.sh                  |  22 +++++
 .travis/linux_dist.sh                          |  12 +++
 .travis/linux_install.sh                       |  14 +++
 .travis/osx_dist.sh                            | 117 ++++++++++++++++++++++
 .travis/osx_install.sh                         |  56 +++++++++++
 .travis/osx_install_dmg.sh                     |  36 +++++++
 .travis/osx_pyinstaller.spec                   |  43 ++++++++
 .travis/osx_requirements.txt                   |   8 ++
 .travis/osx_wxPython-3.0.2.0-plot.patch        |  91 +++++++++++++++++
 .travis/test.sh                                |   8 ++
 ChangeLog.txt                                  |   3 +
 MANIFEST.in                                    |  17 ++--
 README.rst                                     |   6 +-
 pycorrfit/PyCorrFit.py                         |   6 +-
 pycorrfit/__init__.py                          |   2 -
 pycorrfit/__main__.py                          |   1 -
 pycorrfit/gui/frontend.py                      |   1 -
 pycorrfit/models/__init__.py                   |   2 -
 pycorrfit/models/classes.py                    |   2 +-
 pycorrfit/models/control.py                    |   2 +
 pycorrfit/models/model_confocal_2d.py          |   2 +-
 pycorrfit/models/model_confocal_tt_2d.py       | 124 +++++++++++++++++++++++
 pycorrfit/models/model_confocal_tt_2d_2d.py    |   6 +-
 pycorrfit/models/model_confocal_tt_3d.py       | 132 +++++++++++++++++++++++++
 pycorrfit/models/model_confocal_tt_3d_3d.py    |   2 +-
 pycorrfit/readfiles/read_SIN_correlator_com.py |  65 ++++++------
 setup.py                                       |  43 ++++----
 tests/data_file_dl.py                          |  20 ++--
 tests/test_constraints.py                      |   9 +-
 tests/test_file_formats.py                     |  12 ++-
 tests/test_simple.py                           |   2 +-
 31 files changed, 770 insertions(+), 96 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/pycorrfit.git