From b0bb51cf2aea38be0b767ed8847f3c1e758d440e Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Sun, 31 Mar 2024 14:10:13 +1030 Subject: [PATCH] Revert back to PyQt5 --- README.md | 8 ++++++++ horusgui/__init__.py | 2 +- horusgui/gui.py | 2 +- horusgui/widgets.py | 2 +- pyproject.toml | 7 +++---- requirements.txt | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 83ffb9c..27dbe88 100755 --- a/README.md +++ b/README.md @@ -95,6 +95,14 @@ $ export CFLAGS="-I/opt/local/include" $ export LDFLAGS="-L/opt/local/lib" (venv) $ pip install pyaudio ``` + +On OSX using Homebrew +``` +$ export CFLAGS="-I/opt/homebrew/include" +$ export LDFLAGS="-L/opt/homebrew/lib" +(venv) $ pip install pyaudio +``` + You should then be able to re-run the install requirements command above. ### Install Package diff --git a/horusgui/__init__.py b/horusgui/__init__.py index 6a9beea..39774cf 100755 --- a/horusgui/__init__.py +++ b/horusgui/__init__.py @@ -1 +1 @@ -__version__ = "0.4.0" +__version__ = "0.3.16" diff --git a/horusgui/gui.py b/horusgui/gui.py index 274e455..9a6e397 100644 --- a/horusgui/gui.py +++ b/horusgui/gui.py @@ -23,7 +23,7 @@ import pyqtgraph as pg import numpy as np from queue import Queue #from pyqtgraph.Qt import QtCore, QtGui, QtWidgets -from PyQt6 import QtWidgets, QtGui +from PyQt5 import QtWidgets, QtGui from pyqtgraph.dockarea import * from threading import Thread diff --git a/horusgui/widgets.py b/horusgui/widgets.py index b8fc15a..781d1a6 100644 --- a/horusgui/widgets.py +++ b/horusgui/widgets.py @@ -1,5 +1,5 @@ # Useful widgets -from PyQt6 import QtWidgets +from PyQt5 import QtWidgets # Useful class for adding horizontal lines. class QHLine(QtWidgets.QFrame): diff --git a/pyproject.toml b/pyproject.toml index c6a3d10..d983224 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "horusgui" -version = "0.4.0" +version = "0.3.16" description = "" authors = ["Mark Jessop "] @@ -8,10 +8,9 @@ authors = ["Mark Jessop "] python = "^3.6" requests = "^2.24.0" crcmod = "^1.7" -PyQt6 = "^6.6.0" -pyqtgraph = "^0.13.0" +PyQt5 = "^5.15.0" +pyqtgraph = "^0.12.3" pyaudio = "^0.2.11" -"ruamel.yaml" = "^0.16.10" horusdemodlib = "^0.3.13" [tool.poetry.dev-dependencies] diff --git a/requirements.txt b/requirements.txt index b039fc6..024b07a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ numpy pyaudio crcmod -PyQt6 +PyQt5 pyqtgraph requests horusdemodlib>=0.3.12