659 Commits

Author SHA1 Message Date
Enrico Faulhaber
4068516178 all: rename parameters to accessibles in module classes
+ make accesses to <module>.parameters work again

Change-Id: I91c09b0f9f5f28d78cd644f83a96c8772e5977e5
Reviewed-on: https://forge.frm2.tum.de/review/20249
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-28 10:51:47 +01:00
Enrico Faulhaber
08a92029a9 Dispatcher: fix activate <module>
Change-Id: Ib97e69794cba97f2d1f6823f983ea64aaed00efa
Reviewed-on: https://forge.frm2.tum.de/review/20250
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-27 18:07:10 +01:00
Enrico Faulhaber
c2b17a66b3 datatypes: Change default fmtstr to %g
Change-Id: I6709c98b4c55b70ffd49cbfdc0f43186453e0427
Reviewed-on: https://forge.frm2.tum.de/review/20247
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2019-03-27 16:59:28 +01:00
Enrico Faulhaber
18586a3f09 params: move unit into datatypes, support for constant property
Change-Id: Ida7c8b5fd7d508d41d3b44ea98600f27f7f57dbd
Reviewed-on: https://forge.frm2.tum.de/review/20243
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-27 15:40:57 +01:00
Enrico Faulhaber
99f757bf78 fixup: rename *subtype* in client code as well
Change-Id: I97cc836b2eaa508935113c225de593bbb9ad8821
Reviewed-on: https://forge.frm2.tum.de/review/20245
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-27 15:40:49 +01:00
Enrico Faulhaber
3534c57f1c datatypes: implement format_value() method
+ adapt tests
+ switch test_datatypes.py to unicode strings
+ renamed *subtype* attribute of tuple/struct/array to members

Change-Id: I6488989b9d684d5b91bbe0b3f2aa3cbfefd0fcbf
Reviewed-on: https://forge.frm2.tum.de/review/20242
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-27 13:22:16 +01:00
Enrico Faulhaber
16772609f4 datatypes: implement hints (unit, fmtstr, *_precision)
on types where these can be useful.
Also fix some issues with ScaledInteger.

Change-Id: I9d456c4f237da3a37730c3e451e9fb59307ed982
Reviewed-on: https://forge.frm2.tum.de/review/20240
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-27 11:34:49 +01:00
Enrico Faulhaber
58bae697c9 Implement ScaledInteger type
Change-Id: I14d55d2427017e1e07f947504348804c3e66848e
Reviewed-on: https://forge.frm2.tum.de/review/20225
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-27 11:12:08 +01:00
Enrico Faulhaber
7d63643b64 datatypes: adapt Syntax to latest decisions
Change-Id: Ic6eb570991b8d85739570d87e689118f2f8835b3
Reviewed-on: https://forge.frm2.tum.de/review/20224
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-26 11:45:42 +01:00
Enrico Faulhaber
7fdde39ce1 secop_demo/modules: use distinct state codes for the phases
Change-Id: Ic58939627bd23781078d9b1c24f08c8203f92d69
Reviewed-on: https://forge.frm2.tum.de/review/20219
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-26 11:09:35 +01:00
Enrico Faulhaber
a255cfaa55 isort result
Change-Id: I137d9a6b4e2322f8df0506f9e8f751a4743aafd0
Reviewed-on: https://forge.frm2.tum.de/review/20218
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-26 11:05:34 +01:00
Enrico Faulhaber
de188983ba include isort target in Makefile
Change-Id: Idde0d66c617a38497ad2082a48a1c1d5c3ce9daa
Reviewed-on: https://forge.frm2.tum.de/review/20217
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-26 10:42:53 +01:00
Enrico Faulhaber
a230e553a9 add default role to doc conf.py
Change-Id: If67755186150a3a7a0432caca9d2bdf945ae35fe
Reviewed-on: https://forge.frm2.tum.de/review/20216
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-03-26 10:42:49 +01:00
Björn Pedersen
b4eb9fae99 Fix typo
Change-Id: Ic1810be4d8114e96eb1c30810e2beba82b739baf
Reviewed-on: https://forge.frm2.tum.de/review/20229
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2019-03-26 09:34:32 +01:00
Björn Pedersen
1e1eda5575 Ensure pylint results file exists and has version
Change-Id: I67df75eb477dfc8e0f515a35acba8a349743e03f
Reviewed-on: https://forge.frm2.tum.de/review/20228
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2019-03-26 09:31:53 +01:00
Björn Pedersen
9fa0066916 Use system site packages to get pytango
Change-Id: I375528338bf59f67dbda7764e07dbed491c061d5
Reviewed-on: https://forge.frm2.tum.de/review/20227
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2019-03-26 09:31:06 +01:00
Björn Pedersen
55763c24cd Switch to warnings-ng plugin
The warnings plugin has been deprecated and removed upstream.

