bec-widgets 0.59.1__py3-none-any.whl → 0.60.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.
- .gitlab-ci.yml +25 -23
- CHANGELOG.md +43 -43
- PKG-INFO +3 -2
- bec_widgets/cli/__init__.py +1 -1
- bec_widgets/cli/client.py +562 -639
- bec_widgets/cli/generate_cli.py +114 -45
- bec_widgets/utils/bec_connector.py +1 -0
- bec_widgets/widgets/dock/dock.py +5 -7
- bec_widgets/widgets/figure/plots/waveform/waveform.py +0 -1
- {bec_widgets-0.59.1.dist-info → bec_widgets-0.60.0.dist-info}/METADATA +3 -2
- {bec_widgets-0.59.1.dist-info → bec_widgets-0.60.0.dist-info}/RECORD +16 -15
- bec_widgets-0.60.0.dist-info/entry_points.txt +2 -0
- pyproject.toml +8 -3
- tests/unit_tests/test_generate_cli_client.py +37 -5
- {bec_widgets-0.59.1.dist-info → bec_widgets-0.60.0.dist-info}/WHEEL +0 -0
- {bec_widgets-0.59.1.dist-info → bec_widgets-0.60.0.dist-info}/licenses/LICENSE +0 -0
.gitlab-ci.yml
CHANGED
@@ -34,7 +34,17 @@ stages:
|
|
34
34
|
.install-qt-webengine-deps: &install-qt-webengine-deps
|
35
35
|
- apt-get -y install libnss3 libxdamage1 libasound2 libatomic1 libxcursor1
|
36
36
|
- export QTWEBENGINE_DISABLE_SANDBOX=1
|
37
|
-
|
37
|
+
|
38
|
+
.clone-repos: &clone-repos
|
39
|
+
- git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
|
40
|
+
- git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
|
41
|
+
- export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
|
42
|
+
|
43
|
+
.install-os-packages: &install-os-packages
|
44
|
+
- apt-get update
|
45
|
+
- apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
|
46
|
+
- *install-qt-webengine-deps
|
47
|
+
|
38
48
|
before_script:
|
39
49
|
- if [[ "$CI_PROJECT_PATH" != "bec/bec_widgets" ]]; then
|
40
50
|
echo -e "\033[35;1m Using branch $CHILD_PIPELINE_BRANCH of BEC Widgets \033[0;m";
|
@@ -79,18 +89,21 @@ pylint-check:
|
|
79
89
|
- apt-get update
|
80
90
|
- apt-get install -y bc
|
81
91
|
script:
|
92
|
+
- git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
|
82
93
|
# Identify changed Python files
|
83
94
|
- if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
|
84
|
-
TARGET_BRANCH_COMMIT_SHA=$(git rev-parse
|
85
|
-
CHANGED_FILES=$(git diff --name-only $
|
95
|
+
TARGET_BRANCH_COMMIT_SHA=$(git rev-parse origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME);
|
96
|
+
CHANGED_FILES=$(git diff --name-only $TARGET_BRANCH_COMMIT_SHA HEAD | grep '\.py$' || true);
|
86
97
|
else
|
87
98
|
CHANGED_FILES=$(git diff --name-only $CI_COMMIT_BEFORE_SHA $CI_COMMIT_SHA | grep '\.py$' || true);
|
88
99
|
fi
|
89
100
|
- if [ -z "$CHANGED_FILES" ]; then echo "No Python files changed."; exit 0; fi
|
90
101
|
|
102
|
+
- echo "Changed Python files:"
|
103
|
+
- $CHANGED_FILES
|
91
104
|
# Run pylint only on changed files
|
92
105
|
- mkdir ./pylint
|
93
|
-
- pylint $CHANGED_FILES --output-format=text
|
106
|
+
- pylint $CHANGED_FILES --output-format=text | tee ./pylint/pylint_changed_files.log || pylint-exit $?
|
94
107
|
- PYLINT_SCORE=$(sed -n 's/^Your code has been rated at \([-0-9.]*\)\/.*/\1/p' ./pylint/pylint_changed_files.log)
|
95
108
|
- echo "Pylint score is $PYLINT_SCORE"
|
96
109
|
|
@@ -109,13 +122,10 @@ tests:
|
|
109
122
|
variables:
|
110
123
|
QT_QPA_PLATFORM: "offscreen"
|
111
124
|
script:
|
112
|
-
-
|
113
|
-
-
|
114
|
-
- export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
|
115
|
-
- apt-get update
|
116
|
-
- apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
|
117
|
-
- *install-qt-webengine-deps
|
125
|
+
- *clone-repos
|
126
|
+
- *install-os-packages
|
118
127
|
- pip install -e ./bec/bec_lib[dev]
|
128
|
+
- pip install -e ./bec/bec_ipython_client
|
119
129
|
- pip install -e .[dev,pyqt6]
|
120
130
|
- coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
|
121
131
|
- coverage report
|
@@ -148,13 +158,10 @@ test-matrix:
|
|
148
158
|
QT_PCKG: ""
|
149
159
|
image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:$PYTHON_VERSION
|
150
160
|
script:
|
151
|
-
-
|
152
|
-
-
|
153
|
-
- export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
|
154
|
-
- apt-get update
|
155
|
-
- apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
|
156
|
-
- *install-qt-webengine-deps
|
161
|
+
- *clone-repos
|
162
|
+
- *install-os-packages
|
157
163
|
- pip install -e ./bec/bec_lib[dev]
|
164
|
+
- pip install -e ./bec/bec_ipython_client
|
158
165
|
- pip install -e .[dev,$QT_PCKG]
|
159
166
|
- pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
|
160
167
|
allow_failure: true
|
@@ -167,9 +174,8 @@ end-2-end-conda:
|
|
167
174
|
variables:
|
168
175
|
QT_QPA_PLATFORM: "offscreen"
|
169
176
|
script:
|
170
|
-
-
|
171
|
-
-
|
172
|
-
- *install-qt-webengine-deps
|
177
|
+
- *clone-repos
|
178
|
+
- *install-os-packages
|
173
179
|
- conda config --prepend channels conda-forge
|
174
180
|
- conda config --set channel_priority strict
|
175
181
|
- conda config --set always_yes yes --set changeps1 no
|
@@ -178,10 +184,6 @@ end-2-end-conda:
|
|
178
184
|
- source ~/.bashrc
|
179
185
|
- conda activate test-environment
|
180
186
|
|
181
|
-
- git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
|
182
|
-
- git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
|
183
|
-
- export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
|
184
|
-
|
185
187
|
- cd ./bec
|
186
188
|
- source ./bin/install_bec_dev.sh -t
|
187
189
|
|
CHANGELOG.md
CHANGED
@@ -2,6 +2,49 @@
|
|
2
2
|
|
3
3
|
|
4
4
|
|
5
|
+
## v0.60.0 (2024-06-08)
|
6
|
+
|
7
|
+
### Ci
|
8
|
+
|
9
|
+
* ci: added git fetch for target branch ([`fc4f4f8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc4f4f81ad1be99cf5112f2188a46c5bed2679ee))
|
10
|
+
|
11
|
+
* ci: fixed pylint-check ([`6b1d582`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6b1d5827d6599f06a3acd316060a8d25f0686d54))
|
12
|
+
|
13
|
+
* ci: cleanup ([`11173b9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/11173b9c0a7dc4b36e35962042e5b86407da49f1))
|
14
|
+
|
15
|
+
### Feature
|
16
|
+
|
17
|
+
* feat: added isort to bw-generate-cli ([`f0391f5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f0391f59c9eb0a51b693fccfe2e399e869d35dda))
|
18
|
+
|
19
|
+
* feat: added entry point for bw-generate-cli ([`1c7f491`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1c7f4912ce5998e666276969bf4af8656d619a91))
|
20
|
+
|
21
|
+
* feat(cli): auto-discover rpc-enabled widgets ([`df1be10`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df1be10057a5e85a3f35bef1c1b27366b6727276))
|
22
|
+
|
23
|
+
### Fix
|
24
|
+
|
25
|
+
* fix: removed BECConnector from rpc client interface ([`6428e38`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6428e38ab94c15a2c904e75cc6404bb6d0394e04))
|
26
|
+
|
27
|
+
* fix: added bec_ipython_client as dependency; needed for jupyter widget ([`006a089`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/006a0894b85cba3b2773737ed6fe3e92c81cdee0))
|
28
|
+
|
29
|
+
* fix(BECFigure): removed duplicated user access for plot ([`954c576`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/954c576131f7deac669ddf9f51eeb1d41b6f92b7))
|
30
|
+
|
31
|
+
* fix(bec_connector): field validator should be a classmethod ([`867720a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/867720a897b6713bd0df9af71ffdd11a6a380f7d))
|
32
|
+
|
33
|
+
### Refactor
|
34
|
+
|
35
|
+
* refactor: minor cleanup ([`3adf6cf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3adf6cfd586355c8b8ce7fdc9722f868e22287c5))
|
36
|
+
|
37
|
+
* refactor: disabled pylint for auto-gen client ([`b15816c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b15816ca9fd3e4ae87cca5fcfe029b4dfca570ca))
|
38
|
+
|
39
|
+
* refactor(isort): added bec_widgets as known first party package ([`9c5a471`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9c5a471234ed2928e4527b079436db2a807c5f6f))
|
40
|
+
|
41
|
+
* refactor(dock): parent_dock_area changed to orig_area (native for pyqtgraph) ([`2b40602`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2b40602bdc593ece0447ec926c2100414bd5cf67))
|
42
|
+
|
43
|
+
### Test
|
44
|
+
|
45
|
+
* test: added missing pylint statement to header ([`f662985`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f6629852ebc2b4ee239fa560cc310a5ae2627cf7))
|
46
|
+
|
47
|
+
|
5
48
|
## v0.59.1 (2024-06-07)
|
6
49
|
|
7
50
|
### Fix
|
@@ -108,12 +151,6 @@
|
|
108
151
|
|
109
152
|
* docs(bar): docs updated ([`4be0d14`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4be0d14b7445c2322c2aef86257db168a841265c))
|
110
153
|
|
111
|
-
* docs: fixed syntax of add_widget ([`a951ebf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a951ebf1be6c086d094aa8abef5e0dfd1b3b8558))
|
112
|
-
|
113
|
-
* docs: added auto update; closes #206 ([`32da803`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/32da803df9f7259842c43e85ba9a0ce29a266d06))
|
114
|
-
|
115
|
-
* docs: cleanup ([`07d60cf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/07d60cf7355d2edadb3c5ef8b86607d74b360455))
|
116
|
-
|
117
154
|
### Fix
|
118
155
|
|
119
156
|
* fix(ring): automatic updates are disabled uf user specify updates manually with .set_update; 'scan_progres' do not reset number of rings ([`e883dba`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e883dbad814dbcc0a19c341041c6d836e58a5918))
|
@@ -121,40 +158,3 @@
|
|
121
158
|
* fix(ring): enable_auto_updates(True) do not reset properties of already setup bars ([`a2abad3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a2abad344f4c0039516eb60a825afb6822c5b19a))
|
122
159
|
|
123
160
|
* fix(ring): set_min_max accepts floats ([`d44b1cf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d44b1cf8b107cf02deedd9154b77d01c7f9ed05d))
|
124
|
-
|
125
|
-
* fix(ring): set_update changed to Literals, no need to specify endpoint manually ([`c5b6499`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c5b6499e41eb1495bf260436ca3e1b036182c360))
|
126
|
-
|
127
|
-
|
128
|
-
## v0.57.2 (2024-06-06)
|
129
|
-
|
130
|
-
### Fix
|
131
|
-
|
132
|
-
* fix(test/e2e): autoupdate e2e rewritten ([`e1af5ca`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e1af5ca60f0616835f9f41d84412f29dc298c644))
|
133
|
-
|
134
|
-
* fix(test/e2e): spiral_progress_bar e2e tests rewritten to use config_dict ([`7fb31fc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7fb31fc4d762ff4ca839971b3092a084186f81b8))
|
135
|
-
|
136
|
-
* fix(test/e2e): dockarea and dock e2e tests changed to check asserts against config_dict ([`5c6ba65`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5c6ba65469863ea1e6fc5abdc742650e20eba9b9))
|
137
|
-
|
138
|
-
* fix: rpc_server_dock fixture now spawns the server process ([`cd9fc46`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cd9fc46ff8a947242c8c28adcd73d7de60b11c44))
|
139
|
-
|
140
|
-
* fix: accept scalars or numpy arrays of 1 element ([`2a88e17`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2a88e17b23436c55d25b7d3449e4af3a7689661c))
|
141
|
-
|
142
|
-
### Refactor
|
143
|
-
|
144
|
-
* refactor: move _get_output and _start_plot_process at the module level ([`69f4371`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/69f4371007c66aee6b7521a6803054025adf8c92))
|
145
|
-
|
146
|
-
|
147
|
-
## v0.57.1 (2024-06-06)
|
148
|
-
|
149
|
-
### Documentation
|
150
|
-
|
151
|
-
* docs: docs refactored from add_widget_bec to add_widget ([`c3f4845`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c3f4845b4f95005ff737fed5542600b0b9a9cc2b))
|
152
|
-
|
153
|
-
### Fix
|
154
|
-
|
155
|
-
* fix: tests references to add_widget_bec refactored ([`f51b25f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f51b25f0af4ab8b0a75ee48a40bfbb079c16e9d1))
|
156
|
-
|
157
|
-
* fix(dock): add_widget and add_widget_bec consolidated ([`8ae323f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8ae323f5c3c0d9d0f202d31d5e8374a272a26be2))
|
158
|
-
|
159
|
-
|
160
|
-
## v0.57.0 (2024-06-05)
|
PKG-INFO
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.3
|
2
2
|
Name: bec_widgets
|
3
|
-
Version: 0.
|
3
|
+
Version: 0.60.0
|
4
4
|
Summary: BEC Widgets
|
5
5
|
Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
|
6
6
|
Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets
|
@@ -9,9 +9,11 @@ Classifier: Development Status :: 3 - Alpha
|
|
9
9
|
Classifier: Programming Language :: Python :: 3
|
10
10
|
Classifier: Topic :: Scientific/Engineering
|
11
11
|
Requires-Python: >=3.10
|
12
|
+
Requires-Dist: bec-ipython-client
|
12
13
|
Requires-Dist: bec-lib
|
13
14
|
Requires-Dist: black
|
14
15
|
Requires-Dist: h5py
|
16
|
+
Requires-Dist: isort
|
15
17
|
Requires-Dist: jedi
|
16
18
|
Requires-Dist: pydantic
|
17
19
|
Requires-Dist: pyqtdarktheme
|
@@ -22,7 +24,6 @@ Requires-Dist: zmq
|
|
22
24
|
Provides-Extra: dev
|
23
25
|
Requires-Dist: coverage; extra == 'dev'
|
24
26
|
Requires-Dist: fakeredis; extra == 'dev'
|
25
|
-
Requires-Dist: isort; extra == 'dev'
|
26
27
|
Requires-Dist: pytest; extra == 'dev'
|
27
28
|
Requires-Dist: pytest-qt; extra == 'dev'
|
28
29
|
Requires-Dist: pytest-random-order; extra == 'dev'
|
bec_widgets/cli/__init__.py
CHANGED
@@ -1 +1 @@
|
|
1
|
-
from .client import
|
1
|
+
from .client import *
|