[sardana] branch master updated (e1431b5 -> 97529f8)
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Sep 30 08:55:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a change to branch master
in repository sardana.
from e1431b5 release
new d681969 Imported Upstream version 2.0.0
new af4ad30 Merge tag 'upstream/2.0.0'
new 7ca673b release
new 523f1ff New upstream version 2.1.0
new f3acd8c Merge tag 'upstream/2.1.0'
new 97529f8 release
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
PKG-INFO | 4 +-
debian/changelog | 15 +
debian/control | 12 +-
doc/logo.bmp | Bin 119070 -> 0 bytes
doc/man/MacroServer.1 | 4 +-
doc/man/Pool.1 | 4 +-
doc/man/Sardana.1 | 4 +-
doc/man/{sequencer.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/{sequencer.1 => ubmatrix.1} | 17 +-
doc/source/_static/logo.png | Bin 36269 -> 0 bytes
doc/source/_static/macros/favouriteeditor01.png | Bin 0 -> 12205 bytes
doc/source/_static/macros/macroexecutor01.odg | Bin 0 -> 42236 bytes
.../macroexecutor01.png} | Bin 1161353 -> 1111166 bytes
doc/source/_static/macros/macroexecutor01_raw.png | Bin 0 -> 21869 bytes
.../_static/macros/macroparameterseditor01.png | Bin 0 -> 8124 bytes
.../_static/macros/macroparameterseditor02.png | Bin 0 -> 7635 bytes
.../_static/macros/macroparameterseditor03.odg | Bin 0 -> 20268 bytes
.../macroparameterseditor03.png} | Bin 604281 -> 604944 bytes
.../_static/macros/macroparameterseditor03_raw.png | Bin 0 -> 7773 bytes
.../_static/macros/macroparameterseditor04.odg | Bin 0 -> 23179 bytes
.../macroparameterseditor04.png} | Bin 604281 -> 604944 bytes
.../_static/macros/macroparameterseditor04_raw.png | Bin 0 -> 10110 bytes
.../_static/macros/macroparameterseditor05.odg | Bin 0 -> 22524 bytes
.../macroparameterseditor05.png} | Bin 604281 -> 604944 bytes
doc/source/_static/macros/sequenceeditor01.png | Bin 0 -> 13687 bytes
doc/source/_static/macros/sequenceeditor02.odg | Bin 0 -> 27793 bytes
.../sequenceeditor02.png} | Bin 758790 -> 672669 bytes
doc/source/_static/macros/sequenceeditor02_raw.png | Bin 0 -> 13687 bytes
doc/source/_static/macros/sequenceeditor03.odg | Bin 0 -> 30108 bytes
.../{motor.png => macros/sequenceeditor03.png} | Bin 604281 -> 628299 bytes
doc/source/_static/macros/sequenceeditor03_raw.png | Bin 0 -> 15806 bytes
doc/source/_static/macros/sequenceeditor04.odg | Bin 0 -> 29610 bytes
.../{motor.png => macros/sequenceeditor04.png} | Bin 604281 -> 628299 bytes
doc/source/_static/macros/sequenceeditor05_raw.png | Bin 0 -> 19830 bytes
doc/source/_static/macros/sequencer01.odg | Bin 0 -> 47998 bytes
.../sequencer01.png} | Bin 1161353 -> 1233154 bytes
doc/source/_static/macros/sequencer01_raw.png | Bin 0 -> 29047 bytes
doc/source/_templates/layout.html | 19 -
doc/source/conf.py | 7 +-
.../devel/api/sardana/macroserver/macros.rst | 188 ++-
.../devel/howto_controllers/howto_0dcontroller.rst | 35 +-
.../howto_controllers/howto_motorcontroller.rst | 4 -
doc/source/devel/howto_macros/macros_general.rst | 103 +-
doc/source/devel/howto_recorders.rst | 90 ++
doc/source/devel/index.rst | 1 +
doc/source/devel/overview/overview_0D.rst | 18 +-
doc/source/users/index.rst | 1 +
doc/source/users/scan.rst | 59 +
doc/source/users/standard_macro_catalog.rst | 38 +
.../users/taurus/experimentconfiguration.rst | 15 +
doc/source/users/taurus/index.rst | 15 +
doc/source/users/taurus/macroexecutor.rst | 152 ++
doc/source/users/taurus/sardanaeditor.rst | 15 +
doc/source/users/taurus/sequencer.rst | 123 ++
scripts/{macroexecutor => diffractometeralignment} | 2 +-
scripts/{macroexecutor => hklscan} | 2 +-
scripts/{macroexecutor => ubmatrix} | 2 +-
setup.py | 18 +-
src/sardana/macroserver/macro.py | 134 +-
src/sardana/macroserver/macros/demo.py | 143 +-
src/sardana/macroserver/macros/env.py | 8 +-
src/sardana/macroserver/macros/examples/motion.py | 56 +
.../macroserver/macros/examples/parameters.py | 66 +-
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 | 1542 ++++++++++++++++++++
src/sardana/macroserver/macros/lists.py | 7 +-
src/sardana/macroserver/macros/scan.py | 128 +-
src/sardana/macroserver/macros/standard.py | 142 +-
src/sardana/macroserver/macros/test/__init__.py | 2 +-
src/sardana/macroserver/macros/test/base.py | 40 +-
.../macroserver/macros/test/macroexecutor.py | 6 +-
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 ++
.../macros/test/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 | 204 ++-
src/sardana/macroserver/msmetarecorder.py | 100 ++
src/sardana/macroserver/msoptions.py | 1 +
src/sardana/macroserver/msparameter.py | 258 +++-
src/sardana/macroserver/msrecordermanager.py | 363 +++++
.../{scan/recorder => recorders}/__init__.py | 7 +-
.../{macros => recorders}/examples/__init__.py | 4 +-
.../recorders/examples/dummy.py} | 51 +-
src/sardana/macroserver/recorders/examples/xas.py | 283 ++++
.../{scan/recorder => recorders}/output.py | 16 +-
.../{scan/recorder => recorders}/sharedmemory.py | 73 +-
.../{scan/recorder => recorders}/storage.py | 523 +------
src/sardana/macroserver/scan/gscan.py | 788 +++++-----
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 +------------
.../test}/__init__.py | 2 -
.../test/res}/__init__.py | 2 -
.../__init__.py => test/res/fakerecorders.py} | 7 +-
.../res/recorders/path1/fakerecorders.py} | 10 +-
.../res/recorders/path2/fakerecorders.py} | 10 +-
.../res/recorders/path3/fakerecorders.py} | 10 +-
.../res/recorders/pathexternal/specrecorder.py} | 6 +-
src/sardana/macroserver/test/test_msparameter.py | 125 ++
.../macroserver/test/test_msrecordermanager.py | 171 +++
src/sardana/pool/pool.py | 14 +-
src/sardana/pool/poolacquisition.py | 8 +-
src/sardana/pool/poolbasegroup.py | 9 +-
src/sardana/pool/poolcontrollermanager.py | 13 +-
.../poolcontrollers/HklPseudoMotorController.py | 1435 ++++++++++++++++++
src/sardana/pool/poolmeasurementgroup.py | 21 +-
src/sardana/pool/poolzerodexpchannel.py | 15 +-
src/sardana/release.py | 2 +-
src/sardana/requirements.py | 3 +
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_00_10/genutils.py | 23 +-
src/sardana/spock/ipython_00_11/genutils.py | 92 +-
src/sardana/spock/ipython_01_00/genutils.py | 138 +-
src/sardana/spock/magic.py | 56 +-
src/sardana/spock/release.py | 2 +-
src/sardana/spock/spockms.py | 14 +-
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 | 61 +-
src/sardana/taurus/core/tango/sardana/motion.py | 2 +-
src/sardana/taurus/core/tango/sardana/pool.py | 158 +-
.../core/tango/sardana}/test/__init__.py | 2 +-
.../taurus/core/tango/sardana/test/test_macro.py | 116 ++
.../taurus/qt/qtcore/tango/sardana/macroserver.py | 31 +-
.../sequenceeditor => extra_hkl}/__init__.py | 4 +-
src/sardana/taurus/qt/qtgui/extra_hkl/computeu.py | 76 +
.../qt/qtgui/extra_hkl/diffractometeralignment.py | 395 +++++
.../qt/qtgui/extra_hkl/displayscanangles.py} | 50 +-
src/sardana/taurus/qt/qtgui/extra_hkl/hklscan.py | 397 +++++
.../taurus/qt/qtgui/extra_hkl/reflectionseditor.py | 255 ++++
.../qt/qtgui/extra_hkl/reflectionslist.py} | 45 +-
.../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 +++++++++++++
.../taurus/qt/qtgui/extra_macroexecutor/common.py | 10 +-
.../qt/qtgui/extra_macroexecutor/macrobutton.py | 22 +-
.../qt/qtgui/extra_macroexecutor/macroexecutor.py | 54 +-
.../macroparameterseditor/delegate.py | 2 +-
.../macroparameterseditor/model.py | 2 +-
.../extra_macroexecutor/sequenceeditor/delegate.py | 4 +-
.../extra_macroexecutor/sequenceeditor/model.py | 4 +-
.../sequenceeditor/sequenceeditor.py | 34 +-
src/sardana/taurus/qt/qtgui/extra_pool/motor.py | 851 -----------
.../taurus/qt/qtgui/extra_pool/poolchannel.py | 2 +-
.../taurus/qt/qtgui/extra_pool/poolioregister.py | 6 +-
.../taurus/qt/qtgui/extra_pool/poolmotor.py | 52 +-
.../taurus/qt/qtgui/extra_pool/ui/PoolMotorSlim.ui | 148 +-
.../qt/qtgui/extra_sardana/expdescription.py | 19 +-
.../qt/qtgui/extra_sardana/measurementgroup.py | 62 +-
src/sardana/test/testsuite.py | 7 +-
src/sardana/tools/config/sardana.py | 16 +-
180 files changed, 12476 insertions(+), 4096 deletions(-)
delete mode 100644 doc/logo.bmp
copy doc/man/{sequencer.1 => diffractometeralignment.1} (71%)
copy doc/man/{macroexecutor.1 => hklscan.1} (80%)
copy doc/man/{sequencer.1 => ubmatrix.1} (77%)
delete mode 100644 doc/source/_static/logo.png
create mode 100644 doc/source/_static/macros/favouriteeditor01.png
create mode 100644 doc/source/_static/macros/macroexecutor01.odg
copy doc/source/_static/{sardana_server_np200.png => macros/macroexecutor01.png} (78%)
create mode 100644 doc/source/_static/macros/macroexecutor01_raw.png
create mode 100644 doc/source/_static/macros/macroparameterseditor01.png
create mode 100644 doc/source/_static/macros/macroparameterseditor02.png
create mode 100644 doc/source/_static/macros/macroparameterseditor03.odg
copy doc/source/_static/{motor.png => macros/macroparameterseditor03.png} (73%)
create mode 100644 doc/source/_static/macros/macroparameterseditor03_raw.png
create mode 100644 doc/source/_static/macros/macroparameterseditor04.odg
copy doc/source/_static/{motor.png => macros/macroparameterseditor04.png} (73%)
create mode 100644 doc/source/_static/macros/macroparameterseditor04_raw.png
create mode 100644 doc/source/_static/macros/macroparameterseditor05.odg
copy doc/source/_static/{motor.png => macros/macroparameterseditor05.png} (73%)
create mode 100644 doc/source/_static/macros/sequenceeditor01.png
create mode 100644 doc/source/_static/macros/sequenceeditor02.odg
copy doc/source/_static/{kwrite_config.png => macros/sequenceeditor02.png} (71%)
create mode 100644 doc/source/_static/macros/sequenceeditor02_raw.png
create mode 100644 doc/source/_static/macros/sequenceeditor03.odg
copy doc/source/_static/{motor.png => macros/sequenceeditor03.png} (71%)
create mode 100644 doc/source/_static/macros/sequenceeditor03_raw.png
create mode 100644 doc/source/_static/macros/sequenceeditor04.odg
copy doc/source/_static/{motor.png => macros/sequenceeditor04.png} (71%)
create mode 100644 doc/source/_static/macros/sequenceeditor05_raw.png
create mode 100644 doc/source/_static/macros/sequencer01.odg
copy doc/source/_static/{sardana_server_np200.png => macros/sequencer01.png} (74%)
create mode 100644 doc/source/_static/macros/sequencer01_raw.png
delete mode 100644 doc/source/_templates/layout.html
create mode 100644 doc/source/devel/howto_recorders.rst
create mode 100644 doc/source/users/taurus/experimentconfiguration.rst
create mode 100644 doc/source/users/taurus/index.rst
create mode 100644 doc/source/users/taurus/macroexecutor.rst
create mode 100644 doc/source/users/taurus/sardanaeditor.rst
create mode 100644 doc/source/users/taurus/sequencer.rst
copy scripts/{macroexecutor => diffractometeralignment} (94%)
copy scripts/{macroexecutor => hklscan} (93%)
copy scripts/{macroexecutor => ubmatrix} (93%)
create mode 100755 src/sardana/macroserver/macros/examples/motion.py
create mode 100644 src/sardana/macroserver/macros/hkl.py
create mode 100644 src/sardana/macroserver/macros/test/test_env.py
create mode 100644 src/sardana/macroserver/macros/test/test_expert.py
copy src/sardana/{pool/pooldefs.py => macroserver/macros/test/test_ioregister.py} (68%)
create mode 100644 src/sardana/macroserver/macros/test/test_standard.py
create mode 100644 src/sardana/macroserver/msmetarecorder.py
create mode 100644 src/sardana/macroserver/msrecordermanager.py
copy src/sardana/macroserver/{scan/recorder => recorders}/__init__.py (89%)
copy src/sardana/macroserver/{macros => recorders}/examples/__init__.py (90%)
copy src/sardana/{sardanavalue.py => macroserver/recorders/examples/dummy.py} (54%)
create mode 100644 src/sardana/macroserver/recorders/examples/xas.py
rename src/sardana/macroserver/{scan/recorder => recorders}/output.py (94%)
copy src/sardana/macroserver/{scan/recorder => recorders}/sharedmemory.py (81%)
copy src/sardana/macroserver/{scan/recorder => recorders}/storage.py (60%)
copy src/sardana/{pool/poolcontrollers => macroserver/test}/__init__.py (99%)
mode change 100644 => 100755
copy src/sardana/{pool/poolcontrollers => macroserver/test/res}/__init__.py (99%)
mode change 100644 => 100755
copy src/sardana/macroserver/{macros/examples/__init__.py => test/res/fakerecorders.py} (84%)
mode change 100644 => 100755
copy src/sardana/macroserver/{macros/__init__.py => test/res/recorders/path1/fakerecorders.py} (76%)
mode change 100644 => 100755
copy src/sardana/macroserver/{macros/__init__.py => test/res/recorders/path2/fakerecorders.py} (76%)
mode change 100644 => 100755
copy src/sardana/macroserver/{macros/__init__.py => test/res/recorders/path3/fakerecorders.py} (76%)
mode change 100644 => 100755
copy src/sardana/macroserver/{macros/examples/__init__.py => test/res/recorders/pathexternal/specrecorder.py} (85%)
create mode 100644 src/sardana/macroserver/test/test_msparameter.py
create mode 100755 src/sardana/macroserver/test/test_msrecordermanager.py
create mode 100644 src/sardana/pool/poolcontrollers/HklPseudoMotorController.py
mode change 100644 => 100755 src/sardana/sardanamodulemanager.py
mode change 100644 => 100755 src/sardana/taurus/core/tango/sardana/macroserver.py
copy src/sardana/{spock => taurus/core/tango/sardana}/test/__init__.py (98%)
mode change 100644 => 100755
create mode 100755 src/sardana/taurus/core/tango/sardana/test/test_macro.py
copy src/sardana/taurus/qt/qtgui/{extra_macroexecutor/sequenceeditor => extra_hkl}/__init__.py (89%)
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/computeu.py
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/diffractometeralignment.py
copy src/sardana/{macroserver/msmanager.py => taurus/qt/qtgui/extra_hkl/displayscanangles.py} (54%)
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/hklscan.py
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/reflectionseditor.py
copy src/sardana/{sardanathreadpool.py => taurus/qt/qtgui/extra_hkl/reflectionslist.py} (55%)
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/selectsignal.py
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/ubmatrix.py
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/ui/computeu.ui
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/ui/diffractometeralignment.ui
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/ui/displayscanangles.ui
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/ui/hklscan.ui
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/ui/reflectionseditor.ui
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/ui/reflectionslist.ui
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/ui/selectsignal.ui
create mode 100644 src/sardana/taurus/qt/qtgui/extra_hkl/ui/ubmatrix.ui
--
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