Skip to content

Commit

Permalink
Bumped PySide6-QtAds and PySide6 dependency versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
mliberty1 committed Jul 19, 2023
1 parent 2e5ab5c commit 1802281
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ This file contains the list of changes made to pyjoulescope_ui.
* Bumped dependency versions:
* joulescope 1.1.7 -> 1.1.8
* pyjoulescope_driver 1.3.16 -> 1.3.17
* PySide6 6.5.0 -> 6.5.1.1
* PySide6-QtAds 4.0.3 -> 4.1.0


## 1.0.23
Expand Down
5 changes: 3 additions & 2 deletions joulescope_ui/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
_software_update = None
_config_clear = None
_log = logging.getLogger(__name__)

_UI_WINDOW_TITLE = 'Joulescope'
_JLS_WINDOW_TITLE = 'Joulescope file viewer'


_SETTINGS = {
Expand Down Expand Up @@ -179,7 +180,7 @@ def __init__(self, filename=None, is_config_load=False):
self._log = logging.getLogger(__name__)
self._filename = filename
super(MainWindow, self).__init__()
self.setWindowTitle('Joulescope')
self.setWindowTitle(_UI_WINDOW_TITLE if filename is None else _JLS_WINDOW_TITLE)
self._dialog = None
self._pubsub = pubsub_singleton
self._pubsub_process_count_last = self._pubsub.process_count
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
[build-system]
# Minimum requirements for the build system to execute.
requires = [
"PySide6>=6.5.0",
"PySide6>=6.5.1.1",
"setuptools>=42",
"wheel",
]
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ pyopengl
pyperclip>=1.7.0
pywin32; sys_platform == 'win32' # python {path_to_python}\scripts\pywin32_postinstall.py -install
pyqtgraph>=0.13.2
PySide6>=6.5.0,<7.0.0
PySide6-QtAds>=4.0.3,<5.0.0
PySide6>=6.5.1.1,<7.0.0
PySide6-QtAds>=4.1.0,<5.0.0
python-dateutil>=2.7.3
PyInstaller>=5.0.1
QtPy
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ def run(self):
'pyperclip>=1.7.0',
"pywin32>=223; platform_system == 'Windows'",
'pyqtgraph>=0.13.2',
'PySide6>=6.5.0,<7.0.0',
'PySide6-QtAds>=4.0.3,<5.0.0',
'PySide6>=6.5.1.1,<7.0.0',
'PySide6-QtAds>=4.1.0,<5.0.0',
'python-dateutil>=2.7.3',
'QtPy',
# 'pyqtgraph @ https://github.com/jetperch/pyqtgraph/tarball/557e867b377b223589c0c8ffd0799c547965fb46#egg=pyqtgraph-0.11.0.dev1',
Expand Down

0 comments on commit 1802281

Please sign in to comment.