[sardana] 01/01: New upstream version 2.1.1
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sat Dec 31 11:54:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to annotated tag upstream/2.1.1
in repository sardana.
commit f8d7a7f66b2790ad308a3733eb817c13c0d9fc19
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Fri Sep 30 10:57:25 2016 +0200
New upstream version 2.1.1
---
PKG-INFO | 4 +-
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/sequencer.1 | 4 +-
doc/man/spock.1 | 389 +--------------------
doc/man/ubmatrix.1 | 4 +-
doc/source/users/getting_started/installing.rst | 152 +++++---
setup.py | 4 +-
src/sardana/release.py | 2 +-
src/sardana/spock/ipython_00_10/genutils.py | 6 +-
src/sardana/spock/ipython_00_11/genutils.py | 6 +-
src/sardana/spock/ipython_01_00/genutils.py | 8 +-
src/sardana/spock/release.py | 2 +-
src/sardana/spock/spockms.py | 2 +-
src/sardana/taurus/core/tango/sardana/pool.py | 9 +-
.../qt/qtgui/extra_macroexecutor/dooroutput.py | 31 +-
20 files changed, 161 insertions(+), 486 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index 27b64b6..2d6e3f7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: sardana
-Version: 2.1.0
+Version: 2.1.1
Summary: instrument control and data acquisition system
Home-page: http://www.sardana-controls.org
Author: Zbigniew Reszela
@@ -32,7 +32,7 @@ Classifier: Programming Language :: Python
Classifier: Topic :: Scientific/Engineering
Classifier: Topic :: Software Development :: Libraries
Requires: PyTango (>=7.2.3)
-Requires: itango (>=0.1.4)
+Requires: itango (>=0.0.1)
Requires: taurus (>= 3.6.0)
Requires: lxml (>=2.1)
Provides: sardana
diff --git a/doc/man/MacroServer.1 b/doc/man/MacroServer.1
index f7a6133..353c34c 100644
--- a/doc/man/MacroServer.1
+++ b/doc/man/MacroServer.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH MACROSERVER "1" "September 2016" "MacroServer 2.1.0" "User Commands"
+.TH MACROSERVER "1" "September 2016" "MacroServer 2.1.1" "User Commands"
.SH NAME
-MacroServer \- manual page for MacroServer 2.1.0
+MacroServer \- manual page for MacroServer 2.1.1
.SH SYNOPSIS
.B usage:
\fIMacroServer instance_name \fR[\fIoptions\fR]
diff --git a/doc/man/Pool.1 b/doc/man/Pool.1
index dbd19e6..d540638 100644
--- a/doc/man/Pool.1
+++ b/doc/man/Pool.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH POOL "1" "September 2016" "Pool 2.1.0" "User Commands"
+.TH POOL "1" "September 2016" "Pool 2.1.1" "User Commands"
.SH NAME
-Pool \- manual page for Pool 2.1.0
+Pool \- manual page for Pool 2.1.1
.SH SYNOPSIS
.B usage:
\fIPool instance_name \fR[\fIoptions\fR]
diff --git a/doc/man/Sardana.1 b/doc/man/Sardana.1
index ae4cc6c..2e65334 100644
--- a/doc/man/Sardana.1
+++ b/doc/man/Sardana.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH SARDANA "1" "September 2016" "Sardana 2.1.0" "User Commands"
+.TH SARDANA "1" "September 2016" "Sardana 2.1.1" "User Commands"
.SH NAME
-Sardana \- manual page for Sardana 2.1.0
+Sardana \- manual page for Sardana 2.1.1
.SH SYNOPSIS
.B usage:
\fISardana instance_name \fR[\fIoptions\fR]
diff --git a/doc/man/diffractometeralignment.1 b/doc/man/diffractometeralignment.1
index 0cb837d..3536b8a 100644
--- a/doc/man/diffractometeralignment.1
+++ b/doc/man/diffractometeralignment.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH DIFFRACTOMETERALIGNMENT "1" "September 2016" "diffractometeralignment 2.1.0" "User Commands"
+.TH DIFFRACTOMETERALIGNMENT "1" "September 2016" "diffractometeralignment 2.1.1" "User Commands"
.SH NAME
-diffractometeralignment \- manual page for diffractometeralignment 2.1.0
+diffractometeralignment \- manual page for diffractometeralignment 2.1.1
.SH SYNOPSIS
.B diffractometeralignment
\fI<model> \fR[\fIdoor_name\fR]
diff --git a/doc/man/hklscan.1 b/doc/man/hklscan.1
index 8ef6b21..4264cc8 100644
--- a/doc/man/hklscan.1
+++ b/doc/man/hklscan.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH HKLSCAN "1" "September 2016" "hklscan 2.1.0" "User Commands"
+.TH HKLSCAN "1" "September 2016" "hklscan 2.1.1" "User Commands"
.SH NAME
-hklscan \- manual page for hklscan 2.1.0
+hklscan \- manual page for hklscan 2.1.1
.SH SYNOPSIS
.B hklscan
\fI<model> \fR[\fIdoor_name\fR]
diff --git a/doc/man/macroexecutor.1 b/doc/man/macroexecutor.1
index 1e73a9f..9ffc9f2 100644
--- a/doc/man/macroexecutor.1
+++ b/doc/man/macroexecutor.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH MACROEXECUTOR "1" "September 2016" "macroexecutor 2.1.0" "User Commands"
+.TH MACROEXECUTOR "1" "September 2016" "macroexecutor 2.1.1" "User Commands"
.SH NAME
-macroexecutor \- manual page for macroexecutor 2.1.0
+macroexecutor \- manual page for macroexecutor 2.1.1
.SH SYNOPSIS
.B macroexecutor
[\fIoptions\fR]
diff --git a/doc/man/sequencer.1 b/doc/man/sequencer.1
index 8fecd58..c8ad7e6 100644
--- a/doc/man/sequencer.1
+++ b/doc/man/sequencer.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH SEQUENCER "1" "September 2016" "sequencer 2.1.0" "User Commands"
+.TH SEQUENCER "1" "September 2016" "sequencer 2.1.1" "User Commands"
.SH NAME
-sequencer \- manual page for sequencer 2.1.0
+sequencer \- manual page for sequencer 2.1.1
.SH SYNOPSIS
.B sequencer
[\fIoptions\fR]
diff --git a/doc/man/spock.1 b/doc/man/spock.1
index e57623c..c8c8ba5 100644
--- a/doc/man/spock.1
+++ b/doc/man/spock.1
@@ -1,389 +1,6 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH SPOCK "1" "September 2016" "spock 2.1.0" "User Commands"
+.TH SPOCK "1" "September 2016" "Spock needs itango version >= 0.1.4. No itango installation found" "User Commands"
.SH NAME
-spock \- manual page for spock 2.1.0
+Spock \- manual page for Spock needs itango version >= 0.1.4. No itango installation found
.SH DESCRIPTION
-=========
-.IP
-IPython
-.PP
-=========
-.PP
-Tools for Interactive Computing in Python
-=========================================
-.IP
-A Python shell with automatic history (input and output), dynamic object
-introspection, easier configuration, command completion, access to the
-system shell and more. IPython can also be embedded in running programs.
-.PP
-Usage
-.IP
-ipython [subcommand] [options] [\-c cmd | \fB\-m\fR mod | file] [\-\-] [arg] ...
-.IP
-If invoked with no options, it executes the file and exits, passing the
-remaining arguments to the script, just as if you had specified the same
-command with python. You may need to specify `\-\-` before args to be passed
-to the script, to prevent IPython from attempting to parse them. If you
-specify the option `\-i` before the filename, it will enter an interactive
-IPython session after running the script, rather than exiting. Files ending
-in .py will be treated as normal Python, but files ending in .ipy can
-contain special IPython syntax (magic commands, shell expansions, etc.).
-.IP
-Almost all configuration in IPython is available via the command\-line. Do
-`ipython \fB\-\-help\-all\fR` to see all available options. For persistent
-configuration, look into your `ipython_config.py` configuration file for
-details.
-.IP
-This file is typically installed in the `IPYTHONDIR` directory, and there
-is a separate configuration directory for each profile. The default profile
-directory will be located in \fI$IPYTHONDIR/profile_default\fP. For Linux users,
-IPYTHONDIR defaults to `$HOME/.config/ipython`, and for other Unix systems
-to `$HOME/.ipython`. For Windows users, $HOME resolves to C:\eDocuments
-and Settings\eYourUserName in most instances.
-.IP
-To initialize a profile with the default configuration file, do::
-.IP
-$> ipython profile create
-.IP
-and start editing `IPYTHONDIR/profile_default/ipython_config.py`
-.IP
-In IPython's documentation, we will refer to this directory as
-`IPYTHONDIR`, you can change its default location by creating an
-environment variable with this name and setting it to the desired path.
-.IP
-For more information, see the manual available in HTML and PDF in your
-installation, or online at http://ipython.org/documentation.html.
-.PP
-Subcommands
-\fB\-\-\-\-\-\-\-\-\-\-\-\fR
-.PP
-Subcommands are launched as `spock cmd [args]`. For information on using
-subcommand 'cmd', do: `spock cmd \fB\-h\fR`.
-.PP
-locate
-.IP
-print the path to the IPython dir
-.PP
-profile
-.IP
-Create and manage IPython profiles.
-.PP
-console
-.IP
-Launch the IPython terminal\-based Console.
-.PP
-kernel
-.IP
-Start a kernel without an attached frontend.
-.PP
-notebook
-.IP
-Launch the IPython HTML Notebook Server.
-.PP
-nbconvert
-.IP
-Convert notebooks to/from other formats.
-.PP
-qtconsole
-.IP
-Launch the IPython Qt Console.
-.PP
-history
-.IP
-Manage the IPython history database.
-.PP
-Options
-\fB\-\-\-\-\-\-\-\fR
-.PP
-Arguments that take values are actually convenience aliases to full
-Configurables, whose aliases are listed on the help line. For more information
-on full configurables, see '\-\-help\-all'.
-.PP
-\fB\-\-no\-autoindent\fR
-.IP
-Turn off autoindenting.
-.PP
-\fB\-\-autoedit\-syntax\fR
-.IP
-Turn on auto editing of files with syntax errors.
-.PP
-\fB\-\-deep\-reload\fR
-.IP
-Enable deep (recursive) reloading by default. IPython can use the
-deep_reload module which reloads changes in modules recursively (it
-replaces the reload() function, so you don't need to change anything to
-use it). deep_reload() forces a full reload of modules whose code may
-have changed, which the default reload() function does not. When
-deep_reload is off, IPython will use the normal reload(), but
-deep_reload will still be available as dreload(). This feature is off
-by default [which means that you have both normal reload() and
-dreload()].
-.PP
-\fB\-\-confirm\-exit\fR
-.IP
-Set to confirm when you try to exit IPython with an EOF (Control\-D
-in Unix, Control\-Z/Enter in Windows). By typing 'exit' or 'quit',
-you can force a direct exit without any confirmation.
-.PP
-\fB\-\-pylab\fR
-.IP
-Pre\-load matplotlib and numpy for interactive use with
-the default matplotlib backend.
-.PP
-\fB\-\-matplotlib\fR
-.IP
-Configure matplotlib for interactive use with
-the default matplotlib backend.
-.PP
-\fB\-\-term\-title\fR
-.IP
-Enable auto setting the terminal title.
-.PP
-\fB\-\-classic\fR
-.IP
-Gives IPython a similar feel to the classic Python prompt.
-.PP
-\fB\-\-autoindent\fR
-.IP
-Turn on autoindenting.
-.PP
-\fB\-\-no\-automagic\fR
-.IP
-Turn off the auto calling of magic commands.
-.PP
-\fB\-\-banner\fR
-.IP
-Display a banner upon starting IPython.
-.PP
-\fB\-\-automagic\fR
-.IP
-Turn on the auto calling of magic commands. Type %%magic at the
-IPython prompt for more information.
-.PP
-\fB\-\-no\-deep\-reload\fR
-.IP
-Disable deep (recursive) reloading by default.
-.PP
-\fB\-\-no\-term\-title\fR
-.IP
-Disable auto setting the terminal title.
-.PP
-\fB\-\-nosep\fR
-.IP
-Eliminate all spacing between prompts.
-.PP
-\fB\-i\fR
-.IP
-If running code from the command line, become interactive afterwards.
-Note: can also be given simply as '\-i.'
-.PP
-\fB\-\-debug\fR
-.IP
-set log level to logging.DEBUG (maximize logging output)
-.PP
-\fB\-\-pprint\fR
-.IP
-Enable auto pretty printing of results.
-.PP
-\fB\-\-no\-autoedit\-syntax\fR
-.IP
-Turn off auto editing of files with syntax errors.
-.PP
-\fB\-\-quiet\fR
-.IP
-set log level to logging.CRITICAL (minimize logging output)
-.PP
-\fB\-\-no\-color\-info\fR
-.IP
-Disable using colors for info related things.
-.PP
-\fB\-\-color\-info\fR
-.IP
-IPython can display information about objects via a set of functions, and optionally can use colors for this, syntax highlighting
-source code and various other elements. However, because this
-information is passed through a pager (like 'less') and many pagers get
-confused with color codes, this option is off by default. You can test
-it and turn it on permanently in your ipython_config.py file if it
-works for you. Test it and turn it on permanently if it works with
-your system. The magic function %%color_info allows you to toggle this
-interactively for testing.
-.PP
-\fB\-\-init\fR
-.TP
-Initialize profile with default config files.
-This is equivalent
-.IP
-to running `ipython profile create <profile>` prior to startup.
-.PP
-\fB\-\-no\-pdb\fR
-.IP
-Disable auto calling the pdb debugger after every exception.
-.PP
-\fB\-\-quick\fR
-.IP
-Enable quick startup with no config files.
-.PP
-\fB\-\-no\-confirm\-exit\fR
-.IP
-Don't prompt the user when exiting.
-.PP
-\fB\-\-pydb\fR
-.IP
-Use the third party 'pydb' package as debugger, instead of pdb.
-Requires that pydb is installed.
-.PP
-\fB\-\-pdb\fR
-.IP
-Enable auto calling the pdb debugger after every exception.
-.PP
-\fB\-\-no\-pprint\fR
-.IP
-Disable auto pretty printing of results.
-.PP
-\fB\-\-no\-banner\fR
-.IP
-Don't display a banner upon starting IPython.
-.PP
-\fB\-\-profile=\fR<Unicode> (BaseIPythonApplication.profile)
-.IP
-Default: u'default'
-The IPython profile to use.
-.PP
-\fB\-c\fR <Unicode> (InteractiveShellApp.code_to_run)
-.IP
-Default: ''
-Execute the given command string.
-.PP
-\fB\-\-pylab=\fR<CaselessStrEnum> (InteractiveShellApp.pylab)
-.IP
-Default: None
-Choices: ['auto', 'gtk', 'inline', 'osx', 'qt', 'qt4', 'tk', 'wx']
-Pre\-load matplotlib and numpy for interactive use, selecting a particular
-matplotlib backend and loop integration.
-.PP
-\fB\-\-autocall=\fR<Enum> (InteractiveShell.autocall)
-.IP
-Default: 0
-Choices: (0, 1, 2)
-Make IPython automatically call any callable object even if you didn't type
-explicit parentheses. For example, 'str 43' becomes 'str(43)' automatically.
-The value can be '0' to disable the feature, '1' for 'smart' autocall, where
-it is not applied if there are no more arguments on the line, and '2' for
-\&'full' autocall, where all callable objects are automatically called (even
-if no arguments are present).
-.PP
-\fB\-\-ipython\-dir=\fR<Unicode> (BaseIPythonApplication.ipython_dir)
-.IP
-Default: u'/home/zreszela/.ipython'
-The name of the IPython directory. This directory is used for logging
-configuration (through profiles), history storage, etc. The default is
-usually $HOME/.ipython. This options can also be specified through the
-environment variable IPYTHONDIR.
-.PP
-\fB\-\-gui=\fR<CaselessStrEnum> (InteractiveShellApp.gui)
-.IP
-Default: None
-Choices: ('qt', 'wx', 'gtk', 'glut', 'pyglet', 'osx')
-Enable GUI event loop integration ('qt', 'wx', 'gtk', 'glut', 'pyglet',
-\&'osx').
-.PP
-\fB\-\-logappend=\fR<Unicode> (InteractiveShell.logappend)
-.IP
-Default: ''
-Start logging to the given file in append mode.
-.PP
-\fB\-m\fR <Unicode> (InteractiveShellApp.module_to_run)
-.IP
-Default: ''
-Run the module as a script.
-.PP
-\fB\-\-ext=\fR<Unicode> (InteractiveShellApp.extra_extension)
-.IP
-Default: ''
-dotted module name of an IPython extension to load.
-.PP
-\fB\-\-log\-level=\fR<Enum> (Application.log_level)
-.IP
-Default: 30
-Choices: (0, 10, 20, 30, 40, 50, 'DEBUG', 'INFO', 'WARN', 'ERROR', 'CRITICAL')
-Set the log level by value or name.
-.PP
-\fB\-\-colors=\fR<CaselessStrEnum> (InteractiveShell.colors)
-.IP
-Default: 'Linux'
-Choices: ('NoColor', 'LightBG', 'Linux')
-Set the color scheme (NoColor, Linux, or LightBG).
-.PP
-\fB\-\-matplotlib=\fR<CaselessStrEnum> (InteractiveShellApp.matplotlib)
-.IP
-Default: None
-Choices: ['auto', 'gtk', 'inline', 'osx', 'qt', 'qt4', 'tk', 'wx']
-Configure matplotlib for interactive use with the default matplotlib
-backend.
-.PP
-\fB\-\-cache\-size=\fR<Integer> (InteractiveShell.cache_size)
-.IP
-Default: 1000
-Set the size of the output cache. The default is 1000, you can change it
-permanently in your config file. Setting it to 0 completely disables the
-caching system, and the minimum value accepted is 20 (if you provide a value
-less than 20, it is reset to 0 and a warning is issued). This limit is
-defined because otherwise you'll spend more time re\-flushing a too small
-cache than working
-.PP
-\fB\-\-logfile=\fR<Unicode> (InteractiveShell.logfile)
-.IP
-Default: ''
-The name of the logfile to use.
-.PP
-\fB\-\-config=\fR<Unicode> (BaseIPythonApplication.extra_config_file)
-.IP
-Default: u''
-Path to an extra config file to load.
-If specified, load this config file in addition to any other IPython config.
-.PP
-To see all available configurables, use `\-\-help\-all`
-.PP
-Examples
-\fB\-\-\-\-\-\-\-\-\fR
-.TP
-ipython \fB\-\-matplotlib\fR
-# enable matplotlib integration
-.TP
-ipython \fB\-\-matploltib\fR=\fIqt\fR
-# enable matplotlib integration with qt4 backend
-.TP
-ipython \fB\-\-log\-level\fR=\fIDEBUG\fR
-# set logging to DEBUG
-.TP
-ipython \fB\-\-profile\fR=\fIfoo\fR
-# start with profile foo
-.TP
-ipython qtconsole
-# start the qtconsole GUI application
-.TP
-ipython help qtconsole
-# show the help for the qtconsole subcmd
-.TP
-ipython console
-# start the terminal\-based console application
-.TP
-ipython help console
-# show the help for the console subcmd
-.TP
-ipython notebook
-# start the IPython notebook
-.TP
-ipython help notebook
-# show the help for the notebook subcmd
-.IP
-ipython profile create foo # create profile foo w/ default config files
-ipython help profile # show the help for the profile subcmd
-.TP
-ipython locate
-# print the path to the IPython directory
-.IP
-ipython locate profile foo # print the path to the directory for profile `foo`
-.TP
-ipython nbconvert
-# convert notebooks to/from other formats
+Spock needs itango version >= 0.1.4. No itango installation found
diff --git a/doc/man/ubmatrix.1 b/doc/man/ubmatrix.1
index 13e52f5..0c49d19 100644
--- a/doc/man/ubmatrix.1
+++ b/doc/man/ubmatrix.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH UBMATRIX "1" "September 2016" "ubmatrix 2.1.0" "User Commands"
+.TH UBMATRIX "1" "September 2016" "ubmatrix 2.1.1" "User Commands"
.SH NAME
-ubmatrix \- manual page for ubmatrix 2.1.0
+ubmatrix \- manual page for ubmatrix 2.1.1
.SH SYNOPSIS
.B ubmatrix
\fI<model>\fR
diff --git a/doc/source/users/getting_started/installing.rst b/doc/source/users/getting_started/installing.rst
index a903caf..30fee8c 100644
--- a/doc/source/users/getting_started/installing.rst
+++ b/doc/source/users/getting_started/installing.rst
@@ -5,75 +5,122 @@
Installing
==========
-#. Install sardana:
- #. From easy_install [1]_ ::
-
- easy_install -U sardana
+Installing with easy_install [1]_ (platform-independent)
+--------------------------------------------------------
- #. From source code:
+Sardana can be installed using easy_install. The following command will
+automatically download and install the latest release of Sardana (see
+easy_install --help for options)::
- #. Download the sardana source code:
- #. from latest stable version of `sardana <http://pypi.python.org/pypi/sardana>`_ (|version|)
- #. from `SVN snapshot <https://sourceforge.net/p/sardana/code/HEAD/tarball?path=/trunk>`_
-
- #. Extract the downloaded tar.gz into a temporary directory
+ easy_install -U sardana
- #. type [2]_ ::
-
- python setup.py build
- python setup.py install
+You can test the installation by running::
+
+ python -c "import sardana; print sardana.Release.version"
+
+
+Installing from PyPI manually [2]_ (platform-independent)
+---------------------------------------------------------
+
+You may alternatively install from a downloaded release package:
+
+#. Download the latest release of Sardana from http://pypi.python.org/pypi/sardana
+#. Extract the downloaded source into a temporary directory and change to it
+#. run::
+
+ python setup.py install
+
+You can test the installation by running::
-#. test the installation::
-
python -c "import sardana; print sardana.Release.version"
-You can also work from SVN trunk checkout
-(please look :ref:`here <sardana-working-from-svn>` for instructions).
+Linux (Debian-based)
+--------------------
+Since v1.4, Sardana is part of the official repositories of Debian (and Ubuntu
+and other Debian-based distros). You can install it and all its dependencies by
+doing (as root)::
+
+ aptitude install python-sardana
+
+You can test the installation by running::
+
+ python -c "import sardana; print sardana.Release.version"
+
+(see more detailed instructions in `this step-by-step howto
+<https://sourceforge.net/p/sardana/wiki/Howto-Sardana-on-Debian8/>`__)
+
+
+Windows
+-------
+
+#. Download the latest windows binary from http://pypi.python.org/pypi/sardana
+#. Run the installation executable
+#. test the installation::
+
+ C:\Python27\python -c "import sardana; print sardana.Release.version"
Windows installation shortcut
------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This chapter provides a quick shortcut to all windows packages which are
-necessary to run sardana on your windows machine
+necessary to run Sardana on your windows machine
#. Install all dependencies:
- #. from `Python(x,y)`_ (by far the easiest choise)
- #. Download and install a python 2.6/2.7 compatible version of python(x,y)
- from `here <http://code.google.com/p/pythonxy>`_
-
- #. from scratch:
- #. Download and install `PyQwt`_ < 6.0 from `PyQwt downdoad page <http://pyqwt.sourceforge.net/download.html>`_
- #. Download and install compatible python from link in the same `PyQwt`_ page
- #. Download and install compatible `numpy`_ from link in the same `PyQwt`_ page.
- #. Download and install compatible `PyQt`_ from link in the same `PyQwt`_ page.
-
-#. Download and install latest `PyTango`_ from `PyTango downdoad page <http://pypi.python.org/pypi/PyTango>`_
-#. Download and install latest `taurus`_ from `Taurus downdoad page <http://pypi.python.org/pypi/taurus>`_
-#. Finally download and install latest sardana from `Sardana downdoad page <http://pypi.python.org/pypi/sardana>`_
+ #. Download and install latest `PyTango`_ from `PyTango downdoad page <http://pypi.python.org/pypi/PyTango>`_
+ #. Download and install latest `Taurus`_ from `Taurus downdoad page <http://pypi.python.org/pypi/taurus>`_
+ #. Download and install latest `lxml`_ from `lxml downdoad page <http://pypi.python.org/pypi/lxml>`_
+ #. Download and install latest itango from `itango download page <http://pypi.python.org/pypi/itango>`_
-.. _sardana-working-from-svn:
+#. Finally download and install latest Sardana from `Sardana downdoad page <http://pypi.python.org/pypi/sardana>`_
+=========================
Working directly from Git
--------------------------
+=========================
-Sometimes it is convenient to work directly from the git source without installing. To do so,
-you can clone sardana from our main git repository::
+Sometimes it is convenient to work directly from the git source without
+installing. To do so, you can clone sardana from our main git repository::
git clone git://git.code.sf.net/p/sardana/sardana.git sardana
-
-And then you can directly execute sardana binaries (Pool, MacroServer, Sardana or spock
-from the command line)::
+
+And then you can directly execute sardana binaries (Pool, MacroServer, Sardana
+or spock from the command line)::
homer at pc001:~/workspace$ cd sardana
homer at pc001:~/workspace/sardana$ scripts/Sardana
-
+
.. tip:: If you plan to work normally from git without installing, you may want
- to add the `sardana/scripts` directory to your `PATH` variable and
+ to add the `sardana/scripts` directory to your `PATH` variable and
`sardana/src` to your `PYTHONPATH` variable.
+.. _dependencies:
+
+============
+Dependencies
+============
+
+Sardana has dependencies on some python libraries:
+
+- Sardana uses Tango as the middleware so you need PyTango_ 7 or later
+ installed. You can check it by doing::
+
+ python -c 'import PyTango; print PyTango.Release.version'
+
+- Sardana clients are developed with Taurus so you need Taurus_ 3.6.0 or later
+ installed. You can check it by doing::
+
+ python -c 'import taurus; print taurus.Release.version'
+
+- Sardana operate some data in the XML format and requires lxml_ library 2.1 or
+ later. You can check it by doing::
+
+ python -c 'import lxml.etree; print lxml.etree.LXML_VERSION'
+
+- spock (Sardana CLI) requires itango 0.0.1 or later [3]_.
+
+
.. rubric:: Footnotes
.. [1] This command requires super user previledges on linux systems. If your
@@ -92,22 +139,11 @@ from the command line)::
In this case the executables are located at <HOME_DIR>/.local/bin. Make
sure the PATH is pointing there or you execute from there.
-.. _numpy: http://numpy.scipy.org/
-.. _PLY: http://www.dabeaz.com/ply/
-.. _Python(x,y): http://code.google.com/p/pythonxy/
-.. _Python: http://www.python.org/
+.. [3] PyTango < 9 is compatible with itango >= 0.0.1 and < 0.1.0,
+ while higher versions with itango >= 0.1.6.
+.. _lxml: http://lxml.de
.. _SardanaPypi: http://pypi.python.org/pypi/sardana/
.. _Tango: http://www.tango-controls.org/
-.. _PyTango: http://packages.python.org/PyTango/
-.. _taurus: http://packages.python.org/taurus/
-.. _QTango: http://www.tango-controls.org/download/index_html#qtango3
-.. _taurus: http://packages.python.org/taurus/
-.. _Qt: http://qt.nokia.com/products/
-.. _PyQt: http://www.riverbankcomputing.co.uk/software/pyqt/
-.. _PyQwt: http://pyqwt.sourceforge.net/
-.. _IPython: http://ipython.org/
-.. _ATK: http://www.tango-controls.org/Documents/gui/atk/tango-application-toolkit
-.. _Qub: http://www.blissgarden.org/projects/qub/
-.. _ESRF: http://www.esrf.eu/
-
+.. _PyTango: http://pytango.readthedocs.io/
+.. _Taurus: http://www.taurus-scada.org/
diff --git a/setup.py b/setup.py
index 8b9dff5..aa2ebc2 100644
--- a/setup.py
+++ b/setup.py
@@ -374,7 +374,9 @@ def main():
requires = [
'PyTango (>=7.2.3)',
- 'itango (>=0.1.4)',
+ # when using PyTango < 9 the dependency is >= 0.0.1 and < 0.1.0
+ # when using PyTango >= 9 the dependency is >= 0.1.6
+ 'itango (>=0.0.1)',
'taurus (>= 3.6.0)',
'lxml (>=2.1)',
]
diff --git a/src/sardana/release.py b/src/sardana/release.py
index 681a7b2..2a8ad0d 100644
--- a/src/sardana/release.py
+++ b/src/sardana/release.py
@@ -49,7 +49,7 @@ name = 'sardana'
#: the new substring. We have to avoid using either dashes or underscores,
#: because bdist_rpm does not accept dashes (an RPM) convention, and
#: bdist_deb does not accept underscores (a Debian convention).
-version_info = (2, 1, 0, 'rc', 0)
+version_info = (2, 1, 1, 'rc', 0)
version = '.'.join(map(str, version_info[:3]))
revision = str(version_info[4])
diff --git a/src/sardana/spock/ipython_00_10/genutils.py b/src/sardana/spock/ipython_00_10/genutils.py
index e1ec926..3e49abc 100644
--- a/src/sardana/spock/ipython_00_10/genutils.py
+++ b/src/sardana/spock/ipython_00_10/genutils.py
@@ -79,7 +79,9 @@ requirements = {
"Python" : ("2.6.0", "2.6.0"),
"PyTango" : ("7.1.2", "7.2.0"),
# for the moment just for reference since itango does not provide version
- "itango" : ("0.1.4", "0.1.4"),
+ # when using PyTango < 9 the dependency is >= 0.0.1 and < 0.1.0
+ # when using PyTango >= 9 the dependency is >= 0.1.6
+ "itango" : ("0.0.1", "0.0.1"),
"taurus.core" : ("2.0.0", "2.1.0")
}
@@ -516,7 +518,7 @@ def check_requirements():
try:
import itango
except ImportError:
- errMsg += "Spock needs itango version >= 0.1.4. No itango installation found\n"
+ errMsg += "Spock needs itango version >= 0.0.1, < 0.1.0 (PyTango < 9) or version >= 0.1.6 (PyTanog >= 9). No itango installation found\n"
if currTaurusCore is None:
errMsg += "Spock needs taurus.core version >= %s. No taurus.core installation found\n" % requirements["taurus.core"][0]
diff --git a/src/sardana/spock/ipython_00_11/genutils.py b/src/sardana/spock/ipython_00_11/genutils.py
index 49ad81d..a967cdc 100644
--- a/src/sardana/spock/ipython_00_11/genutils.py
+++ b/src/sardana/spock/ipython_00_11/genutils.py
@@ -89,7 +89,9 @@ requirements = {
"Python" : ("2.6.0", "2.6.0"),
"PyTango" : ("7.2.0", "7.2.3"),
# for the moment just for reference since itango does not provide version
- "itango" : ("0.1.4", "0.1.4"),
+ # when using PyTango < 9 the dependency is >= 0.0.1 and < 0.1.0
+ # when using PyTango >= 9 the dependency is >= 0.1.6
+ "itango" : ("0.0.1", "0.0.1"),
"taurus.core" : ("3.0.0", "3.0.0")
}
@@ -477,7 +479,7 @@ def check_requirements():
try:
import itango
except ImportError:
- errMsg += "Spock needs itango version >= 0.1.4. No itango installation found\n"
+ errMsg += "Spock needs itango version >= 0.0.1, < 0.1.0 (PyTango < 9) or version >= 0.1.6 (PyTanog >= 9). No itango installation found\n"
if currTaurusCore is None:
errMsg += "Spock needs taurus.core version >= %s. No taurus.core installation found\n" % requirements["taurus.core"][0]
diff --git a/src/sardana/spock/ipython_01_00/genutils.py b/src/sardana/spock/ipython_01_00/genutils.py
index ccb6b10..0b903be 100644
--- a/src/sardana/spock/ipython_01_00/genutils.py
+++ b/src/sardana/spock/ipython_01_00/genutils.py
@@ -96,7 +96,9 @@ requirements = {
"Python" : ("2.6.0", "2.6.0"),
"PyTango" : ("7.2.0", "7.2.3"),
# for the moment just for reference since itango does not provide version
- "itango" : ("0.1.4", "0.1.4"),
+ # when using PyTango < 9 the dependency is >= 0.0.1 and < 0.1.0
+ # when using PyTango >= 9 the dependency is >= 0.1.6
+ "itango" : ("0.0.1", "0.0.1"),
"taurus.core" : ("3.0.0", "3.0.0")
}
@@ -484,7 +486,7 @@ def check_requirements():
try:
import itango
except ImportError:
- errMsg += "Spock needs itango version >= 0.1.4. No itango installation found\n"
+ errMsg += "Spock needs itango version >= 0.0.1, < 0.1.0 (PyTango < 9) or version >= 0.1.6 (PyTanog >= 9). No itango installation found\n"
if currTaurusCore is None:
errMsg += "Spock needs taurus.core version >= %s. No taurus.core installation found\n" % requirements["taurus.core"][0]
@@ -579,7 +581,7 @@ def _macro_completer(self, event):
def expose_magic(name, fn, completer_func=_macro_completer):
shell = get_shell()
- fn.old_magic = shell.define_magic(name, fn)
+ fn.old_magic = shell.register_magic_function(fn, magic_name=name)
fn.old_completer = completer_func
if completer_func is None:
diff --git a/src/sardana/spock/release.py b/src/sardana/spock/release.py
index 7d2d84c..c1fa6f5 100644
--- a/src/sardana/spock/release.py
+++ b/src/sardana/spock/release.py
@@ -39,7 +39,7 @@ name = 'spock'
revision = '1'
#version = '0.8.1.svn.r' + revision.rstrip('M')
-version = '2.1.0'
+version = '2.1.1'
description = "An enhanced interactive Macro Server shell."
diff --git a/src/sardana/spock/spockms.py b/src/sardana/spock/spockms.py
index dd6378f..235366e 100755
--- a/src/sardana/spock/spockms.py
+++ b/src/sardana/spock/spockms.py
@@ -569,7 +569,7 @@ class SpockMacroServer(BaseMacroServer):
def _addMacro(self, macro_info):
macro_name = str(macro_info.name)
- def macro_fn(shell, parameter_s='', name=macro_name):
+ def macro_fn(parameter_s='', name=macro_name):
parameters = genutils.arg_split(parameter_s, posix=True)
door = genutils.get_door()
door.runMacro(macro_name, parameters, synch=True)
diff --git a/src/sardana/taurus/core/tango/sardana/pool.py b/src/sardana/taurus/core/tango/sardana/pool.py
index 17f027b..e740b31 100644
--- a/src/sardana/taurus/core/tango/sardana/pool.py
+++ b/src/sardana/taurus/core/tango/sardana/pool.py
@@ -1167,7 +1167,14 @@ class MGConfiguration(object):
data_source = channel_data['source']
#external = ctrl_name.startswith("__")
# TODO: For Taurus 4 compatibility
- params = tg_attr_validator.getParams("tango://%s" % data_source)
+ # data_source of the sardana channels does not contain the scheme
+ # part but the external tango channels does.
+ # First try to use the original data_source and as the fallback
+ # complete it with the "tango://" part. If it fails, treat it as a
+ # NON tango channel.
+ params = tg_attr_validator.getParams(data_source)
+ if params is None:
+ params = tg_attr_validator.getParams("tango://%s" % data_source)
if params is None:
# Handle NON tango channel
n_tg_chs[channel_name] = channel_data
diff --git a/src/sardana/taurus/qt/qtgui/extra_macroexecutor/dooroutput.py b/src/sardana/taurus/qt/qtgui/extra_macroexecutor/dooroutput.py
index 1cc86f4..81056d1 100644
--- a/src/sardana/taurus/qt/qtgui/extra_macroexecutor/dooroutput.py
+++ b/src/sardana/taurus/qt/qtgui/extra_macroexecutor/dooroutput.py
@@ -35,7 +35,7 @@ class DoorOutput(Qt.QPlainTextEdit):
"""Widget used for displaying changes of door's attributes: Output, Info, Warning and Error."""
def __init__(self, parent=None):
- Qt.QTextEdit.__init__(self, parent)
+ Qt.QPlainTextEdit.__init__(self, parent)
self.setReadOnly(True)
self.setFont(Qt.QFont("Courier", 9))
self.stopAction = Qt.QAction("Stop scrolling", self)
@@ -48,8 +48,10 @@ class DoorOutput(Qt.QPlainTextEdit):
txt = "<font color=\"Black\">"
if output is None:
return
- for line in output:
- txt += line.replace(' ', ' ') + "\n"
+ for i, line in enumerate(output):
+ if i > 0:
+ txt += "<br/>"
+ txt += line.replace(' ', ' ')
txt += "</font>"
self.appendHtmlText(txt)
@@ -58,9 +60,10 @@ class DoorOutput(Qt.QPlainTextEdit):
txt = "<font color=\"Blue\">"
if info is None:
return
-
- for line in info:
- txt += line.replace(' ', ' ') + "\n"
+ for i, line in enumerate(info):
+ if i > 0:
+ txt += "<br/>"
+ txt += line.replace(' ', ' ')
txt += "</font>"
self.appendHtmlText(txt)
@@ -69,8 +72,10 @@ class DoorOutput(Qt.QPlainTextEdit):
txt = "<font color=\"Orange\">"
if warning is None:
return
- for line in warning:
- txt += line.replace(' ', ' ') + "\n"
+ for i, line in enumerate(warning):
+ if i > 0:
+ txt += "<br/>"
+ txt += line.replace(' ', ' ')
txt += "</font>"
self.appendHtmlText(txt)
@@ -79,8 +84,10 @@ class DoorOutput(Qt.QPlainTextEdit):
txt = "<font color=\"Red\">"
if error is None:
return
- for line in error:
- txt += line.replace(' ', ' ') + "\n"
+ for i, line in enumerate(error):
+ if i > 0:
+ txt += "<br/>"
+ txt += line.replace(' ', ' ')
txt += "</font>"
self.appendHtmlText(txt)
@@ -108,7 +115,7 @@ class DoorDebug(Qt.QPlainTextEdit):
"""Widget used for displaying changes of door's Debug attribute."""
def __init__(self, parent=None):
- Qt.QTextEdit.__init__(self, parent)
+ Qt.QPlainTextEdit.__init__(self, parent)
self.setReadOnly(True)
self.setFont(Qt.QFont("Courier", 9))
self.stopAction = Qt.QAction("Stop scrolling", self)
@@ -145,7 +152,7 @@ class DoorResult(Qt.QPlainTextEdit):
"""Widget used for displaying changes of door's Result attribute."""
def __init__(self, parent=None):
- Qt.QTextEdit.__init__(self, parent)
+ Qt.QPlainTextEdit.__init__(self, parent)
self.setReadOnly(True)
self.setFont(Qt.QFont("Courier", 9))
--
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