Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests via adding next(cg) #28

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ install:
- source activate testenv
- 'pip install https://github.com/NSLS-II/portable-mds/zipball/master#egg=portable_mds'
- 'pip install https://github.com/NSLS-II/portable-fs/zipball/master#egg=portable_fs'
'pip install https://github.com/NSLS-II/bluesky/zipball/master#egg=bluesky'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need to remove bluesky fro the conda install section too

- python setup.py install
# Need to clean the python build directory (and other cruft) or pytest is
# going to find the build directory and get confused why there are two sets
Expand Down
2 changes: 2 additions & 0 deletions xpdsim/dets.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ def trigger_read(self):
rv = {field: {'value': func(), 'timestamp': ttime.time()}
for field, func in self._dark_fields.items()
if field in self.read_attrs}
print('======Triggered shutter======')
print(rv)
else:
rv = super().trigger_read()
read_v = dict(rv)
Expand Down