Change-Id: Idbb992f4593f8f3d928526141af19b357262a92b
Reviewed-on: https://forge.frm2.tum.de/review/20226
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2019-03-26 09:16:11 +01:00
4f83bc42cc Override does not change the order of inherited accessibles.
except when explicitely mentioned with reorder=True
improved test_modules for unique accessibles, as this
was related with Accessible.ctr

Change-Id: I61877de9300bb0297c88a6c44bb265c634937856
Reviewed-on: https://forge.frm2.tum.de/review/19693
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-01-14 17:30:50 +01:00
1c33a41748 treat return value of write_<par> correctly
if the return value is 0 or "", and value is different from it,
then the behaviour is incorrect.
Alternative: we do not allow write_<par> to return None, and
check for it, or even validate the returned value.

Change-Id: If7381dd06f7c55bdc4a80981e67f831cd8ee4136
Reviewed-on: https://forge.frm2.tum.de/review/19728
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2019-01-11 15:06:41 +01:00
JenkinsCodeReview
09507f83f1 [deb] Release v0.6.4 2018-12-20 16:44:04 +01:00
Björn Pedersen
01075b7183 doc: Add a last-updated timestamp to html
Change-Id: I971516f45b52dcb73761f9f022a831bf329a5b6f
Reviewed-on: https://forge.frm2.tum.de/review/19621
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-20 16:42:57 +01:00
feba5a1400 added 'export_as' for parameters and commands
the export argument of an accessible allows now to specify an other
external name than the attribute used internally.

export=True   (default, use defined name, or prefix with '_' when
               name not in predefined list)
export=False  (do not export)
export=<any string> (special cases only)

Change-Id: I6c6669cd502d9d6fd3aa40091673e5554fd961bd
Reviewed-on: https://forge.frm2.tum.de/review/19664
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-20 16:42:35 +01:00
ef27fd1b54 additional parameter properties
- custom properties: to be declared at startup calling the
  classmethods Parameter.add_property or Command.add_property
  Probably the call should be placed in secop_<facility>/__init__.py

- valid properties are listed in Parameter.valid_properties /
  Command.valid_properties. New properties without relation to code
  in the SECnode like fmtstr, group, visibility can be added at one
  place in code only

Change-Id: I8c550eba955473665d246ddef3815b23c68be4f7
Reviewed-on: https://forge.frm2.tum.de/review/19611
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2018-12-18 16:53:49 +01:00
Björn Pedersen
92e421a939 Adjust path for docs
Change-Id: Ib6ab3a9b0163fdaa00b935962ba84eea65504eb8
Reviewed-on: https://forge.frm2.tum.de/review/19620
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-12-14 13:44:54 +01:00
Björn Pedersen
17ae9a4be6 Correctly publish pylint results
Change-Id: Ica71417f8e13959eb46065f1fe664b362d701d8c
Reviewed-on: https://forge.frm2.tum.de/review/19619
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-12-14 13:33:48 +01:00
Björn Pedersen
c0f7034b30 Run publish outside of docker container
Change-Id: I0ac8ee583f305efc7e27155624cfb11e2df8085f
Reviewed-on: https://forge.frm2.tum.de/review/19616
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-12-14 13:32:24 +01:00
Björn Pedersen
335db5f7e1 Add stage around pylint run
Change-Id: I8e58ae867660f9fd32c05606058d2b710a70cc3a
Reviewed-on: https://forge.frm2.tum.de/review/19615
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-12-14 13:32:18 +01:00
Björn Pedersen
a8bc6606af Include pylint into Jenkinsfile
Change-Id: Ica10d5aeba78f1f605965d688f7f41287f0b1c46
Reviewed-on: https://forge.frm2.tum.de/review/19555
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-13 13:36:23 +01:00
Björn Pedersen
dec643f522 docker image: add mlz tools
this supplies pylint2gerrit

Change-Id: Iae695513e6dfddc54935c9cee8a9469950a5a605
Reviewed-on: https://forge.frm2.tum.de/review/19554
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-13 13:36:23 +01:00
0a71c97f69 allow Override also for Commands
modified cryo.py for using Override correctly, here the description of the stop command is overridden

Change-Id: I060a2802226239f3af3dc1e573b7148d863b938c
Reviewed-on: https://forge.frm2.tum.de/review/19607
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-13 13:35:30 +01:00
Enrico Faulhaber
8c85a775a1 fix simulation
got broken during change of signatures of modules

Change-Id: Id423ac52fb1523ef207b08758fb941f0507eeec5
Reviewed-on: https://forge.frm2.tum.de/review/19535
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 14:03:53 +01:00
Georg Brandl
381495fe38 datatypes: require min, max ordering for size limits
Change-Id: I165b7d932716082b4bb9996f58f742763398b454
Reviewed-on: https://forge.frm2.tum.de/review/19533
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 13:30:22 +01:00
Georg Brandl
da3187ff8f fix changed Jenkinsfile
Change-Id: I55a9f254f140eda5c0cce14f718ba847ab1a6e2f
Reviewed-on: https://forge.frm2.tum.de/review/19534
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Tested-by: Georg Brandl <g.brandl@fz-juelich.de>
2018-12-04 12:55:35 +01:00
Björn Pedersen
63ffb86248 Improve build process
ensure the code is correctly on the virtual env python path.

