diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index a047d48..8eac1d9 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -1,6 +1,8 @@ name: pytest -on: [push, pull_request] +on: + push: + pull_request: jobs: build: @@ -8,11 +10,11 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Set up Python ${{matrix.python-version}} at ${{matrix.os}} uses: actions/setup-python@v3 @@ -23,14 +25,14 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - mkdir log/ + mkdir -p log/ - name: Test with pytest run: | pytest -c 'test/pytest.ini' - name: Save artifacts - uses: actions/upload-artifact@master + uses: actions/upload-artifact@v4 with: - name: test.log + name: test-${{ matrix.python-version }}.log path: log/test.log diff --git a/install.sh b/install.sh index 0e02751..3667f2e 100644 --- a/install.sh +++ b/install.sh @@ -113,7 +113,7 @@ tput cup 13 15 echo "[ 2/9] [##-------]" tput cup 15 5 echo "-> download GIT and other stuff.........." -apt-get -y install git cmake build-essential libusb-1.0 qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qt5-default libpulse-dev libx11-dev sox >> ${boswatch_install_path}/setup_log.txt 2>&1 +apt-get -y install git cmake build-essential libusb-1.0 qmake6 qt6-base-dev libpulse-dev libx11-dev sox >> ${boswatch_install_path}/setup_log.txt 2>&1 exitcodefunction $? download stuff tput cup 13 15 @@ -166,7 +166,7 @@ tput cup 15 5 echo "-> compile multimon-ng................." mkdir -p build cd build -qmake -qt=qt5 ../multimon-ng.pro >> ${boswatch_install_path}/setup_log.txt 2>&1 +qmake6 ../multimon-ng.pro >> ${boswatch_install_path}/setup_log.txt 2>&1 exitcodefunction $? qmake multimonNG make >> ${boswatch_install_path}/setup_log.txt 2>&1 diff --git a/requirements.txt b/requirements.txt index 0cca07d..8316ed1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ mkdocs # for develope only pytest pytest-cov -flake8==4.0.1 +flake8==6.1.0 pytest-flake8 pytest-flakes pytest-randomly