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

chore: updates to build on latest python/linux

Author: ashhhleyyy

.github/workflows/build.yaml

@@ -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,15 +46,17 @@ 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
     - name: Set up Python ${{ matrix.python-version }}
       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,15 +84,17 @@ 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
     - name: Set up Python ${{ matrix.python-version }}
       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/

.github/workflows/test.yaml

@@ -10,38 +10,33 @@ 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
     - name: Set up Python ${{ matrix.python-version }}
       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: |

build/build-exe.py

@@ -6,9 +6,9 @@
 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"]

build/build-linux.sh

@@ -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
 

build/build-macos.sh

@@ -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

build/build-windows.bat

@@ -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
 

build/requirements-dev.txt

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

build/requirements-linux.txt

@@ -64,8 +64,7 @@ def getAudioOutputs(cls) -> Tuple[List[Dict]]:
     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