Change-Id: Ie7ff4954a109840159c0b7a7f0b872c99845b73f
Reviewed-on: https://forge.frm2.tum.de/review/19530
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 11:19:42 +01:00
Enrico Faulhaber
a29ed09e56 reorder PHONY in Makefile
Change-Id: I854c432c78e34a598b02a2cf430ae431232a02d2
Reviewed-on: https://forge.frm2.tum.de/review/19532
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 11:02:08 +01:00
Enrico Faulhaber
61db0fe126 fix Makefile
Change-Id: Iebbf6fc0c19b192d4d54e6d0f5a64d70173ea6e6
Reviewed-on: https://forge.frm2.tum.de/review/19531
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:55:50 +01:00
Georg Brandl
0deb462c6a move path manipulation into single module
Change-Id: If88aafd03b757715b82cd733b3155e656c252b06
Reviewed-on: https://forge.frm2.tum.de/review/19529
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:54:59 +01:00
Enrico Faulhaber
50c3e5e47a fix tests
after isort change

Change-Id: I15975e4a665342139f88060e2db95ee2984d8dfe
Reviewed-on: https://forge.frm2.tum.de/review/19528
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:40:53 +01:00
Enrico Faulhaber
8efd1df92c fix isort
Change-Id: I5486e1f9b3143c6bb0804c49c7ca21adb9b84de1
Reviewed-on: https://forge.frm2.tum.de/review/19524
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:18:55 +01:00
Enrico Faulhaber
29a5b5c49e big rework to comply to current spec
- adapt to release(v2018-11-07)
- remove duplicate errors.py
- adapt tests

Change-Id: I383bb571f9808c72b37c12fbe55042011c4c0084
Reviewed-on: https://forge.frm2.tum.de/review/19397
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:18:40 +01:00
Enrico Faulhaber
87261382cf remove Message objects + rewrite server startup
Change-Id: Ide72fb915c3ca93c74edadd8952853508e677de7
Reviewed-on: https://forge.frm2.tum.de/review/19199
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-10-16 08:33:07 +02:00
Enrico Faulhaber
9824b9216d various unicode fixes
Change-Id: Ia3a83b678a5084fd1d43b8cf513b296fdbde3d91
Reviewed-on: https://forge.frm2.tum.de/review/19198
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-10-15 14:42:21 +02:00
Enrico Faulhaber
10f08f6dca fix sequencing in secop_demo.modules.MagnetiField
Change-Id: Idfd8746782b2bba61bfb30cba1010000f41aed75
Reviewed-on: https://forge.frm2.tum.de/review/19201
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-10-15 14:40:10 +02:00
Enrico Faulhaber
19854ecea1 by default export all modules
Change-Id: Ie4a1695c98d53072e52bf6948ab28ecf7f7aa9e1
Reviewed-on: https://forge.frm2.tum.de/review/19200
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-10-15 14:39:10 +02:00
Björn Pedersen
21fa01ff03 Use correct locale
Change-Id: Ic35065a2bbbbb2fdb3036a7e2a4da97e9b4fed07
Reviewed-on: https://forge.frm2.tum.de/review/18946
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-09-26 09:52:10 +02:00
Björn Pedersen
faabd1b930 CI: Add pytango dependency
Should later go to a requirements.txt on an appropriate level.

Change-Id: I3f58f18b3354110263edb67231947b89e5eb6a0e
Reviewed-on: https://forge.frm2.tum.de/review/18944
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-09-26 09:18:12 +02:00
Björn Pedersen
c57d92eb20 Fix git reference for docker env
Change-Id: Iaae09aef0838470753d4c80d43ba5812f23d11b6
Reviewed-on: https://forge.frm2.tum.de/review/18945
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-09-26 09:15:26 +02:00
Björn Pedersen
7e55d6625c Remove jenkins bootstrapping code
Change-Id: I227abd2b6ad1dfee550c05fda32a97785cc957fe
Reviewed-on: https://forge.frm2.tum.de/review/18669
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-09-26 08:53:12 +02:00
Björn Pedersen
bfe6aa364f Add docs test/build
Integrate the doc build in the new secop job

TODO: Check the publishing part

Change-Id: I361ec085aad04b5155bb3f972b329dd2a7445aaa
Reviewed-on: https://forge.frm2.tum.de/review/18661
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-09-26 08:53:09 +02:00
Björn Pedersen
f1fef1e50f Add venv initialisation
Install current (merged to master) requirements on container
creation.

Change-Id: I32595ac0a141e1477e9e5c1a99ea76729fe5b1b9
Reviewed-on: https://forge.frm2.tum.de/review/18620
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-09-26 08:53:05 +02:00