sardana-nxsrecorder 3.29.0__tar.gz → 3.29.1__tar.gz

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.
Files changed (40) hide show
  1. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/install.sh +8 -8
  2. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.github/workflows/tests.yml +1 -1
  3. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/ChangeLog +4 -0
  4. {sardana-nxsrecorder-3.29.0/sardana_nxsrecorder.egg-info → sardana-nxsrecorder-3.29.1}/PKG-INFO +4 -23
  5. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/README.rst +3 -22
  6. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/man/sardananxsrecorder.1 +26 -59
  7. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1/sardana_nxsrecorder.egg-info}/PKG-INFO +4 -23
  8. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/sardananxsrecorder/__init__.py +1 -1
  9. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/sardananxsrecorder/nxsrecorder.py +4 -0
  10. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/debian10_py2/Dockerfile +0 -0
  11. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/debian10_py3/Dockerfile +0 -0
  12. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/debian8_py2/Dockerfile +0 -0
  13. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/debian8_py3/Dockerfile +0 -0
  14. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/debian9_py2/Dockerfile +0 -0
  15. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/debian9_py3/Dockerfile +0 -0
  16. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/run.sh +0 -0
  17. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/ubuntu16.04_py2/Dockerfile +0 -0
  18. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/ubuntu16.04_py3/Dockerfile +0 -0
  19. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/ubuntu18.04_py2/Dockerfile +0 -0
  20. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/ubuntu18.04_py3/Dockerfile +0 -0
  21. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.ci/ubuntu20.04_py3/Dockerfile +0 -0
  22. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.flake8 +0 -0
  23. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/.gitignore +0 -0
  24. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/COPYRIGHT +0 -0
  25. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/MANIFEST.in +0 -0
  26. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/doc/Makefile +0 -0
  27. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/doc/conf.py +0 -0
  28. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/doc/index.rst +0 -0
  29. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/doc/make.bat +0 -0
  30. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/doc/sardananxsrecorder.rst +0 -0
  31. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/sardana_nxsrecorder.egg-info/SOURCES.txt +0 -0
  32. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/sardana_nxsrecorder.egg-info/dependency_links.txt +0 -0
  33. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/sardana_nxsrecorder.egg-info/not-zip-safe +0 -0
  34. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/sardana_nxsrecorder.egg-info/requires.txt +0 -0
  35. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/sardana_nxsrecorder.egg-info/top_level.txt +0 -0
  36. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/setup.cfg +0 -0
  37. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/setup.py +0 -0
  38. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/test/__init__.py +0 -0
  39. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/test/__main__.py +0 -0
  40. {sardana-nxsrecorder-3.29.0 → sardana-nxsrecorder-3.29.1}/test/main.py +0 -0
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env bash
2
2
 
3
3
  # workaround for a bug in debian9, i.e. starting mysql hangs
4
- if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.04" ]; then
4
+ if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
5
5
  docker exec --user root ndts service mariadb restart
6
6
  else
7
7
  docker exec --user root ndts service mysql stop
@@ -16,7 +16,7 @@ fi
16
16
 
17
17
  docker exec --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get -qq install -y xvfb libxcb1 libx11-xcb1 libxcb-keysyms1 libxcb-image0 libxcb-icccm4 libxcb-render-util0 xkb-data tango-common; sleep 10'
18
18
  if [ "$?" -ne "0" ]; then exit 255; fi
19
- if [ "$1" = "ubuntu24.04" ]; then
19
+ if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
20
20
  # docker exec --user tango ndts /bin/bash -c '/usr/lib/tango/DataBaseds 2 -ORBendPoint giop:tcp::10000 &'
21
21
  docker exec --user root ndts /bin/bash -c 'echo -e "[client]\nuser=root\npassword=rootpw" > /root/.my.cnf'
22
22
  docker exec --user root ndts /bin/bash -c 'echo -e "[client]\nuser=tango\nhost=localhost\npassword=rootpw" > /var/lib/tango/.my.cnf'
