Commits · 375ca1e545fc4935717f9873b036ee3ce025fe15 · Benoit Rousselle / bliss

11 Feb, 2019 1 commit
- test: set xfail on test_get_plot · 375ca1e5
  Sebastien Petitdemange authored Feb 11, 2019
  
  375ca1e5
09 Feb, 2019 1 commit
- Merge branch 'python3_rebased' into 'master' · a55f53ea
  Sebastien Petitdemange authored Feb 09, 2019
```
Python 3 migration

See merge request !1088
```
  a55f53ea
08 Feb, 2019 38 commits
- Merge branch 'issue-589' into 'python3_rebased' · 505bd9fa
  Sebastien Petitdemange authored Feb 08, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Call all motor acq. masters 'axis'

See merge request !1093
```
  505bd9fa
- Merge branch 'flint_fixes' into 'issue-589' · 6cd5f79a
  Sebastien Petitdemange authored Feb 08, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Integrate qgevent within BLISS, Flint with qgevent

See merge request !1091
```
  6cd5f79a
- improved test · fee1e397
  Matias Guijarro authored Feb 07, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  fee1e397
- plot: increased timeout plot connection · 74fd503c
  Sebastien Petitdemange authored Feb 08, 2019
  
  74fd503c
- msgpack numpy version · 6cf3a57e
  Matias Guijarro authored Feb 07, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  6cf3a57e
- flint/conftest.py: removed unused finally · a79e1619
  Matias Guijarro authored Feb 05, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  a79e1619
- flint: delay call to main window .show() · bbb0a064
  Matias Guijarro authored Feb 05, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Workaround a qgevent(?) bug
```
  bbb0a064
- handel: fixed 'mock' import · 6bf0f7cf
  Matias Guijarro authored Feb 04, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  6bf0f7cf
- fix setup.py in case there is no Cython · 3b3a8690
  Matias Guijarro authored Feb 01, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  3b3a8690
- setup.py: specify versions for pytest, pytest-cov · b53ecbea
  Matias Guijarro authored Jan 31, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  b53ecbea
- flint: use of qgevent to run gevent + Qt loop · 51a77617
  Matias Guijarro authored Jan 30, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  51a77617
- qgevent: moved code to bliss/flint · e4334ec3
  Matias Guijarro authored Feb 01, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Extension renamed to 'flint'
```
  e4334ec3
- qwindowsystem.cpp produced by Cython · 1da3de02
  Matias Guijarro authored Jan 31, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
# Conflicts:
#	extensions/qgevent/.gitignore
```
  1da3de02
- timer: when sending notification to object, it could well be alive in PyQt but destroyed in Qt · d8cdf806
  Matias Guijarro authored Jan 31, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
So let's ignore a failed postEvent
```
  d8cdf806
- timer: prevent negative time in sleep call · b026ea49
  Matias Guijarro authored Jan 30, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  b026ea49
- unregisterTimer: never say unregistering fails · edbe7801
  Matias Guijarro authored Jan 30, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Qt does not like it at all

# Conflicts:
#	extensions/qgevent/test_qgevent.py
```
  edbe7801
- Refactoring of qgevent code · 8cd0abe2
  Vincent Michel authored Aug 23, 2018 and Sebastien Petitdemange committed Feb 08, 2019
  
  8cd0abe2
- 1st commit of Qt/gevent extension to be able to run Qt loop with gevent · abe02cd2
  Sebastien Petitdemange authored Aug 22, 2018
  
  abe02cd2
- flint: plot1d: do not use an extra dictionary to get icons from rows in axes list · 34602b92
  Matias Guijarro authored Jan 30, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
The weakref was causing problems sometimes, when Python object is destroyed
but still icon is needed by Qt.
Added check for axes with no legend yet (no icon - if not selected to
plot, for example).
```
  34602b92
- plot: attach_flint: timeout has to be specified in seconds, not milliseconds · fa79db2f
  Matias Guijarro authored Jan 30, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Raise an error if we cannot retrieve RPC server address
```
  fa79db2f
- Merge branch '593-rpc-infinite-loop-if-not-picklable' into 'python3_rebased_seb' · 7c2cb843
  Sebastien Petitdemange authored Feb 08, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Resolve "rpc infinite loop if not picklable"

See merge request !1094
```
  7c2cb843
- adapted tests · ddb52ed0
  Matias Guijarro authored Feb 07, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  ddb52ed0
- plot: check_flint: fixed python 3 bytes vs str bug · 0432ecf2
  Matias Guijarro authored Jan 30, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  0432ecf2
- Merge branch 'wago_gain' into 'python3_rebased' · 77792365
  Matias Guijarro authored Feb 07, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Wago gains handling improved

See merge request !1086
```
  77792365
- rpc: fixed infinite recursion if not picklable · 55f13fa6
  Sebastien Petitdemange authored Feb 08, 2019
  
  55f13fa6
- motor_group: generate name with uuid · 17ee7607
  Matias Guijarro authored Feb 05, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  17ee7607
- attach_flint: update FLINT dict when attaching to Flint · e6f328c2
  Matias Guijarro authored Jan 30, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  e6f328c2
- scanning: set name of MotorMaster acquisition masters to 'axis' · 333dea75
  Matias Guijarro authored Feb 05, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Put motor group under 'axis' node in redis and for Flint
```
  333dea75
- Merge branch 'energy_wl' into 'python3_rebased' · d88ac502
  Sebastien Petitdemange authored Feb 07, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
EnergyWavelength

See merge request !1081
```
  d88ac502
- Add gain handling for gains > 3. Cleanup and some docstrings. · 57eacd75
  Antonia Beteva authored Feb 05, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  57eacd75
- Merge branch 'add_conda_activate_to_doc' into 'python3_rebased' · c1c40a22
  Matias Guijarro authored Feb 06, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
installation doc: activate conda env before running pip install

See merge request !1087
```
  c1c40a22
- EnergyWavelength · 518df458
  Antonia Beteva authored Feb 07, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  518df458
- Merge branch 'patch-2' into 'python3_rebased' · 30eaee03
  Matias Guijarro authored Feb 06, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Update .gitlab-ci.yml - black changed --fast to --safe to reinforce the sanity checks.

See merge request !1083
```
  30eaee03
- doc: activate conda env before running pip install · 2d263e96
  Linus Pithan authored Feb 06, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  2d263e96
- Update .gitlab-ci.yml - black changed --fast to --safe to reinforce the sanity checks. · 7373079e
  Antonia Beteva authored Feb 04, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  7373079e
- Merge branch 'patch-1' into 'python3_rebased' · a55d1313
  Matias Guijarro authored Feb 06, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Update config_wago.md

See merge request !1082
```
  a55d1313
- Merge branch '570-oxford-800-temperature-controller' into 'python3_rebased' · 80fb8636
  Matias Guijarro authored Feb 06, 2019 and Sebastien Petitdemange committed Feb 08, 2019
```
Resolve "Oxford 800 temperature controller"

See merge request !1079
```
  80fb8636
- Update config_wago.md · 411dcffa
  Antonia Beteva authored Feb 04, 2019 and Sebastien Petitdemange committed Feb 08, 2019
  
  411dcffa