Merge pull request #63 from BitBloomTech/feature/remove-pyqt5-requirement

Remove pyqt5 requirement

Author: mtinning

.circleci/config.yml

@@ -40,7 +40,7 @@ jobs:
             python3 -m venv .venv
             . .venv/bin/activate
             pip install --upgrade pip
-            pip install .[test,publish]
+            pip install .[ui,test,publish]
 
       # run tests!
       - run:

pyqttoolkit/data/__init__.py

@@ -18,3 +18,4 @@
 from .interval import calculate_interval
 from .bits import get_next_available_bit
 from .names import get_next_available_name
+from .message import MessageType, MessageResponse

pyqttoolkit/data/message.py

@@ -0,0 +1,29 @@
+# pyqttoolkit
+# Copyright (C) 2018-2019, Simmovation Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+from enum import Enum, IntEnum
+
+class MessageType(Enum):
+    validation_error = 0
+    confirmation = 1
+    application_exception = 2
+
+class MessageResponse(IntEnum):
+    ok = 1
+    cancel = 2
+    save = 4
+    discard = 8
+    ignore = 16

pyqttoolkit/exceptions/__init__.py

@@ -0,0 +1,18 @@
+# pyqttoolkit
+# Copyright (C) 2018-2019, Simmovation Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+class TaskCancelled(Exception):
+    pass

pyqttoolkit/services/message_board.py

@@ -14,25 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-from enum import Enum, IntEnum
 
 #pylint: disable=no-name-in-module
 from PyQt5.QtCore import QObject, pyqtSignal, Qt
 #pylint: enable=no-name-in-module
 
 from ..properties import AutoProperty
-
-class MessageType(Enum):
-    validation_error = 0
-    confirmation = 1
-    application_exception = 2
-
-class MessageResponse(IntEnum):
-    ok = 1
-    cancel = 2
-    save = 4
-    discard = 8
-    ignore = 16
+from ..data import MessageType, MessageResponse
 
 class MessageArgs:
     def __init__(self, message_type, message, checkbox_message, response_type, text_format):

pyqttoolkit/services/task_runner.py

@@ -26,6 +26,7 @@
 from concurrent.futures import ThreadPoolExecutor
 
 from ..properties import AutoProperty
+from ..exceptions import TaskCancelled
 
 LOGGER = logging.getLogger(__name__)
 
@@ -71,8 +72,6 @@ def cancel(self):
         if self._cancellable:
             self.cancelled.emit()
 
-class TaskCancelled(Exception):
-    pass
 
 class Worker:
     def __init__(self, task_runner, f, args, busy_args, on_completed, on_cancelled, on_error, error_description):

setup.py

@@ -11,7 +11,6 @@
     README_CONTENTS = fp.read()
 
 install_requires = [
-    'pyQt5',
     'matplotlib',
     'jinja2',
     'pandas',
@@ -30,7 +29,8 @@
 
 extras_require = {
     'test': tests_require,
-    'publish': ['twine']
+    'publish': ['twine'],
+    'ui': ['pyqt5']
 }
 
 setup(
@@ -42,9 +42,9 @@
     cmdclass=versioneer.get_cmdclass(),
     license='GPLv3',
     version=versioneer.get_version(),
-    author='Simmovation Ltd',
-    author_email='info@simmovation.tech',
-    url='https://github.com/Simmovation/pyqttoolkit',
+    author='Bitbloom Ltd',
+    author_email='info@bitbloom.tech',
+    url='https://github.com/BitBloomTech/pyqttoolkit',
     platforms='any',
     description='A toolkit for PyQt 5',
     long_description=README_CONTENTS,