[python-pymeasure] 01/09: Merge tag 'upstream/0.4.6'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-pymeasure.

commit 0aff27c1d0b62813854b671b42db7856bed5b110
Merge: 9bb10fd 659d48f
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Aug 18 13:20:30 2017 +0100

    Merge tag 'upstream/0.4.6'
    
    Upstream version 0.4.6
    
    # gpg: Signature made Fri 18 Aug 2017 13:20:26 BST
    # gpg:                using RSA key F3DB8E7525060E1BDB84C20D6A990FB3DDEB910A
    # gpg:                issuer "ghisvail at gmail.com"
    # gpg: Good signature from "Ghislain Antony Vaillant <ghisvail at gmail.com>" [ultimate]

 AUTHORS.txt                                        |  3 +-
 CHANGES.txt                                        |  7 ++
 MANIFEST.in                                        |  1 +
 PKG-INFO                                           | 11 ++-
 PyMeasure.egg-info/PKG-INFO                        | 11 ++-
 PyMeasure.egg-info/SOURCES.txt                     | 34 +++++----
 docs/conf.py                                       |  4 +-
 docs/dev/contribute.rst                            | 11 ++-
 pymeasure/__init__.py                              |  2 +-
 pymeasure/display/inputs.py                        | 62 ++++++----------
 pymeasure/display/listeners.py                     |  3 +-
 pymeasure/experiment/listeners.py                  |  7 +-
 pymeasure/experiment/procedure.py                  | 52 +++++++++++++-
 pymeasure/experiment/results.py                    | 84 ++++++++++++++++++++--
 pymeasure/experiment/tests/__init__.py             |  0
 pymeasure/experiment/tests/data/__init__.py        |  0
 pymeasure/experiment/workers.py                    | 30 ++++----
 pymeasure/instruments/ni/daqmx.py                  |  5 +-
 pymeasure/instruments/tests/__init__.py            |  0
 pymeasure/log.py                                   |  9 +--
 pymeasure/process.py                               | 13 ++--
 pymeasure/tests/__init__.py                        |  0
 pymeasure/thread.py                                |  2 +-
 setup.cfg                                          |  3 +
 setup.py                                           |  7 +-
 .../tests => tests/adapters}/test_adapter.py       |  0
 .../tests/test_process.py => tests/conftest.py     | 18 ++---
 .../tests => tests/experiment/data}/__init__.py    |  0
 .../experiment}/data/procedure_for_testing.py      | 10 ++-
 .../experiment}/data/results_for_testing.csv       |  0
 .../tests => tests/experiment}/test_listeners.py   |  0
 .../tests => tests/experiment}/test_parameters.py  |  0
 .../tests => tests/experiment}/test_procedure.py   | 16 ++++-
 .../tests => tests/experiment}/test_results.py     | 41 +++++++++--
 .../tests => tests/experiment}/test_workers.py     | 52 +++++++-------
 .../tests => tests/instruments}/test_instrument.py |  0
 .../tests => tests/instruments}/test_validators.py |  0
 {pymeasure/tests => tests}/test_log.py             |  7 +-
 {pymeasure/tests => tests}/test_process.py         | 23 +++---
 {pymeasure/tests => tests}/test_thread.py          |  5 +-
 40 files changed, 355 insertions(+), 178 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-pymeasure.git