[sardana] 02/06: Merge tag 'upstream/2.0.0'
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Sep 30 08:55:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository sardana.
commit af4ad30ed8cc89769e2da32745b6946777865d5e
Merge: e1431b5 d681969
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Fri Apr 29 00:51:48 2016 +0200
Merge tag 'upstream/2.0.0'
Upstream version 2.0.0
PKG-INFO | 2 +-
doc/logo.bmp | Bin 119070 -> 0 bytes
doc/man/MacroServer.1 | 4 +-
doc/man/Pool.1 | 4 +-
doc/man/Sardana.1 | 4 +-
.../{macroexecutor.1 => diffractometeralignment.1} | 17 +-
doc/man/{macroexecutor.1 => hklscan.1} | 16 +-
doc/man/macroexecutor.1 | 4 +-
doc/man/sequencer.1 | 4 +-
doc/man/spock.1 | 4 +-
doc/man/{macroexecutor.1 => ubmatrix.1} | 17 +-
doc/source/_static/logo.png | Bin 36269 -> 0 bytes
doc/source/_templates/layout.html | 19 -
doc/source/conf.py | 7 +-
.../devel/api/sardana/macroserver/macros.rst | 188 ++-
doc/source/devel/howto_macros/macros_general.rst | 93 +-
doc/source/devel/howto_recorders.rst | 90 ++
doc/source/devel/index.rst | 1 +
doc/source/users/scan.rst | 59 +
doc/source/users/standard_macro_catalog.rst | 38 +
.../__init__.py => scripts/diffractometeralignment | 18 +-
.../scan/recorder/__init__.py => scripts/hklscan | 18 +-
.../scan/recorder/__init__.py => scripts/ubmatrix | 18 +-
setup.py | 16 +-
src/sardana/macroserver/macro.py | 90 +-
src/sardana/macroserver/macros/demo.py | 143 +-
src/sardana/macroserver/macros/env.py | 8 +-
.../macroserver/macros/examples/parameters.py | 62 +-
src/sardana/macroserver/macros/examples/scans.py | 12 +-
.../macroserver/macros/examples/submacros.py | 4 +-
src/sardana/macroserver/macros/expert.py | 52 +-
src/sardana/macroserver/macros/hkl.py | 1554 ++++++++++++++++++++
src/sardana/macroserver/macros/lists.py | 7 +-
src/sardana/macroserver/macros/scan.py | 128 +-
src/sardana/macroserver/macros/standard.py | 139 +-
src/sardana/macroserver/macros/test/__init__.py | 2 +-
src/sardana/macroserver/macros/test/base.py | 40 +-
src/sardana/macroserver/macros/test/sardemoenv.py | 54 +
src/sardana/macroserver/macros/test/test_ct.py | 13 +-
src/sardana/macroserver/macros/test/test_env.py | 79 +
src/sardana/macroserver/macros/test/test_expert.py | 117 ++
.../test/{__init__.py => test_ioregister.py} | 18 +-
src/sardana/macroserver/macros/test/test_list.py | 49 +
src/sardana/macroserver/macros/test/test_scan.py | 21 +-
.../macroserver/macros/test/test_standard.py | 91 ++
src/sardana/macroserver/macros/test/test_wm.py | 22 +-
src/sardana/macroserver/macroserver.py | 37 +-
src/sardana/macroserver/msexception.py | 6 +-
src/sardana/macroserver/msmacromanager.py | 162 +-
src/sardana/macroserver/msmetarecorder.py | 100 ++
src/sardana/macroserver/msparameter.py | 211 +--
src/sardana/macroserver/msrecordermanager.py | 363 +++++
.../{scan/recorder => recorders}/__init__.py | 7 +-
.../recorder => recorders/examples}/__init__.py | 8 +-
.../recorders/examples/dummy.py} | 59 +-
src/sardana/macroserver/recorders/examples/xas.py | 283 ++++
.../{scan/recorder => recorders}/output.py | 7 +-
.../{scan/recorder => recorders}/sharedmemory.py | 73 +-
.../{scan/recorder => recorders}/storage.py | 523 +------
src/sardana/macroserver/scan/gscan.py | 771 +++++-----
src/sardana/macroserver/scan/recorder/__init__.py | 1 -
.../macroserver/scan/recorder/datarecorder.py | 26 +-
.../macroserver/scan/recorder/sharedmemory.py | 290 +---
src/sardana/macroserver/scan/recorder/storage.py | 1051 +------------
.../{scan/recorder => test}/__init__.py | 9 -
.../{scan/recorder => test/res}/__init__.py | 9 -
.../__init__.py => test/res/fakerecorders.py} | 11 +-
.../res/recorders/path1/fakerecorders.py} | 13 +-
.../res/recorders/path2/fakerecorders.py} | 13 +-
.../res/recorders/path3/fakerecorders.py} | 13 +-
.../res/recorders/pathexternal/specrecorder.py} | 10 +-
src/sardana/macroserver/test/test_msparameter.py | 125 ++
.../macroserver/test/test_msrecordermanager.py | 171 +++
src/sardana/pool/pool.py | 5 +
src/sardana/pool/poolcontrollermanager.py | 13 +-
.../poolcontrollers/HklPseudoMotorController.py | 1421 ++++++++++++++++++
src/sardana/release.py | 2 +-
src/sardana/sardanabase.py | 10 +-
src/sardana/sardanacontainer.py | 12 +-
src/sardana/sardanacustomsettings.py | 7 +
src/sardana/sardanadefs.py | 2 +
src/sardana/sardanamodulemanager.py | 27 +-
src/sardana/spock/colors.py | 81 +-
src/sardana/spock/config.py | 11 +-
src/sardana/spock/ipython_01_00/genutils.py | 38 +-
src/sardana/spock/release.py | 2 +-
src/sardana/tango/macroserver/Door.py | 21 +-
src/sardana/tango/macroserver/MacroServer.py | 18 +-
src/sardana/tango/pool/Pool.py | 44 +-
src/sardana/taurus/core/tango/sardana/macro.py | 118 +-
.../taurus/core/tango/sardana/macroserver.py | 33 +-
src/sardana/taurus/core/tango/sardana/pool.py | 67 +-
.../core/tango/sardana/test}/__init__.py | 17 +-
.../taurus/core/tango/sardana/test/test_macro.py | 116 ++
.../qt/qtgui/extra_hkl}/__init__.py | 19 +-
src/sardana/taurus/qt/qtgui/extra_hkl/computeu.py | 76 +
.../qt/qtgui/extra_hkl/diffractometeralignment.py | 395 +++++
.../qt/qtgui/extra_hkl/displayscanangles.py} | 65 +-
src/sardana/taurus/qt/qtgui/extra_hkl/hklscan.py | 397 +++++
.../taurus/qt/qtgui/extra_hkl/reflectionseditor.py | 255 ++++
.../qt/qtgui/extra_hkl/reflectionslist.py} | 63 +-
.../taurus/qt/qtgui/extra_hkl/selectsignal.py | 114 ++
src/sardana/taurus/qt/qtgui/extra_hkl/ubmatrix.py | 487 ++++++
.../taurus/qt/qtgui/extra_hkl/ui/computeu.ui | 79 +
.../qtgui/extra_hkl/ui/diffractometeralignment.ui | 559 +++++++
.../qt/qtgui/extra_hkl/ui/displayscanangles.ui | 40 +
.../taurus/qt/qtgui/extra_hkl/ui/hklscan.ui | 624 ++++++++
.../qt/qtgui/extra_hkl/ui/reflectionseditor.ui | 117 ++
.../qt/qtgui/extra_hkl/ui/reflectionslist.ui | 118 ++
.../taurus/qt/qtgui/extra_hkl/ui/selectsignal.ui | 105 ++
.../taurus/qt/qtgui/extra_hkl/ui/ubmatrix.ui | 1003 +++++++++++++
.../qt/qtgui/extra_macroexecutor/macrobutton.py | 4 +
.../qt/qtgui/extra_macroexecutor/macroexecutor.py | 23 +-
.../macroparameterseditor/delegate.py | 2 +-
.../macroparameterseditor/model.py | 2 +-
.../extra_macroexecutor/sequenceeditor/delegate.py | 4 +-
.../extra_macroexecutor/sequenceeditor/model.py | 2 +-
.../sequenceeditor/sequenceeditor.py | 3 +-
src/sardana/taurus/qt/qtgui/extra_pool/motor.py | 851 -----------
src/sardana/test/testsuite.py | 7 +-
src/sardana/tools/config/sardana.py | 16 +-
121 files changed, 11237 insertions(+), 3956 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sardana.git
More information about the debian-science-commits
mailing list