nxsconfigserver 2.14.3__py3-none-any.whl → 2.16.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- nxsconfigserver/MYSQLDataBase.py +2 -2
- nxsconfigserver/Merger.py +13 -4
- nxsconfigserver/NXSConfigServer.py +2 -2
- nxsconfigserver/Release.py +1 -1
- nxsconfigserver/StreamSet.py +1 -1
- nxsconfigserver/XMLConfigurator.py +3 -3
- {nxsconfigserver-2.14.3.data → nxsconfigserver-2.16.0.data}/scripts/NXSConfigServer +1 -1
- {nxsconfigserver-2.14.3.dist-info → nxsconfigserver-2.16.0.dist-info}/METADATA +4 -7
- nxsconfigserver-2.16.0.dist-info/RECORD +14 -0
- {nxsconfigserver-2.14.3.dist-info → nxsconfigserver-2.16.0.dist-info}/WHEEL +1 -1
- nxsconfigserver-2.14.3.dist-info/RECORD +0 -14
- {nxsconfigserver-2.14.3.dist-info → nxsconfigserver-2.16.0.dist-info}/top_level.txt +0 -0
nxsconfigserver/MYSQLDataBase.py
CHANGED
|
@@ -40,7 +40,7 @@ class MYSQLDataBase(object):
|
|
|
40
40
|
|
|
41
41
|
:brief: It creates the MYSQLDataBase instance
|
|
42
42
|
:param streams: tango-like steamset class
|
|
43
|
-
:type streams: :class:`StreamSet` or :class:`tango.
|
|
43
|
+
:type streams: :class:`StreamSet` or :class:`tango.LatestDeviceImpl`
|
|
44
44
|
"""
|
|
45
45
|
#: (:class:`MySQLdb.connections.Connection`) db instance
|
|
46
46
|
self.__db = None
|
|
@@ -48,7 +48,7 @@ class MYSQLDataBase(object):
|
|
|
48
48
|
self.__args = None
|
|
49
49
|
#: (:obj:`dict` <:obj:`str`, any>) connect arguments string
|
|
50
50
|
self.__argstr = None
|
|
51
|
-
#: (:class:`StreamSet` or :class:`tango.
|
|
51
|
+
#: (:class:`StreamSet` or :class:`tango.LatestDeviceImpl`) stream set
|
|
52
52
|
self._streams = streams
|
|
53
53
|
|
|
54
54
|
def connect(self, args):
|
nxsconfigserver/Merger.py
CHANGED
|
@@ -79,9 +79,10 @@ class Merger(object):
|
|
|
79
79
|
self.__root = None
|
|
80
80
|
#: (:obj:`list` <:obj:`str`> ) tags which cannot have the same siblings
|
|
81
81
|
self.singles = ['strategy', 'dimensions', 'definition',
|
|
82
|
-
'record', 'device', 'query', 'database'
|
|
82
|
+
'record', 'device', 'query', 'database',
|
|
83
|
+
'selection', 'sourceview']
|
|
83
84
|
|
|
84
|
-
#: (:obj:`list` <:obj:`str`> ) tags
|
|
85
|
+
#: (:obj:`list` <:obj:`str`> ) tags removed when are empty
|
|
85
86
|
self.tocut = ['NXtransformations', 'NXcollection']
|
|
86
87
|
|
|
87
88
|
#: (:obj:`dict` <:obj:`str` , :obj:`tuple` <:obj:`str`>> ) \
|
|
@@ -95,9 +96,17 @@ class Merger(object):
|
|
|
95
96
|
"field": ("attribute", "datasource", "doc", "dimensions",
|
|
96
97
|
"enumeration", "strategy"),
|
|
97
98
|
"group": ("group", "field", "attribute", "link", "component",
|
|
98
|
-
"doc"),
|
|
99
|
+
"doc", "vds"),
|
|
99
100
|
"link": ("datasource", "strategy", "doc"),
|
|
100
101
|
"dim": ("datasource", "strategy", "doc"),
|
|
102
|
+
"vds": ("attribute", "datasource", "doc", "dimensions",
|
|
103
|
+
"enumeration", "strategy", "map"),
|
|
104
|
+
"map": ("dimensions", "selection", "sourceview",
|
|
105
|
+
"datasource", "doc", "strategy"),
|
|
106
|
+
"selection": ("slice", "slab", "doc"),
|
|
107
|
+
"slab": ("datasource", "strategy", "doc"),
|
|
108
|
+
"slice": ("datasource", "strategy", "doc"),
|
|
109
|
+
"sourceview": ("dimensions", "selection", "doc"),
|
|
101
110
|
}
|
|
102
111
|
|
|
103
112
|
#: (:obj:`list` <:obj:`str`> ) with unique text
|
|
@@ -107,7 +116,7 @@ class Merger(object):
|
|
|
107
116
|
self.switchable = ["field", "attribute"]
|
|
108
117
|
|
|
109
118
|
#: (:obj:`list` <:obj:`str`> ) node which can have links
|
|
110
|
-
self.linkable = ["field"]
|
|
119
|
+
self.linkable = ["field", "vds"]
|
|
111
120
|
|
|
112
121
|
#: (:obj:`dict` <:obj:`str` , :obj:`str`> ) \
|
|
113
122
|
#: strategy modes to switch
|
|
@@ -44,7 +44,7 @@ from .XMLConfigurator import XMLConfigurator as XMLC
|
|
|
44
44
|
# ==================================================================
|
|
45
45
|
|
|
46
46
|
|
|
47
|
-
class NXSConfigServer(tango.
|
|
47
|
+
class NXSConfigServer(tango.LatestDeviceImpl):
|
|
48
48
|
|
|
49
49
|
""" NXSConfigServer Class Description:
|
|
50
50
|
|
|
@@ -63,7 +63,7 @@ class NXSConfigServer(tango.Device_4Impl):
|
|
|
63
63
|
:param name: device name
|
|
64
64
|
:type name: :obj:`str`
|
|
65
65
|
"""
|
|
66
|
-
tango.
|
|
66
|
+
tango.LatestDeviceImpl.__init__(self, cl, name)
|
|
67
67
|
self.debug_stream("In __init__()")
|
|
68
68
|
#: (:class:`nxsconfigserver.XMLConfigutator.XMLConfigutator`) \
|
|
69
69
|
#: xml configurator instance
|
nxsconfigserver/Release.py
CHANGED
nxsconfigserver/StreamSet.py
CHANGED
|
@@ -37,7 +37,7 @@ class StreamSet(object):
|
|
|
37
37
|
""" streamset constractor
|
|
38
38
|
|
|
39
39
|
:param streams: tango-like steamset class
|
|
40
|
-
:type streams: :class:`StreamSet` or :class:`tango.
|
|
40
|
+
:type streams: :class:`StreamSet` or :class:`tango.LatestDeviceImpl`
|
|
41
41
|
"""
|
|
42
42
|
|
|
43
43
|
#: (:class:`tango.log4tango.TangoStream`) Tango fatal log stream
|
|
@@ -78,11 +78,11 @@ class XMLConfigurator(object):
|
|
|
78
78
|
""" constructor
|
|
79
79
|
|
|
80
80
|
:param server: NXSConfigServer instance
|
|
81
|
-
:type server: :class:`tango.
|
|
81
|
+
:type server: :class:`tango.LatestDeviceImpl`
|
|
82
82
|
:brief: It allows to construct XML configurer object
|
|
83
83
|
|
|
84
84
|
"""
|
|
85
|
-
#: (:class:`StreamSet` or :class:`tango.
|
|
85
|
+
#: (:class:`StreamSet` or :class:`tango.LatestDeviceImpl`) stream set
|
|
86
86
|
self._streams = StreamSet(weakref.ref(server) if server else None)
|
|
87
87
|
#: (:obj:`str`) XML config string
|
|
88
88
|
self.xmlstring = ""
|
|
@@ -125,7 +125,7 @@ class XMLConfigurator(object):
|
|
|
125
125
|
#: (:obj:`str`) version label
|
|
126
126
|
self.versionLabel = "XCS"
|
|
127
127
|
|
|
128
|
-
#: (:class:`tango.
|
|
128
|
+
#: (:class:`tango.LatestDeviceImpl`) Tango server
|
|
129
129
|
self.__server = server
|
|
130
130
|
|
|
131
131
|
@classmethod
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: nxsconfigserver
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.16.0
|
|
4
4
|
Summary: Configuration Server for Nexus Data Writer
|
|
5
5
|
Home-page: http://github.com/jkotan/nexdatas/nxsconfigserver
|
|
6
6
|
Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
|
|
7
7
|
Author-email: jankotan@gmail.com, eugen.wintersberger@gmail.com, halil.pasic@gmail.com
|
|
8
8
|
License: GNU GENERAL PUBLIC LICENSE v3
|
|
9
9
|
Keywords: configuration MySQL writer Tango server nexus data
|
|
10
|
-
Platform: UNKNOWN
|
|
11
10
|
Classifier: Development Status :: 5 - Production/Stable
|
|
12
11
|
Classifier: Intended Audience :: Science/Research
|
|
13
12
|
Classifier: Topic :: Scientific/Engineering :: Physics
|
|
@@ -97,7 +96,7 @@ with proper privileges.
|
|
|
97
96
|
Debian packages
|
|
98
97
|
^^^^^^^^^^^^^^^
|
|
99
98
|
|
|
100
|
-
Debian Buster
|
|
99
|
+
Debian Bookworm, Bullseye, Buster and as well as Ubuntu Lunar, Jammy packages can be found in the HDRI repository.
|
|
101
100
|
|
|
102
101
|
To install the debian packages, add the PGP repository key
|
|
103
102
|
|
|
@@ -106,12 +105,12 @@ To install the debian packages, add the PGP repository key
|
|
|
106
105
|
$ sudo su
|
|
107
106
|
$ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
|
|
108
107
|
|
|
109
|
-
and then download the corresponding source list, e.g. for
|
|
108
|
+
and then download the corresponding source list, e.g. for bookworm
|
|
110
109
|
|
|
111
110
|
.. code-block:: console
|
|
112
111
|
|
|
113
112
|
$ cd /etc/apt/sources.list.d
|
|
114
|
-
$ wget http://repos.pni-hdri.de/
|
|
113
|
+
$ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
|
|
115
114
|
|
|
116
115
|
Finally, for python2 packages
|
|
117
116
|
|
|
@@ -476,5 +475,3 @@ results in
|
|
|
476
475
|
</group>
|
|
477
476
|
<doc>$var(detector=pilatus)</doc>
|
|
478
477
|
</definition>
|
|
479
|
-
|
|
480
|
-
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
nxsconfigserver/ComponentParser.py,sha256=oUEy3_0Q77992pAxR3k8CxzF5UP4hwc2beHYh9v-mJU,7745
|
|
2
|
+
nxsconfigserver/Errors.py,sha256=zFZlQNbZV6UlbGGBV149j1DQbPXAkTmYVgaR1QRIXP8,1956
|
|
3
|
+
nxsconfigserver/MYSQLDataBase.py,sha256=54bFG4KFLMkVYMme3bcybve24qgsxKTvCo7vP6RDjTI,22755
|
|
4
|
+
nxsconfigserver/Merger.py,sha256=v8jtDGi1NYugNpcYyyxFRP8XZQcbye8cKbYtj8iQaBM,21686
|
|
5
|
+
nxsconfigserver/NXSConfigServer.py,sha256=g894NApWFK3RS8MCuZd4HR6K8DCbs0sE-gYLZ9Q0OoI,44001
|
|
6
|
+
nxsconfigserver/Release.py,sha256=ZF7Wt1GNsab9PoJiL5ZtBBAebQx-PCT1f3rpwwmZaOo,895
|
|
7
|
+
nxsconfigserver/StreamSet.py,sha256=sSvXJxoDufmt9_Xu5rFaQsp_4x9gww_zMv0NTiiyLlg,5799
|
|
8
|
+
nxsconfigserver/XMLConfigurator.py,sha256=XitDApCprP0Em17Gi2w8J_XFm8RiH3VlyOvc7vlYeiA,34163
|
|
9
|
+
nxsconfigserver/__init__.py,sha256=dAvNwdxRsIARsH--JgJBAxzyaX3KPzZNStQ6B7SLbjI,1718
|
|
10
|
+
nxsconfigserver-2.16.0.data/scripts/NXSConfigServer,sha256=VEAkby0R6UyckF-OofkVDPx3Mkn6rjPrl2xMbbBXqwo,986
|
|
11
|
+
nxsconfigserver-2.16.0.dist-info/METADATA,sha256=QWzKAoM0loUyCa95t6oiJdRNwZzq37B4gm21WTl74pg,14279
|
|
12
|
+
nxsconfigserver-2.16.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
|
|
13
|
+
nxsconfigserver-2.16.0.dist-info/top_level.txt,sha256=TFz-xXdq3yV2iwY44R0uY1F-zqwYDnOmcJlN9kdo1S8,16
|
|
14
|
+
nxsconfigserver-2.16.0.dist-info/RECORD,,
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
nxsconfigserver/ComponentParser.py,sha256=oUEy3_0Q77992pAxR3k8CxzF5UP4hwc2beHYh9v-mJU,7745
|
|
2
|
-
nxsconfigserver/Errors.py,sha256=zFZlQNbZV6UlbGGBV149j1DQbPXAkTmYVgaR1QRIXP8,1956
|
|
3
|
-
nxsconfigserver/MYSQLDataBase.py,sha256=cDxl6-rTSvQbU9wCdGQaIguDzYJcQfwgfITz9Vr-XUY,22747
|
|
4
|
-
nxsconfigserver/Merger.py,sha256=oIxvotlqagfEbnchbp1KQKH0UMINbrTyN8OgA8d73O4,21172
|
|
5
|
-
nxsconfigserver/NXSConfigServer.py,sha256=RvScq784DSZvoK0RC3iFQsirNLhNWxCujmyeT8tz7AY,43993
|
|
6
|
-
nxsconfigserver/Release.py,sha256=bq_tuLCGXQ04pxouNssl3ScPPcxtL51782i3JIIuVhs,895
|
|
7
|
-
nxsconfigserver/StreamSet.py,sha256=yAEhCuSCw2eMK44NnqyoQ1SzUu_rAKg5-nVUS4S54jc,5795
|
|
8
|
-
nxsconfigserver/XMLConfigurator.py,sha256=odKgY924ietjWdQiqC3feUf7s27Tugq9-R1ugjU5BPY,34151
|
|
9
|
-
nxsconfigserver/__init__.py,sha256=dAvNwdxRsIARsH--JgJBAxzyaX3KPzZNStQ6B7SLbjI,1718
|
|
10
|
-
nxsconfigserver-2.14.3.data/scripts/NXSConfigServer,sha256=lAaTMqkp5nzMPeYcoW_0DRS06jXPvBZ4Rh7g-5sw4oY,1000
|
|
11
|
-
nxsconfigserver-2.14.3.dist-info/METADATA,sha256=-q84PbPfCeuiErWN3Lka0VbxhpVVhRHeFRmlA-atad0,14290
|
|
12
|
-
nxsconfigserver-2.14.3.dist-info/WHEEL,sha256=_NOXIqFgOaYmlm9RJLPQZ13BJuEIrp5jx5ptRD5uh3Y,92
|
|
13
|
-
nxsconfigserver-2.14.3.dist-info/top_level.txt,sha256=TFz-xXdq3yV2iwY44R0uY1F-zqwYDnOmcJlN9kdo1S8,16
|
|
14
|
-
nxsconfigserver-2.14.3.dist-info/RECORD,,
|
|
File without changes
|