Skip to content

Commit

Permalink
0.11.2
Browse files Browse the repository at this point in the history
Merge pull request #63 from hephy-dd/devel-0.11.x
  • Loading branch information
arnobaer authored Oct 8, 2020
2 parents 89d1c99 + 462e563 commit 3788e1b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ jobs:
flake8 comet --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
pytest --ignore=tests/test_application.py --ignore=tests/test_driver.py --ignore=tests/test_process.py
pytest --ignore=tests/test_application.py --ignore=tests/test_driver.py
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ recursive-include docs/ *.md

include comet/assets/icons/*.ico
include comet/assets/icons/*.svg
include comet/widgets/*.ui
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ See the documentation on https://hephy-dd.github.io/comet/
Install from GitHub using pip

```bash
pip install git+https://github.com/hephy-dd/comet.git@0.11.1
pip install git+https://github.com/hephy-dd/comet.git@0.11.2
```

## Quick start
Expand Down
2 changes: 1 addition & 1 deletion comet/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.11.1'
__version__ = '0.11.2'
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ graphical user interface. It runs on both Linux and Windows operating systems.
Install from GitHub using pip

```bash
pip install git+https://github.com/hephy-dd/comet.git@0.11.1
pip install git+https://github.com/hephy-dd/comet.git@0.11.2
```

### Quick start
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='comet',
version='0.11.1',
version='0.11.2',
author="Bernhard Arnold",
author_email="bernhard.arnold@oeaw.ac.at",
description="Control and Measurement Toolkit",
Expand All @@ -20,8 +20,6 @@
'comet': [
'assets/icons/*.ico',
'assets/icons/*.svg',
'assets/icons/*.ico',
'widgets/*.ui',
],
},
test_suite='tests',
Expand Down
2 changes: 2 additions & 0 deletions tests/test_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ def run(process):
p.start()
app.qt.processEvents()
p.stop()
app.qt.processEvents()
p.join()
app.qt.processEvents()
self.assertEqual(p.get('value'), True)
self.assertEqual(p.get('started'), True)
self.assertEqual(p.get('finished'), True)
Expand Down

0 comments on commit 3788e1b

Please sign in to comment.