diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 8afb2ba..93a65dd 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -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 diff --git a/MANIFEST.in b/MANIFEST.in index f98c42f..c4df3c9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,4 +6,3 @@ recursive-include docs/ *.md include comet/assets/icons/*.ico include comet/assets/icons/*.svg -include comet/widgets/*.ui diff --git a/README.md b/README.md index c073117..4636f27 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/comet/version.py b/comet/version.py index ae4865c..2b3823f 100644 --- a/comet/version.py +++ b/comet/version.py @@ -1 +1 @@ -__version__ = '0.11.1' +__version__ = '0.11.2' diff --git a/docs/index.md b/docs/index.md index 951ea90..e8a2d97 100644 --- a/docs/index.md +++ b/docs/index.md @@ -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 diff --git a/setup.py b/setup.py index 181dbd3..b1fff72 100644 --- a/setup.py +++ b/setup.py @@ -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", @@ -20,8 +20,6 @@ 'comet': [ 'assets/icons/*.ico', 'assets/icons/*.svg', - 'assets/icons/*.ico', - 'widgets/*.ui', ], }, test_suite='tests', diff --git a/tests/test_process.py b/tests/test_process.py index b2f29d5..480ccb5 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -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)