@@ -32,7 +32,7 @@ fi
32
32
  echo "install tango-db"
33
33
  docker exec --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-db; sleep 10'
34
34
  if [ "$?" -ne "0" ]; then exit 255; fi
35
- if [ "$1" = "ubuntu24.04" ]; then
35
+ if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
36
36
  docker exec --user tango ndts /usr/bin/mysql -e 'create database tango'
37
37
  docker exec --user tango ndts /bin/bash -c '/usr/bin/mysql tango < /usr/share/dbconfig-common/data/tango-db/install/mysql'
38
38
  fi
@@ -67,20 +67,20 @@ else
67
67
  docker exec --user root ndts /bin/bash -c 'cd itango-src; git checkout tags/v0.1.7 -b b0.1.7; python3 setup.py install'
68
68
  # docker exec --user root ndts /bin/bash -c 'cd taurus-src; git checkout; python3 setup.py install'
69
69
  fi
70
- if [ "$1" = "debian10" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] ; then
70
+ if [ "$1" = "debian10" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] ; then
71
71
  docker exec --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -y git python3-six python3-numpy graphviz python3-sphinx g++ build-essential python3-dev pkg-config python3-all-dev python3-setuptools libtango-dev python3-setuptools python3-tango python3-tz; apt-get -qq install -y nxsconfigserver-db; sleep 10'
72
72
  else
73
73
  docker exec --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -y git python3-six python3-numpy graphviz python3-sphinx g++ build-essential python3-dev pkg-config python3-all-dev python3-setuptools libtango-dev python3-setuptools python3-pytango python3-tz; apt-get -qq install -y nxsconfigserver-db; sleep 10'
74
74
  fi
75
75
  docker exec --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -y libboost-python-dev libboost-dev python3-h5py python3-qtpy python3-click python3-setuptools python3-pint'
76
- if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu22.04" ]|| [ "$1" = "ubuntu24.04" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "debian10" ]; then
76
+ if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu22.04" ]|| [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "debian10" ]; then
77
77
  echo " "
78
78
  else
79
79
  docker exec --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -y libtango-dev python3-dev'
80
80
  docker exec --user root ndts /bin/bash -c 'git clone https://gitlab.com/tango-controls/pytango pytango; cd pytango; git checkout tags/v9.2.5 -b b9.2.5'
81
81
  docker exec --user root ndts /bin/bash -c 'cd pytango; python3 setup.py install'
82
82
  fi
83
- if [ "$1" = "ubuntu24.04" ]; then
83
+ if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
84
84
  docker exec --user root ndts /usr/bin/mysql -e 'GRANT ALL PRIVILEGES ON nxsconfig.* TO "tango"@"%" identified by "rootpw"'
85
85
  docker exec --user root ndts /usr/bin/mysql -e 'GRANT ALL PRIVILEGES ON nxsconfig.* TO "tango"@"localhost" identified by "rootpw"'
86
86
  docker exec --user root ndts /usr/bin/mysql -e 'FLUSH PRIVILEGES'
@@ -91,7 +91,7 @@ fi
91
91
  if [ "$?" -ne "0" ]; then exit 255; fi
92
92
 
93
93
  echo "install qt5"
