ash/BAPSicle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #57 from UniversityRadioYork/ash-linux-updates

Browse source 
chore: updates to build on latest python/linux
This commit is contained in:
Ashhhleyyy 2024-04-03 15:14:08 +01:00 committed by GitHub
commit 00c3cf9322
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 4947 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
.github/workflows/build.yaml vendored
View file

@ -2,42 +2,42 @@ name: Package
on: [push]
jobs:
build-macos:
# build-macos:
runs-on: macos-latest
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
python-version: ['3.9']
node-version: ['14']
# runs-on: macos-latest
# timeout-minutes: 15
# strategy:
# fail-fast: false
# matrix:
# python-version: ['3.9', '3.11']
# node-version: ['20']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@v2
- name: Set up Node ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: Build .app
run: |
npm run presenter-make
build/build-macos.sh
zip -r build/output/BAPSicle.zip build/output/BAPSicle.app
- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF##*/})"
id: extract_branch
- name: Archive Build
uses: actions/upload-artifact@v2
with:
name: BAPSicle-${{ steps.extract_branch.outputs.branch }}-${{github.sha}}-MacOS
path: |
build/output/BAPSicle.zip
# steps:
# - uses: actions/checkout@v2
# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v2
# with:
# python-version: ${{ matrix.python-version }}
# - uses: actions/checkout@v2
# - name: Set up Node ${{ matrix.node-version }}
# uses: actions/setup-node@v2
# with:
# node-version: ${{ matrix.node-version }}
# - name: Build .app
# run: |
# npm run presenter-make
# build/build-macos.sh
# zip -r build/output/BAPSicle.zip build/output/BAPSicle.app
# - name: Extract branch name
# shell: bash
# run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF##*/})"
# id: extract_branch
# - name: Archive Build
# uses: actions/upload-artifact@v2
# with:
# name: BAPSicle-${{ steps.extract_branch.outputs.branch }}-${{github.sha}}-MacOS
# path: |
# build/output/BAPSicle.zip
build-ubuntu:
@ -46,8 +46,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8','3.9']
node-version: ['14']
python-version: ['3.8','3.9', '3.11']
node-version: ['20']
steps:
- uses: actions/checkout@v2
@ -55,6 +55,8 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Setup poetry
uses: Gr1N/setup-poetry@v8
- uses: actions/checkout@v2
- name: Set up Node ${{ matrix.node-version }}
uses: actions/setup-node@v2
@ -69,9 +71,9 @@ jobs:
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF##*/})"
id: extract_branch
- name: Archive Build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: BAPSicle-${{ steps.extract_branch.outputs.branch }}-${{github.sha}}-Ubuntu
name: BAPSicle-${{ steps.extract_branch.outputs.branch }}-${{github.sha}}-Ubuntu-python${{matrix.python-version}}-node${{matrix.node-version}}
path: |
build/output/BAPSicle
@ -82,8 +84,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.9']
node-version: ['14']
python-version: ['3.9', '3.11']
node-version: ['20']
steps:
- uses: actions/checkout@v2
@ -91,6 +93,8 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Setup poetry
uses: Gr1N/setup-poetry@v8
- uses: actions/checkout@v2
- name: Set up Node ${{ matrix.node-version }}
uses: actions/setup-node@v2
@ -105,9 +109,9 @@ jobs:
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF##*/})"
id: extract_branch
- name: Archive Build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: BAPSicle-${{ steps.extract_branch.outputs.branch }}-${{github.sha}}-Windows
name: BAPSicle-${{ steps.extract_branch.outputs.branch }}-${{github.sha}}-Windows-python${{matrix.python-version}}-node${{matrix.node-version}}
path: |
build/output/BAPSicle.exe
install/

23
.github/workflows/test.yaml vendored
View file

@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9]
python-version: [3.8, 3.9, 3.11]
steps:
- uses: actions/checkout@v2
@ -18,30 +18,25 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Setup poetry
uses: Gr1N/setup-poetry@v8
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
pip install -r build/requirements-dev.txt
pip install -r build/requirements.txt
pip install -r build/requirements-macos.txt
- name: Install bapsicle as module
run: |
pip install -e .
run: poetry install --with=dev
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
poetry run flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --ignore=E402,E226,E24,W50,W690 --max-complexity=25 --max-line-length=127 --statistics
poetry run flake8 . --count --ignore=E402,E226,E24,W50,W690 --max-complexity=25 --max-line-length=127 --statistics
- name: Test with unittest
if: ${{ always() }}
timeout-minutes: 10
run: |
python -m sounddevice
python -m unittest
poetry run python -m sounddevice
poetry run python -m unittest
- name: Archive test logs
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Logs - Python ${{ matrix.python-version }}
path: |

