[sardana] 01/02: Merge tag 'upstream/1.6.1'
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Wed Jul 29 08:09:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository sardana.
commit 7c0137be5796e497f7b2b41730fc813aa788f9b9
Merge: 94365fa e76a564
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Tue Jul 28 15:10:49 2015 +0200
Merge tag 'upstream/1.6.1'
Upstream version 1.6.1
PKG-INFO | 6 +-
doc/buildmock.py | 360 +++++++++++++++++++++
doc/man/MacroServer.1 | 4 +-
doc/man/Pool.1 | 4 +-
doc/man/Sardana.1 | 4 +-
doc/man/macroexecutor.1 | 4 +-
doc/man/sequencer.1 | 4 +-
doc/man/spock.1 | 4 +-
doc/mock.zip | Bin 0 -> 2292091 bytes
doc/sketches/sketches.odp | Bin 1500245 -> 880963 bytes
doc/source/_static/drift_correction_disabled.png | Bin 0 -> 95488 bytes
doc/source/_static/drift_correction_enabled.png | Bin 0 -> 94572 bytes
doc/source/_templates/index.html | 59 ----
doc/source/_templates/indexsidebar.html | 15 -
doc/source/_templates/layout.html | 11 +-
doc/source/conf.py | 67 ++--
doc/source/devel/api/api_motor.rst | 25 +-
.../devel/api/sardana/macroserver/macros.rst | 28 +-
doc/source/devel/examples/ControllerTemplate.py | 2 +-
doc/source/devel/howto_controllers/sf_ct_ctrl.py | 2 +-
.../devel/howto_controllers/sf_motor_ctrl.py | 2 +-
.../devel/howto_controllers/springfieldlib.py | 2 +-
doc/source/devel/howto_macros/macros_general.rst | 28 +-
doc/source/devel/overview/overview_pseudomotor.rst | 242 ++++++++++++++
doc/source/{contents.rst => docs.rst} | 13 +-
doc/source/glossary.rst | 17 +-
doc/source/index.html | 11 -
doc/source/index.rst | 57 ++++
doc/source/sphinxext/sardanaextension.py | 2 +-
doc/source/sphinxext/spock_console_highlighting.py | 2 +-
setup.py | 4 +-
src/sardana/__init__.py | 2 +-
src/sardana/macroserver/__init__.py | 2 +-
src/sardana/macroserver/basetypes.py | 2 +-
src/sardana/macroserver/macro.py | 22 +-
src/sardana/macroserver/macros/__init__.py | 2 +-
src/sardana/macroserver/macros/communication.py | 2 +-
src/sardana/macroserver/macros/demo.py | 2 +-
src/sardana/macroserver/macros/env.py | 2 +-
.../macroserver/macros/examples/__init__.py | 2 +-
src/sardana/macroserver/macros/examples/debug.py | 4 +-
src/sardana/macroserver/macros/examples/funcs.py | 2 +-
src/sardana/macroserver/macros/examples/hooks.py | 2 +-
.../macroserver/macros/examples/parameters.py | 2 +-
src/sardana/macroserver/macros/examples/scans.py | 2 +-
.../macros/examples/specific_experiments.py | 2 +-
.../macroserver/macros/examples/submacros.py | 2 +-
src/sardana/macroserver/macros/expert.py | 40 ++-
src/sardana/macroserver/macros/ioregister.py | 2 +-
src/sardana/macroserver/macros/lists.py | 2 +-
src/sardana/macroserver/macros/mca.py | 2 +-
src/sardana/macroserver/macros/scan.py | 120 ++++++-
src/sardana/macroserver/macros/standard.py | 133 ++++----
src/sardana/macroserver/macros/test/__init__.py | 2 +-
src/sardana/macroserver/macros/test/base.py | 2 +-
.../macroserver/macros/test/macroexecutor.py | 2 +-
src/sardana/macroserver/macros/test/sardemoenv.py | 2 +-
src/sardana/macroserver/macros/test/test_ct.py | 8 +-
src/sardana/macroserver/macros/test/test_list.py | 2 +-
src/sardana/macroserver/macros/test/test_scan.py | 17 +-
src/sardana/macroserver/macros/test/test_wm.py | 2 +-
src/sardana/macroserver/macroserver.py | 2 +-
src/sardana/macroserver/msbase.py | 2 +-
src/sardana/macroserver/mscontainer.py | 2 +-
src/sardana/macroserver/msdoor.py | 2 +-
src/sardana/macroserver/msenvmanager.py | 2 +-
src/sardana/macroserver/msexception.py | 2 +-
src/sardana/macroserver/msmacromanager.py | 47 ++-
src/sardana/macroserver/msmanager.py | 2 +-
src/sardana/macroserver/msmetamacro.py | 9 +-
src/sardana/macroserver/msoptions.py | 9 +-
src/sardana/macroserver/msparameter.py | 33 +-
src/sardana/macroserver/mstypemanager.py | 2 +-
src/sardana/macroserver/scan/__init__.py | 2 +-
src/sardana/macroserver/scan/gscan.py | 29 +-
src/sardana/macroserver/scan/recorder/__init__.py | 2 +-
.../macroserver/scan/recorder/datarecorder.py | 2 +-
src/sardana/macroserver/scan/recorder/output.py | 2 +-
.../macroserver/scan/recorder/sharedmemory.py | 2 +-
src/sardana/macroserver/scan/recorder/storage.py | 2 +-
src/sardana/macroserver/scan/scandata.py | 2 +-
src/sardana/pool/__init__.py | 2 +-
src/sardana/pool/controller.py | 2 +-
src/sardana/pool/pool.py | 2 +-
src/sardana/pool/poolacquisition.py | 2 +-
src/sardana/pool/poolaction.py | 2 +-
src/sardana/pool/poolbasechannel.py | 2 +-
src/sardana/pool/poolbaseelement.py | 2 +-
src/sardana/pool/poolbasegroup.py | 2 +-
src/sardana/pool/poolbaseobject.py | 2 +-
src/sardana/pool/poolcontainer.py | 2 +-
src/sardana/pool/poolcontroller.py | 2 +-
src/sardana/pool/poolcontrollermanager.py | 7 +-
.../DiscretePseudoMotorController.py | 2 +-
.../poolcontrollers/DummyCounterTimerController.py | 2 +-
.../pool/poolcontrollers/DummyIORController.py | 2 +-
.../pool/poolcontrollers/DummyMotorController.py | 6 +-
.../pool/poolcontrollers/DummyZeroDController.py | 2 +-
src/sardana/pool/poolcontrollers/IoverI0.py | 2 +-
src/sardana/pool/poolcontrollers/Slit.py | 2 +-
.../pool/poolcontrollers/TangoController.py | 2 +-
src/sardana/pool/poolcontrollers/__init__.py | 2 +-
src/sardana/pool/poolcountertimer.py | 2 +-
src/sardana/pool/pooldefs.py | 2 +-
src/sardana/pool/poolelement.py | 2 +-
src/sardana/pool/poolexception.py | 2 +-
src/sardana/pool/poolextension.py | 2 +-
src/sardana/pool/poolexternal.py | 2 +-
src/sardana/pool/poolgroupelement.py | 2 +-
src/sardana/pool/poolinstrument.py | 2 +-
src/sardana/pool/poolioregister.py | 2 +-
src/sardana/pool/poolmeasurementgroup.py | 2 +-
src/sardana/pool/poolmetacontroller.py | 2 +-
src/sardana/pool/poolmonitor.py | 2 +-
src/sardana/pool/poolmotion.py | 2 +-
src/sardana/pool/poolmotor.py | 2 +-
src/sardana/pool/poolmotorgroup.py | 2 +-
src/sardana/pool/poolmoveable.py | 2 +-
src/sardana/pool/poolobject.py | 2 +-
src/sardana/pool/poolonedexpchannel.py | 2 +-
src/sardana/pool/poolpseudocounter.py | 2 +-
src/sardana/pool/poolpseudomotor.py | 2 +-
src/sardana/pool/pooltwodexpchannel.py | 2 +-
src/sardana/pool/poolutil.py | 2 +-
src/sardana/pool/poolzerodexpchannel.py | 2 +-
src/sardana/pool/test/__init__.py | 2 +-
src/sardana/pool/test/dummyconfs.py | 2 +-
src/sardana/pool/test/fake.py | 2 +-
src/sardana/pool/test/helper.py | 2 +-
src/sardana/pool/test/test_ctacquisition.py | 2 +-
src/sardana/pool/test/test_poolcontroller.py | 2 +-
.../pool/test/test_poolcontrollermanager.py | 2 +-
src/sardana/pool/test/test_poolcountertimer.py | 2 +-
src/sardana/release.py | 6 +-
src/sardana/requirements.py | 4 +-
src/sardana/sardanaattribute.py | 2 +-
src/sardana/sardanabase.py | 2 +-
src/sardana/sardanacontainer.py | 2 +-
src/sardana/sardanacustomsettings.py | 4 +-
src/sardana/sardanadefs.py | 2 +-
src/sardana/sardanaevent.py | 2 +-
src/sardana/sardanaexception.py | 2 +-
src/sardana/sardanalock.py | 2 +-
src/sardana/sardanamanager.py | 2 +-
src/sardana/sardanameta.py | 17 +-
src/sardana/sardanamodulemanager.py | 2 +-
src/sardana/sardanathreadpool.py | 2 +-
src/sardana/sardanautils.py | 2 +-
src/sardana/sardanavalue.py | 2 +-
src/sardana/spock/__init__.py | 2 +-
src/sardana/spock/colors.py | 2 +-
src/sardana/spock/config.py | 2 +-
src/sardana/spock/exception.py | 2 +-
src/sardana/spock/genutils.py | 2 +-
src/sardana/spock/inputhandler.py | 5 +-
src/sardana/spock/ipython_00_10/__init__.py | 2 +-
src/sardana/spock/ipython_00_10/genutils.py | 2 +-
src/sardana/spock/ipython_00_11/__init__.py | 2 +-
src/sardana/spock/ipython_00_11/genutils.py | 2 +-
src/sardana/spock/ipython_01_00/__init__.py | 2 +-
src/sardana/spock/ipython_01_00/genutils.py | 2 +-
src/sardana/spock/magic.py | 2 +-
src/sardana/spock/parameter.py | 2 +-
src/sardana/spock/release.py | 4 +-
src/sardana/spock/spockms.py | 2 +-
src/sardana/spock/test/__init__.py | 2 +-
src/sardana/spock/test/test_parameter.py | 2 +-
src/sardana/tango/__init__.py | 2 +-
src/sardana/tango/core/SardanaDevice.py | 42 ++-
src/sardana/tango/core/__init__.py | 2 +-
src/sardana/tango/core/attributehandler.py | 2 +-
src/sardana/tango/core/util.py | 2 +-
src/sardana/tango/macroserver/Door.py | 2 +-
src/sardana/tango/macroserver/MacroServer.py | 2 +-
src/sardana/tango/macroserver/__init__.py | 2 +-
src/sardana/tango/macroserver/test/__init__.py | 2 +-
.../tango/macroserver/test/macroexecutor.py | 2 +-
src/sardana/tango/pool/CTExpChannel.py | 2 +-
src/sardana/tango/pool/Controller.py | 2 +-
src/sardana/tango/pool/IORegister.py | 2 +-
src/sardana/tango/pool/MeasurementGroup.py | 2 +-
src/sardana/tango/pool/Motor.py | 2 +-
src/sardana/tango/pool/MotorGroup.py | 2 +-
src/sardana/tango/pool/OneDExpChannel.py | 2 +-
src/sardana/tango/pool/Pool.py | 2 +-
src/sardana/tango/pool/PoolDevice.py | 2 +-
src/sardana/tango/pool/PseudoCounter.py | 2 +-
src/sardana/tango/pool/PseudoMotor.py | 2 +-
src/sardana/tango/pool/TwoDExpChannel.py | 2 +-
src/sardana/tango/pool/ZeroDExpChannel.py | 2 +-
src/sardana/tango/pool/__init__.py | 2 +-
src/sardana/tango/pool/test/__init__.py | 2 +-
src/sardana/tango/pool/test/base.py | 2 +-
src/sardana/tango/pool/test/test_Motor.py | 5 +-
src/sardana/taurus/__init__.py | 2 +-
src/sardana/taurus/core/__init__.py | 2 +-
src/sardana/taurus/core/tango/__init__.py | 2 +-
src/sardana/taurus/core/tango/sardana/__init__.py | 2 +-
src/sardana/taurus/core/tango/sardana/macro.py | 2 +-
.../taurus/core/tango/sardana/macroserver.py | 2 +-
src/sardana/taurus/core/tango/sardana/motion.py | 2 +-
src/sardana/taurus/core/tango/sardana/pool.py | 2 +-
src/sardana/taurus/core/tango/sardana/sardana.py | 2 +-
src/sardana/taurus/qt/__init__.py | 2 +-
src/sardana/taurus/qt/qtcore/__init__.py | 2 +-
src/sardana/taurus/qt/qtcore/tango/__init__.py | 2 +-
.../taurus/qt/qtcore/tango/sardana/__init__.py | 2 +-
.../taurus/qt/qtcore/tango/sardana/macroserver.py | 2 +-
.../taurus/qt/qtcore/tango/sardana/model.py | 2 +-
src/sardana/taurus/qt/qtcore/tango/sardana/pool.py | 2 +-
src/sardana/taurus/qt/qtgui/__init__.py | 2 +-
.../qt/qtgui/extra_macroexecutor/__init__.py | 2 +-
.../taurus/qt/qtgui/extra_macroexecutor/common.py | 2 +-
.../qt/qtgui/extra_macroexecutor/dooroutput.py | 18 +-
.../favouriteseditor/__init__.py | 2 +-
.../favouriteseditor/favouriteseditor.py | 2 +-
.../favouriteseditor/historyviewer.py | 2 +-
.../extra_macroexecutor/favouriteseditor/model.py | 2 +-
.../taurus/qt/qtgui/extra_macroexecutor/globals.py | 2 +-
.../qt/qtgui/extra_macroexecutor/macrobutton.py | 2 +-
.../extra_macroexecutor/macrodescriptionviewer.py | 2 +-
.../qt/qtgui/extra_macroexecutor/macroeditor.py | 2 +-
.../qt/qtgui/extra_macroexecutor/macroexecutor.py | 2 +-
.../macroparameterseditor/__init__.py | 2 +-
.../customeditors/__init__.py | 2 +-
.../macroparameterseditor/customeditors/senv.py | 2 +-
.../macroparameterseditor/delegate.py | 2 +-
.../macroparameterseditor/macroparameterseditor.py | 2 +-
.../macroparameterseditor/model.py | 2 +-
.../macroparameterseditor/parameditors.py | 2 +-
.../qt/qtgui/extra_macroexecutor/scanplotter.py | 2 +-
.../extra_macroexecutor/sequenceeditor/__init__.py | 2 +-
.../extra_macroexecutor/sequenceeditor/delegate.py | 2 +-
.../extra_macroexecutor/sequenceeditor/model.py | 2 +-
.../sequenceeditor/sequenceeditor.py | 2 +-
src/sardana/taurus/qt/qtgui/extra_pool/__init__.py | 2 +-
src/sardana/taurus/qt/qtgui/extra_pool/motor.py | 2 +-
.../taurus/qt/qtgui/extra_pool/poolchannel.py | 2 +-
.../taurus/qt/qtgui/extra_pool/poolioregister.py | 2 +-
.../taurus/qt/qtgui/extra_pool/poolmotor.py | 37 ++-
.../taurus/qt/qtgui/extra_sardana/__init__.py | 2 +-
.../taurus/qt/qtgui/extra_sardana/cmdline.py | 2 +-
.../qt/qtgui/extra_sardana/controllertree.py | 2 +-
.../taurus/qt/qtgui/extra_sardana/elementtree.py | 2 +-
.../taurus/qt/qtgui/extra_sardana/environment.py | 2 +-
.../qt/qtgui/extra_sardana/expdescription.py | 2 +-
.../taurus/qt/qtgui/extra_sardana/macrotree.py | 2 +-
.../qt/qtgui/extra_sardana/measurementgroup.py | 2 +-
.../qt/qtgui/extra_sardana/sardanabasewizard.py | 2 +-
.../taurus/qt/qtgui/extra_sardana/sardanaeditor.py | 2 +-
.../taurus/qt/qtgui/extra_sardana/startup.py | 2 +-
.../taurus/qt/qtgui/extra_sardana/ui/__init__.py | 2 +-
src/sardana/test/__init__.py | 2 +-
src/sardana/test/test_sardanavalue.py | 2 +-
src/sardana/test/testsuite.py | 23 +-
src/sardana/util/__init__.py | 2 +-
src/sardana/util/deepreload.py | 2 +-
src/sardana/util/motion/__init__.py | 2 +-
src/sardana/util/motion/motion.py | 2 +-
src/sardana/util/wrap.py | 2 +-
260 files changed, 1482 insertions(+), 554 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