94
- if [ "$1" = "debian12" ] ||[ "$1" = "debian11" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu24.04" ]; then
94
+ if [ "$1" = "debian12" ] ||[ "$1" = "debian11" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
95
95
  docker exec --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get -qq install -y qtbase5-dev-tools'
96
96
  else
97
97
  docker exec --user root ndts /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get -qq install -y qtbase5-dev-tools qt5-default'
@@ -105,7 +105,7 @@ if [ "$2" = "2" ]; then
105
105
  echo "install pytango and nxsconfigserver-db"
106
106
  docker exec --user root ndts /bin/bash -c 'apt-get -qq update; apt-get install -y python-pytango nxsconfigserver-db ; sleep 10'
107
107
  else
108
- if [ "$1" = "debian10" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] ; then
108
+ if [ "$1" = "debian10" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] ; then
109
109
  echo "install pytango"
110
110
  docker exec --user root ndts /bin/bash -c 'apt-get -qq update; apt-get install -y python3-tango'
111
111
  echo "install nxsconfigserver-db"
@@ -24,7 +24,7 @@ jobs:
24
24
  runs-on: ubuntu-latest
25
25
  strategy:
26
26
  matrix:
27
- os: [debian12, debian11, debian10, ubuntu24.04, ubuntu22.04, ubuntu20.04]
27
+ os: [debian12, debian11, debian10, ubuntu24.10, ubuntu24.04, ubuntu22.04]
28
28
  steps:
29
29
  - uses: actions/checkout@v2
30
30
  - uses: actions/setup-python@v2
@@ -1,3 +1,7 @@
1
+ 2024-12-11 Jan Kotanski <jankotan@gmail.com>
2
+ * reset SciCatMeasurements if not dict (#149)
3
+ * tagged as 3.29.1
4
+
1
5
  2024-07-19 Jan Kotanski <jankotan@gmail.com>
2
6
  * add ScanNamesNoMetadata and ScanNamesNoGrouping variables (#145)
3
7
  * tagged as 3.29.0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: sardana-nxsrecorder
3
- Version: 3.29.0
3
+ Version: 3.29.1
4
4
  Summary: NeXus Sardana Scan Recorder
5
5
  Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
6
6
  Author: Jan Kotanski
@@ -74,7 +74,7 @@ Extract sources and run
74
74
 
75
75
  .. code-block:: console
76
76
 
77
- $ python setup.py install
77
+ $ python3 setup.py install
78
78
 
79
79
  and add an *RecorderPath* property of *MacroServer* with its value
80
80
  defining the package location, e.g.
@@ -85,7 +85,7 @@ defining the package location, e.g.
85
85
  Debian packages
86
86
  """""""""""""""
87
87
 
88
- Debian Bookworm, Bullseye, Buster and Ubuntu Lunar, Jammy and Focal packages can be found in the HDRI repository.
88
+ Debian Bookworm, Bullseye, Buster and Ubuntu Oracular, Noble Jammy packages can be found in the HDRI repository.
89
89
 
90
90
  To install the debian packages, add the PGP repository key
91
91
 
@@ -107,7 +107,7 @@ Finally, for python2.7
107
107
  .. code-block:: console
108
108
 
109
109
  $ apt-get update
110
- $ apt-get install python-sardana-nxsrecorder
110
+ $ apt-get install python3-sardana-nxsrecorder
111
111
 
112
112
  and set the RecoderPath property of MacroServer with
113
113
 
@@ -115,34 +115,15 @@ and set the RecoderPath property of MacroServer with
115
115
 
116
116
  $ apt-get install sardana-nxsrecorder
117
117
 
118
- For python3
119
-
120
- .. code-block:: console
121
-
122
- $ apt-get update
123
- $ apt-get install python3-sardana-nxsrecorder
124
- $ apt-get install sardana-nxsrecorder3
125
118
 
126
119
  To instal other NexDaTaS packages
127
120
 
128
- .. code-block:: console
129
-
130
- $ apt-get install python-nxswriter nxsconfigserver-db python-nxsconfigserver nxsconfigtool python-nxstools nxswriter nxsconfigserver nxsrecselector
131
-
132
- or for python 3
133
-
134
121
  .. code-block:: console
135
122
 
136
123
  $ apt-get install python3-nxswriter nxsconfigserver-db python3-nxsconfigserver nxsconfigtool3 python3-nxstools nxswriter3 nxsconfigserver3
137
124
 
138
125
  and
139
126
 
140
- .. code-block:: console
141
-
142
- $ apt-get install python-nxsrecselector nxsrecselector nxselector
143
-
144
- or for python3
145
-
146
127
  .. code-block:: console
147
128
 
148
129
  $ apt-get install python3-nxsrecselector nxsrecselector3 nxselector3
@@ -49,7 +49,7 @@ Extract sources and run
49
49
 
50
50
  .. code-block:: console
51
51
 
52
- $ python setup.py install
52
+ $ python3 setup.py install
53
53
 
54
54
  and add an *RecorderPath* property of *MacroServer* with its value
55
55
  defining the package location, e.g.
@@ -60,7 +60,7 @@ defining the package location, e.g.
60
60
  Debian packages
61
61
  """""""""""""""
62
62
 
63
- Debian Bookworm, Bullseye, Buster and Ubuntu Lunar, Jammy and Focal packages can be found in the HDRI repository.
63
+ Debian Bookworm, Bullseye, Buster and Ubuntu Oracular, Noble Jammy packages can be found in the HDRI repository.
64
64
 
65
65
  To install the debian packages, add the PGP repository key
66
66
 
@@ -82,7 +82,7 @@ Finally, for python2.7
82
82
  .. code-block:: console
83
83
 
84
84
  $ apt-get update
85
- $ apt-get install python-sardana-nxsrecorder
85
+ $ apt-get install python3-sardana-nxsrecorder
86
86
 
87
87
  and set the RecoderPath property of MacroServer with
88
88
 
@@ -90,34 +90,15 @@ and set the RecoderPath property of MacroServer with
90
90
 
91
91
  $ apt-get install sardana-nxsrecorder
92
92
 
93
- For python3
94
-
95
- .. code-block:: console
96
-
97
- $ apt-get update
98
- $ apt-get install python3-sardana-nxsrecorder
99
- $ apt-get install sardana-nxsrecorder3
100
93
 
101
94
  To instal other NexDaTaS packages
102
95
 
103
- .. code-block:: console
104
-
105
- $ apt-get install python-nxswriter nxsconfigserver-db python-nxsconfigserver nxsconfigtool python-nxstools nxswriter nxsconfigserver nxsrecselector
106
-
107
- or for python 3
108
-
109
96
  .. code-block:: console
110
97
 
111
98
  $ apt-get install python3-nxswriter nxsconfigserver-db python3-nxsconfigserver nxsconfigtool3 python3-nxstools nxswriter3 nxsconfigserver3
112
99
 
113
100
  and
114
101
 
115
- .. code-block:: console
116
-
117
- $ apt-get install python-nxsrecselector nxsrecselector nxselector
118
-
119
- or for python3
120
-
121
102
  .. code-block:: console
122
103
 
123
104
  $ apt-get install python3-nxsrecselector nxsrecselector3 nxselector3
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
27
27
  .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
28
28
  .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
29
29
  ..
30
- .TH "SARDANANXSRECORDER" "1" "Jul 19, 2024" "3.29" "Sardana NeXus Recorder"
30
+ .TH "SARDANANXSRECORDER" "1" "Nov 07, 2024" "3.29" "Sardana NeXus Recorder"
31
31
  .SH NAME
32
32
  sardananxsrecorder \- sardananxsrecorder Documentation
33
33
  .sp
@@ -65,7 +65,7 @@ Extract sources and run
65
65
  .sp
66
66
  .nf
67
67
  .ft C
68
- $ python setup.py install
68
+ $ python3 setup.py install
69
69
  .ft P
70
70
  .fi
71
71
  .UNINDENT
@@ -79,7 +79,7 @@ defining the package location, e.g.
79
79
  .sp
80
80
  .SS Debian packages
81
81
  .sp
82
- Debian Bookworm, Bullseye, Buster and Ubuntu Lunar, Jammy and Focal packages can be found in the HDRI repository.
82
+ Debian Bookworm, Bullseye, Buster and Ubuntu Oracular, Noble Jammy packages can be found in the HDRI repository.
83
83
  .sp
84
84
  To install the debian packages, add the PGP repository key
85
85
  .INDENT 0.0
@@ -114,7 +114,7 @@ Finally, for python2.7
114
114
  .nf
115
115
  .ft C
116
116
  $ apt\-get update
117
- $ apt\-get install python\-sardana\-nxsrecorder
117
+ $ apt\-get install python3\-sardana\-nxsrecorder
118
118
  .ft P
119
119
  .fi
120
120
  .UNINDENT
@@ -132,38 +132,12 @@ $ apt\-get install sardana\-nxsrecorder
132
132
  .UNINDENT
133
133
  .UNINDENT
134
134
  .sp
135
- For python3
136
- .INDENT 0.0
137
- .INDENT 3.5
138
- .sp
139
- .nf
140
- .ft C
141
- $ apt\-get update
142
- $ apt\-get install python3\-sardana\-nxsrecorder
143
- $ apt\-get install sardana\-nxsrecorder3
144
- .ft P
145
- .fi
146
- .UNINDENT
147
- .UNINDENT
148
- .sp
149
135
  To instal other NexDaTaS packages
150
136
  .INDENT 0.0
151
137
  .INDENT 3.5
152
138
  .sp
153
139
  .nf
154
140
  .ft C
155
- $ apt\-get install python\-nxswriter nxsconfigserver\-db python\-nxsconfigserver nxsconfigtool python\-nxstools nxswriter nxsconfigserver nxsrecselector
156
- .ft P
157
- .fi
158
- .UNINDENT
159
- .UNINDENT
160
- .sp
161
- or for python 3
162
- .INDENT 0.0
163
- .INDENT 3.5
164
- .sp
165
- .nf
166
- .ft C
167
141
  $ apt\-get install python3\-nxswriter nxsconfigserver\-db python3\-nxsconfigserver nxsconfigtool3 python3\-nxstools nxswriter3 nxsconfigserver3
168
142
  .ft P
169
143
  .fi
@@ -176,18 +150,6 @@ and
176
150
  .sp
177
151
  .nf
178
152
  .ft C
179
- $ apt\-get install python\-nxsrecselector nxsrecselector nxselector
180
- .ft P
181
- .fi
182
- .UNINDENT
183
- .UNINDENT
184
- .sp
185
- or for python3
186
- .INDENT 0.0
187
- .INDENT 3.5
188
- .sp
189
- .nf
190
- .ft C
191
153
  $ apt\-get install python3\-nxsrecselector nxsrecselector3 nxselector3
192
154
  .ft P
193
155
  .fi
@@ -361,9 +323,14 @@ The NeXus file recorder uses the following sardana environment variables
361
323
  \fBNeXusWriterModes\fP \fI(list)\fP \- a list of strategy modes e.g. \fBNOINIT\fP, \fBNOSTEP\fP, \fBNOFINAL\fP, \fBMESH\fP, \fBVDS\fP separated by commas
362
324
  .IP \(bu 2
363
325
  \fBScanNames\fP \fI(bool)\fP \- special mode of using ScanName directories i.e.
364
- * \fBTrue\fP: the master file in ScanName directory,
365
- * \fBFalse\fP: Themaster file in grouping ScanName directory,
366
- * \fBNone\fP (or undefined): standard mode where the master files are outside ScanName directory
326
+ .INDENT 2.0
327
+ .IP \(bu 2
328
+ \fBTrue\fP: the master file in the ScanName directory,
329
+ .IP \(bu 2
330
+ \fBFalse\fP: the master file in the grouping ScanName directory (e.g. without ScanID),
331
+ .IP \(bu 2
332
+ \fBNone\fP (or undefined): standard mode where the master files are outside the ScanName directory
333
+ .UNINDENT
367
334
  .IP \(bu 2
368
335
  \fBScanNamesNoGrouping\fP \fI(bool)\fP \- do not perform grouping when \fBScanNames\fP is \fBFalse\fP
369
336
  .IP \(bu 2
@@ -389,9 +356,9 @@ constructor
389
356
  .B Parameters
390
357
  .INDENT 7.0
391
358
  .IP \(bu 2
392
- \fBfilename\fP (\fI\%str\fP) \-\- ScanFile name
359
+ \fBfilename\fP (\fI\%str\fP) ScanFile name
393
360
  .IP \(bu 2
394
- \fBmacro\fP (\fI\%sardana.macroserver.macro.Macro\fP) \-\- macro object
361
+ \fBmacro\fP (\fI\%sardana.macroserver.macro.Macro\fP) macro object
395
362
  .UNINDENT
396
363
  .UNINDENT
397
364
  .INDENT 7.0
@@ -403,13 +370,13 @@ adds custom data to configuration variables, i.e. from macros
403
370
  .B Parameters
404
371
  .INDENT 7.0
405
372
  .IP \(bu 2
406
- \fBvalue\fP (\fIany\fP) \-\- variable value
373
+ \fBvalue\fP (\fIany\fP) variable value
407
374
  .IP \(bu 2
408
- \fBname\fP (\fI\%str\fP) \-\- variable name
375
+ \fBname\fP (\fI\%str\fP) variable name
409
376
  .IP \(bu 2
410
- \fBgroup\fP (\fI\%str\fP) \-\- variable group inside variable dictionary
377
+ \fBgroup\fP (\fI\%str\fP) variable group inside variable dictionary
411
378
  .IP \(bu 2
412
- \fBremove\fP (\fI\%bool\fP) \-\- if True variable will be removed
379
+ \fBremove\fP (\fI\%bool\fP) if True variable will be removed
413
380
  .UNINDENT
414
381
  .UNINDENT
415
382
  .UNINDENT
@@ -424,7 +391,7 @@ and closes the nexus file
424
391
  .INDENT 7.0
425
392
  .TP
426
393
  .B Parameters
427
- \fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) \-\- sardana record list
394
+ \fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) sardana record list
428
395
  .UNINDENT
429
396
  .UNINDENT
430
397
  .INDENT 7.0
@@ -438,7 +405,7 @@ and records in INIT mode
438
405
  .INDENT 7.0
439
406
  .TP
440
407
  .B Parameters
441
- \fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) \-\- sardana record list
408
+ \fBrecordlist\fP (\fBsardana.macroserver.scan.scandata.RecordList\fP) sardana record list
442
409
  .UNINDENT
443
410
  .UNINDENT
444
411
  .INDENT 7.0
@@ -452,7 +419,7 @@ and records in INIT mode
452
419
  .INDENT 7.0
453
420
  .TP
454
421
  .B Parameters
455
- \fBrecord\fP (\fBsardana.macroserver.scan.scandata.Record\fP) \-\- sardana record list
422
+ \fBrecord\fP (\fBsardana.macroserver.scan.scandata.Record\fP) sardana record list
456
423
  .UNINDENT
457
424
  .UNINDENT
458
425
  .INDENT 7.0
@@ -510,12 +477,12 @@ indent level. An indent level of 0 will only insert newlines.
510
477
  None is the most compact representation.
511
478
  .sp
512
479
  If specified, separators should be an (item_separator, key_separator)
513
- tuple. The default is (\(aq, \(aq, \(aq: \(aq) if \fIindent\fP is \fBNone\fP and
514
- (\(aq,\(aq, \(aq: \(aq) otherwise. To get the most compact JSON representation,
515
- you should specify (\(aq,\(aq, \(aq:\(aq) to eliminate whitespace.
480
+ tuple. The default is (’, ‘, ‘: ) if \fIindent\fP is \fBNone\fP and
481
+ (‘,’, ‘: ) otherwise. To get the most compact JSON representation,
482
+ you should specify (‘,’, ‘:’) to eliminate whitespace.
516
483
  .sp
517
484
  If specified, default is a function that gets called for objects
518
- that can\(aqt otherwise be serialized. It should return a JSON encodable
485
+ that can’t otherwise be serialized. It should return a JSON encodable
519
486
  version of the object or raise a \fBTypeError\fP\&.
520
487
  .INDENT 7.0
521
488
  .TP
@@ -524,7 +491,7 @@ default encoder
524
491
  .INDENT 7.0
525
492
  .TP
526
493
  .B Parameters
527
- \fBobj\fP (\fI\%object\fP or \fIany\fP) \-\- numpy array object
494
+ \fBobj\fP (\fI\%object\fP or \fIany\fP) numpy array object
528
495
  .UNINDENT
529
496
  .UNINDENT
530
497
  .UNINDENT
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: sardana-nxsrecorder
3
- Version: 3.29.0
3
+ Version: 3.29.1
4
4
  Summary: NeXus Sardana Scan Recorder
5
5
  Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
6
6
  Author: Jan Kotanski
@@ -74,7 +74,7 @@ Extract sources and run
74
74
 
75
75
  .. code-block:: console
76
76
 
77
- $ python setup.py install
77
+ $ python3 setup.py install
78
78
 
79
79
  and add an *RecorderPath* property of *MacroServer* with its value
80
80
  defining the package location, e.g.
@@ -85,7 +85,7 @@ defining the package location, e.g.
85
85
  Debian packages
86
86
  """""""""""""""
87
87
 
88
- Debian Bookworm, Bullseye, Buster and Ubuntu Lunar, Jammy and Focal packages can be found in the HDRI repository.
88
+ Debian Bookworm, Bullseye, Buster and Ubuntu Oracular, Noble Jammy packages can be found in the HDRI repository.
89
89
 
90
90
  To install the debian packages, add the PGP repository key
91
91
 
@@ -107,7 +107,7 @@ Finally, for python2.7
107
107
  .. code-block:: console
108
108
 
109
109
  $ apt-get update
110
- $ apt-get install python-sardana-nxsrecorder
110
+ $ apt-get install python3-sardana-nxsrecorder
111
111
 
112
112
  and set the RecoderPath property of MacroServer with
113
113
 
@@ -115,34 +115,15 @@ and set the RecoderPath property of MacroServer with
115
115
 
116
116
  $ apt-get install sardana-nxsrecorder
117
117
 
118
- For python3
119
-
120
- .. code-block:: console
121
-
122
- $ apt-get update
123
- $ apt-get install python3-sardana-nxsrecorder
124
- $ apt-get install sardana-nxsrecorder3
125
118
 
126
119
  To instal other NexDaTaS packages
127
120
 
128
- .. code-block:: console
129
-
130
- $ apt-get install python-nxswriter nxsconfigserver-db python-nxsconfigserver nxsconfigtool python-nxstools nxswriter nxsconfigserver nxsrecselector
131
-
132
- or for python 3
133
-
134
121
  .. code-block:: console
135
122
 
136
123
  $ apt-get install python3-nxswriter nxsconfigserver-db python3-nxsconfigserver nxsconfigtool3 python3-nxstools nxswriter3 nxsconfigserver3
137
124
 
138
125
  and
139
126
 
140
- .. code-block:: console
141
-
142
- $ apt-get install python-nxsrecselector nxsrecselector nxselector
143
-
144
- or for python3
145
-
146
127
  .. code-block:: console
147
128
 
148
129
  $ apt-get install python3-nxsrecselector nxsrecselector3 nxselector3
@@ -20,4 +20,4 @@
20
20
  """ Sardana Scan Recorders """
21
21
 
22
22
  #: package version
23
- __version__ = "3.29.0"
23
+ __version__ = "3.29.1"
@@ -1402,6 +1402,8 @@ class NXS_FileRecorder(BaseFileRecorder):
1402
1402
  commands = []
1403
1403
  try:
1404
1404
  sm = dict(self.__getEnvVar('SciCatMeasurements', {}))
1405
+ if not isinstance(sm, dict):
1406
+ sm = {}
1405
1407
  except Exception:
1406
1408
  sm = {}
1407
1409
 
@@ -1456,6 +1458,8 @@ class NXS_FileRecorder(BaseFileRecorder):
1456
1458
 
1457
1459
  try:
1458
1460
  sm = dict(self.__getEnvVar('SciCatMeasurements', {}))
1461
+ if not isinstance(sm, dict):
1462
+ sm = {}
1459
1463
  except Exception:
1460
1464
  sm = {}
1461
1465