4
build/build-exe.py
View file

@ -6,9 +6,9 @@ config = json.loads(file.read())
file.close()
if isLinux():
cmd_str = "python3 -m PyInstaller "
cmd_str = "poetry run python3 -m PyInstaller "
else:
cmd_str = "pyinstaller "
cmd_str = "poetry run pyinstaller "
json_dests = ["icon_file", "clean_build"]
pyi_dests = ["icon", "clean"]

12
build/build-linux.sh
View file

@ -11,19 +11,13 @@ echo "BRANCH: str = \"$build_branch\"" >> ../build.py
sudo apt install libportaudio2
sudo apt install python3-pip python3-venv ffmpeg
python3 -m venv ../venv
source ../venv/bin/activate
poetry install
pip3 install wheel
pip3 install -r requirements.txt
pip3 install -r requirements-linux.txt
pip3 install -e ../
python3 ./generate-build-exe-config.py
poetry run python3 ./generate-build-exe-config.py
chmod +x output/BAPSicle
python3 ./build-exe.py
poetry run python3 ./build-exe.py
bash ./build-exe-pyinstaller-command.sh

14
build/build-macos.sh
View file

@ -8,24 +8,18 @@ build_branch="$(git branch --show-current)"
echo "BUILD: str = \"$build_commit\"" > ../build.py
echo "BRANCH: str = \"$build_branch\"" >> ../build.py
python3 -m venv ../venv
source ../venv/bin/activate
poetry install
pip3 install wheel
pip3 install -r requirements.txt
pip3 install -r requirements-macos.txt
pip3 install -e ..\
poetry run python3 ./generate-build-exe-config.py
python3 ./generate-build-exe-config.py
python3 ./build-exe.py
poetry run python3 ./build-exe.py
bash ./build-exe-pyinstaller-command.sh
rm ./*.spec
cd ../
python3 build/generate-platypus-config.py
poetry run python3 build/generate-platypus-config.py
cd build
brew install platypus

16
build/build-windows.bat
View file

@ -10,24 +10,14 @@ SET build_branch=%%F
echo BUILD: str = "%build_commit%"> ..\build.py
echo BRANCH: str = "%build_branch%">> ..\build.py
if "%1" == "no-venv" goto skip-venv
py -m venv ..\venv
..\venv\Scripts\activate
:skip-venv
pip install wheel
pip install -r requirements.txt
pip install -r requirements-windows.txt
pip install -e ..\
poetry install
: Generate the json config in case you wanted to use the gui to regenerate the command below manually.
python generate-build-exe-config.py
poetry run python generate-build-exe-config.py
: auto-py-to-exe -c build-exe-config.json -o ../install
python build-exe.py
poetry run python build-exe.py
build-exe-pyinstaller-command.bat

4
build/requirements-dev.txt
View file

@ -1,4 +0,0 @@
wheel
flake8
black
autopep8

1
build/requirements-linux.txt
View file

@ -1 +0,0 @@
pyinstaller

1
build/requirements-macos.txt
View file

@ -1 +0,0 @@
pyinstaller

2
build/requirements-windows.txt
View file

@ -1,2 +0,0 @@
pywin32
auto-py-to-exe

17
build/requirements.txt
View file

@ -1,17 +0,0 @@
wheel
pygame==2.0.2
sanic==21.9.3
sanic-Cors==2.0.1
syncer==1.3.0
aiohttp==3.7.4
mutagen==1.45.1
sounddevice==0.4.2
setproctitle==1.2.2
pyttsx3==2.90
websockets==10.1
typing_extensions==3.10.0.0
pyserial==3.5
requests==2.26.0
Jinja2==3.0.1
pydub==0.25.1
psutil

2
dev/install-githook.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash
pip3 install autopep8
poetry install
cd "$(dirname "$0")"
cp "./pre-commit" "../.git/hooks/"

3
helpers/device_manager.py
View file

@ -64,8 +64,7 @@ class DeviceManager:
def getAudioDevices(cls) -> List[str]:
mixer.init(44100, -16, 2, 1024)
is_capture = 0 # zero to request playback devices, non-zero to request recording devices
num = sdl2.get_num_audio_devices(is_capture)
names = [str(sdl2.get_audio_device_name(i, is_capture), encoding="utf-8") for i in range(num)]
names = sdl2.audio.get_audio_device_names(is_capture)
mixer.quit()
return names

24
package-lock.json generated
View file

@ -1,13 +1,29 @@
{
"name": "bapsicle",
"version": "3.1.0",
"lockfileVersion": 1,
"lockfileVersion": 3,
"requires": true,
"dependencies": {
"yarn": {
"packages": {
"": {
"name": "bapsicle",
"version": "3.1.0",
"license": "ISC",
"dependencies": {
"yarn": "^1.22.15"
}
},
"node_modules/yarn": {
"version": "1.22.15",
"resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.15.tgz",
"integrity": "sha512-AzoEDxj256BOS/jqDXA3pjyhmi4FRBBUMgYoTHI4EIt2EhREkvH0soPVEtnD+DQIJfU5R9bKhcZ1H9l8zPWeoA=="
"integrity": "sha512-AzoEDxj256BOS/jqDXA3pjyhmi4FRBBUMgYoTHI4EIt2EhREkvH0soPVEtnD+DQIJfU5R9bKhcZ1H9l8zPWeoA==",
"hasInstallScript": true,
"bin": {
"yarn": "bin/yarn.js",
"yarnpkg": "bin/yarn.js"
},
"engines": {
"node": ">=4.0.0"
}
}
}
}

4813
poetry.lock generated Normal file
View file

File diff suppressed because one or more lines are too long

2
presenter

@ -1 +1 @@
Subproject commit 238da52d94f9a2e1f476e5c8e155e50dd8519cb7
Subproject commit 8b7f59cdc6ed80b525b2dff665308d808a526d97

42
pyproject.toml Normal file
View file

@ -0,0 +1,42 @@
[tool.poetry]
name = "bapsicle"
version = "3.1.0"
description = ""
authors = ["University Radio York"]
readme = "README.md"
packages = [{include = "__init__.py"}]
[tool.poetry.dependencies]
python = ">=3.8.1,<3.13"
wheel = "^0.43.0"
pygame = "^2.5.2"
sanic = "^21.9.3"
sanic-cors = "^2.0.1"
syncer = "^1.3.0"
aiohttp = "^3.7.4"
mutagen = "^1.45.1"
sounddevice = "^0.4.2"
setproctitle = "^1.2.2"
pyttsx3 = "^2.90"
websockets = "^10.1"
typing-extensions = "^4.10.0"
pyserial = "^3.5"
requests = "^2.26.0"
jinja2 = "^3.0.1"
pydub = "^0.25.1"
psutil = "^5.9.8"
[tool.poetry.group.dev.dependencies]
pyinstaller = [
{version = "^6.5.0", platform = "linux"},
{version = "^6.5.0", platform = "darwin"}
]
auto-py-to-exe = {version = "^2.43.3", platform = "win32"}
pywin32 = {version = "^306", platform = "win32"}
autopep8 = "^2.1.0"
flake8 = "^7.0.0"
black = "^24.3.0"
[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

4
websocket_server.py
View file

@ -92,7 +92,7 @@ class WebsocketServer:
channel = int(data["channel"])
self.sendCommand(channel, data)
await asyncio.wait([conn.send(message) for conn in self.baps_clients])
await asyncio.wait([asyncio.Task(conn.send(message)) for conn in self.baps_clients])
except websockets.exceptions.ConnectionClosedError as e:
self.logger.log.error(
@ -244,7 +244,7 @@ class WebsocketServer:
data = json.dumps(
{"command": command, "data": message, "channel": channel}
)
await asyncio.wait([conn.send(data) for conn in self.baps_clients])
await asyncio.wait([asyncio.Task(conn.send(data)) for conn in self.baps_clients])
except queue.Empty:
continue
except ValueError: