From f5d9e87db8d294067e4b368bb78fa426f1b18518 Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Sun, 31 Mar 2024 12:56:37 +1030 Subject: [PATCH] Remove ruamel.yaml dependency --- README.md | 22 +++++++++++++++------- horusgui/config.py | 1 - requirements.txt | 1 - 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 4a456d5..83ffb9c 100755 --- a/README.md +++ b/README.md @@ -66,8 +66,6 @@ $ cd horus-gui ### (Optional) Create a Virtual Environment -**Warning - Python 3.10 will not work until a known compatability issue with pyaudio has been fixed. Use Python 3.9.** - Create a virtual environment and install dependencies. ```console $ python3 -m venv venv @@ -83,9 +81,19 @@ $ pip install -r requirements.txt ``` NOTE: Under linux based distros, you may also need to install `python3-distutils` and `python-setuptools`. If you get errors relating to pyaudio when trying to install into a venv, make sure that portaudio is installed (`libportaudio-dev` or `portaudio19-dev` under Linux distros, or `portaudio` under Macports), and then install pyaudio pointing to the portaudio lib by running: + +On Linux: ``` -(Linux) $ pip install --global-option='build_ext' --global-option='-I/usr/include' --global-option='-L/usr/lib' pyaudio -(OSX) $ pip install --global-option='build_ext' --global-option='-I/opt/local/include' --global-option='-L/opt/local/lib' pyaudio +$ export CFLAGS="-I/usr/include" +$ export LDFLAGS="-L/usr/lib" +(venv) $ pip install pyaudio +``` + +On OSX using Macports: +``` +$ export CFLAGS="-I/opt/local/include" +$ export LDFLAGS="-L/opt/local/lib" +(venv) $ pip install pyaudio ``` You should then be able to re-run the install requirements command above. @@ -101,12 +109,12 @@ entry points so it can be used like a normal install. ### Run ```console -$ python -m horusgui.gui +$ (venv) python -m horusgui.gui ``` Or run the helper startup script: ```console -$ python horus-gui.py +$ (venv) python horus-gui.py ``` ### Updating @@ -127,4 +135,4 @@ $ . venv/bin/activate (if using a venv) $ pip install horusdemodlib --upgrade ``` -You should then be OK to run horusgui. Configuration settings will be reset when the version number of horus-gui is incremented, until I settle on on a configuration parameter set. +You should then be OK to run horusgui. diff --git a/horusgui/config.py b/horusgui/config.py index ab4b6b1..76163d2 100644 --- a/horusgui/config.py +++ b/horusgui/config.py @@ -8,7 +8,6 @@ import json import logging import os from pyqtgraph.Qt import QtCore -from ruamel.yaml import YAML from . import __version__ from .modem import populate_modem_settings from .audio import populate_sample_rates diff --git a/requirements.txt b/requirements.txt index 5e25f37..b039fc6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,5 @@ pyaudio crcmod PyQt6 pyqtgraph -ruamel.yaml requests horusdemodlib>=0.3.12