From 5aabc612771d5bc0895e0f0378db95785f5d4a0f Mon Sep 17 00:00:00 2001 From: Michael Tinning Date: Fri, 31 Jan 2025 13:58:07 +0000 Subject: [PATCH 1/2] Remove pyqt5 requirement --- .circleci/config.yml | 2 +- setup.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 48a7965..c709e11 100644 --- a/.circleci/config.yml +++ b/.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: diff --git a/setup.py b/setup.py index a40f8f5..d6a1a00 100644 --- a/setup.py +++ b/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, From 3b0b7be93cbc3e7a82a1f2897e98d9fdb0d38c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Ponce?= Date: Mon, 10 Feb 2025 10:33:12 -0600 Subject: [PATCH 2/2] remove pyqt5 dependenciy on Sift imports --- pyqttoolkit/data/__init__.py | 1 + pyqttoolkit/data/message.py | 29 +++++++++++++++++++++++++++ pyqttoolkit/exceptions/__init__.py | 18 +++++++++++++++++ pyqttoolkit/services/message_board.py | 14 +------------ pyqttoolkit/services/task_runner.py | 3 +-- 5 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 pyqttoolkit/data/message.py create mode 100644 pyqttoolkit/exceptions/__init__.py diff --git a/pyqttoolkit/data/__init__.py b/pyqttoolkit/data/__init__.py index ed667ef..650af0c 100644 --- a/pyqttoolkit/data/__init__.py +++ b/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 diff --git a/pyqttoolkit/data/message.py b/pyqttoolkit/data/message.py new file mode 100644 index 0000000..45b05b3 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/pyqttoolkit/exceptions/__init__.py b/pyqttoolkit/exceptions/__init__.py new file mode 100644 index 0000000..2029864 --- /dev/null +++ b/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 diff --git a/pyqttoolkit/services/message_board.py b/pyqttoolkit/services/message_board.py index e0a10ef..16f2539 100644 --- a/pyqttoolkit/services/message_board.py +++ b/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): diff --git a/pyqttoolkit/services/task_runner.py b/pyqttoolkit/services/task_runner.py index 95fcf1a..f089cdb 100644 --- a/pyqttoolkit/services/task_runner.py +++ b/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):