[sardana] 01/04: Merge tag 'upstream/2.2.0'
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sat Dec 31 11:51:52 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 8926f54651c62092f418e57e4d17df5e20c380e8
Merge: 2ec796d 75a3681
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sat Dec 31 09:55:57 2016 +0100
Merge tag 'upstream/2.2.0'
Upstream version 2.2.0
CHANGELOG.md | 155 ++++++
MANIFEST.in | 14 +
PKG-INFO | 6 +-
doc/man/MacroServer.1 | 4 +-
doc/man/Pool.1 | 4 +-
doc/man/Sardana.1 | 4 +-
doc/man/diffractometeralignment.1 | 4 +-
doc/man/hklscan.1 | 4 +-
doc/man/macroexecutor.1 | 4 +-
doc/man/sardanatestsuite.1 | 19 +
doc/man/sequencer.1 | 4 +-
doc/man/spock.1 | 389 ++++++++++++-
doc/man/ubmatrix.1 | 4 +-
doc/source/devel/guide_coding.rst | 35 +-
.../howto_pseudocountercontroller.rst | 93 +++-
doc/source/devel/howto_test/test_run_commands.rst | 39 +-
.../devel/overview/overview_pseudocounter.rst | 29 +-
doc/source/docs.rst | 1 +
doc/source/index.rst | 4 +-
doc/source/sep/SEP0.md | 360 ++++++++++++
doc/source/sep/SEP1.md | 338 ++++++++++++
doc/source/sep/SEP10.md | 114 ++++
doc/source/sep/SEP11.md | 137 +++++
doc/source/sep/SEP12.md | 112 ++++
doc/source/sep/SEP13.md | 5 +
doc/source/sep/SEP14.md | 136 +++++
doc/source/sep/SEP15.md | 197 +++++++
doc/source/sep/SEP2.md | 80 +++
doc/source/sep/SEP3.md | 133 +++++
doc/source/sep/SEP4.md | 305 ++++++++++
doc/source/sep/SEP5.md | 305 ++++++++++
doc/source/sep/SEP6.md | 496 +++++++++++++++++
doc/source/sep/SEP7.md | 254 +++++++++
doc/source/sep/SEP8.md | 25 +
doc/source/sep/SEP9.md | 119 ++++
doc/source/sep/index.md | 55 ++
doc/source/sep/index.rst | 23 +
doc/source/sep/res/sep0_workflow.png | Bin 0 -> 22871 bytes
doc/source/sep/res/sep6_motion.bmp | Bin 0 -> 1030614 bytes
doc/source/users/getting_started/installing.rst | 2 +-
doc/source/users/scan.rst | 22 +-
scripts/MacroServer | 56 --
scripts/Pool | 56 --
scripts/Sardana | 56 --
scripts/diffractometeralignment | 27 -
scripts/h5toascii | 118 ----
scripts/h5tospec | 230 --------
scripts/hklscan | 27 -
scripts/macroexecutor | 27 -
scripts/sequencer | 27 -
scripts/spectoascii | 87 ---
scripts/spock | 51 --
scripts/ubmatrix | 27 -
setup.cfg | 5 +
setup.py | 460 +++-------------
PKG-INFO => src/sardana.egg-info/PKG-INFO | 6 +-
src/sardana.egg-info/SOURCES.txt | 611 +++++++++++++++++++++
src/sardana.egg-info/dependency_links.txt | 1 +
src/sardana.egg-info/entry_points.txt | 14 +
src/sardana.egg-info/top_level.txt | 1 +
src/sardana/macroserver/macros/scan.py | 4 +-
src/sardana/macroserver/macros/standard.py | 6 +-
src/sardana/macroserver/macros/test/sardemoenv.py | 31 +-
src/sardana/macroserver/macros/test/test_expert.py | 14 +-
src/sardana/macroserver/recorders/storage.py | 35 +-
src/sardana/pool/pool.py | 2 +
src/sardana/pool/poolacquisition.py | 57 +-
src/sardana/pool/poolcontroller.py | 21 +
.../poolcontrollers/HklPseudoMotorController.py | 9 +-
src/sardana/pool/poolmeasurementgroup.py | 5 +-
src/sardana/pool/poolpseudocounter.py | 13 +-
src/sardana/pool/poolzerodexpchannel.py | 19 +
src/sardana/release.py | 27 +-
src/sardana/spock/__init__.py | 5 +-
src/sardana/spock/ipython_00_10/genutils.py | 18 +-
src/sardana/spock/ipython_00_11/genutils.py | 9 +-
src/sardana/spock/ipython_01_00/genutils.py | 32 +-
src/sardana/spock/release.py | 5 +
src/sardana/spock/spockms.py | 28 +-
src/sardana/tango/__init__.py | 11 +-
src/sardana/tango/core/util.py | 8 +-
src/sardana/tango/macroserver/__init__.py | 10 +-
src/sardana/tango/pool/PseudoCounter.py | 37 +-
src/sardana/tango/pool/TwoDExpChannel.py | 2 +-
src/sardana/tango/pool/ZeroDExpChannel.py | 14 +-
src/sardana/tango/pool/__init__.py | 10 +-
src/sardana/taurus/core/tango/sardana/pool.py | 1 -
.../qt/qtgui/extra_hkl/diffractometeralignment.py | 2 +-
src/sardana/taurus/qt/qtgui/extra_hkl/hklscan.py | 2 +-
.../qtgui/extra_pool/ui/AppleiiPLCTemperature.ui | 6 +-
.../extra_pool/ui/AppleiiPLCTemperatureAlarms.ui | 4 +-
.../taurus/qt/qtgui/extra_pool/ui/TaurusMotorH.ui | 4 +-
.../taurus/qt/qtgui/extra_pool/ui/TaurusMotorH2.ui | 4 +-
.../taurus/qt/qtgui/extra_pool/ui/TaurusMotorV.ui | 4 +-
.../taurus/qt/qtgui/extra_pool/ui/TaurusMotorV2.ui | 36 +-
.../qt/qtgui/extra_sardana/expdescription.py | 17 +-
.../taurus/qt/qtgui/extra_sardana/sardanaeditor.py | 57 +-
.../taurus/qt/qtgui/extra_sardana/startup.py | 3 +-
src/sardana/test/testsuite.py | 77 ++-
99 files changed, 5121 insertions(+), 1449 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