From 5840c115ec791fb3c71ea4b570fd4b15c073e2f1 Mon Sep 17 00:00:00 2001 From: Dan Lawrence Date: Sun, 30 Oct 2022 14:12:25 +0000 Subject: [PATCH 1/6] Upgrade latest to 3.11 --- .github/workflows/run_tests_ci.yml | 46 ++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_tests_ci.yml b/.github/workflows/run_tests_ci.yml index 53bfbc82..ea3e614f 100644 --- a/.github/workflows/run_tests_ci.yml +++ b/.github/workflows/run_tests_ci.yml @@ -2,7 +2,7 @@ name: Run Tests on: [push] jobs: - build-on-linux: + build-on-linux-old: runs-on: ubuntu-latest strategy: @@ -42,13 +42,53 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} #required + build-on-linux-new: + + runs-on: ubuntu-latest + strategy: + max-parallel: 4 + matrix: + python-version: [ '3.10', '3.11'] + pygame-version: [ '2.1.3.dev8' ] + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + pygame-version: ${{ matrix.pygame-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install stringify + python -m pip install python-i18n + python -m pip install pytest + python -m pip install pytest-benchmark + python -m pip install pytest-cov + python -m pip install codecov + python -m pip install -q pygame==${{ matrix.pygame-version }} + python -m pip install . -U + sudo apt-get install xvfb + sudo apt-get install xclip + sudo apt-get install xsel + - name: Test with pytest + env: + SDL_VIDEODRIVER: dummy + SDL_AUDIODRIVER: disk + run: | + xvfb-run pytest --cov-report=xml --cov=pygame_gui tests/ + - name: Upload to Code Cov + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} #required + build-on-windows: runs-on: windows-latest strategy: max-parallel: 4 matrix: - python-version: [ '3.10' ] + python-version: [ '3.11' ] pygame-version: [ '2.1.2' ] steps: - uses: actions/checkout@v1 @@ -85,7 +125,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.10' ] + python-version: [ '3.11' ] pygame-version: [ '2.1.2' ] steps: - uses: actions/checkout@v1 From da525114260f59f93c165b040f8ab1aea2ac65ac Mon Sep 17 00:00:00 2001 From: Dan Lawrence Date: Sun, 30 Oct 2022 14:14:27 +0000 Subject: [PATCH 2/6] fix windows and mac test runners --- .github/workflows/run_tests_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_tests_ci.yml b/.github/workflows/run_tests_ci.yml index ea3e614f..c94c9bf5 100644 --- a/.github/workflows/run_tests_ci.yml +++ b/.github/workflows/run_tests_ci.yml @@ -89,7 +89,7 @@ jobs: max-parallel: 4 matrix: python-version: [ '3.11' ] - pygame-version: [ '2.1.2' ] + pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 - name: Set up Python ${{ matrix.python-version }} @@ -126,7 +126,7 @@ jobs: max-parallel: 4 matrix: python-version: [ '3.11' ] - pygame-version: [ '2.1.2' ] + pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 - name: Set up Python ${{ matrix.python-version }} From 003efc77a2c50c29c91d0bbebdd223475c5d433a Mon Sep 17 00:00:00 2001 From: Dan Lawrence Date: Sun, 30 Oct 2022 14:20:53 +0000 Subject: [PATCH 3/6] Try adding micro release number to python version --- .github/workflows/run_tests_ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_tests_ci.yml b/.github/workflows/run_tests_ci.yml index c94c9bf5..751a3a42 100644 --- a/.github/workflows/run_tests_ci.yml +++ b/.github/workflows/run_tests_ci.yml @@ -48,7 +48,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.10', '3.11'] + python-version: [ '3.10', '3.11.0'] pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 @@ -88,7 +88,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.11' ] + python-version: [ '3.11.0' ] pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 @@ -125,7 +125,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.11' ] + python-version: [ '3.11.0' ] pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 From 4daf68a510bfe658a03056c7ce78a8fce7482bc3 Mon Sep 17 00:00:00 2001 From: Dan Lawrence Date: Sun, 30 Oct 2022 14:24:12 +0000 Subject: [PATCH 4/6] Try adding dev tag to 3.11 python version --- .github/workflows/run_tests_ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_tests_ci.yml b/.github/workflows/run_tests_ci.yml index 751a3a42..9523c8a3 100644 --- a/.github/workflows/run_tests_ci.yml +++ b/.github/workflows/run_tests_ci.yml @@ -48,7 +48,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.10', '3.11.0'] + python-version: [ '3.10', '3.11-dev'] pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 @@ -88,7 +88,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.11.0' ] + python-version: [ '3.11-dev' ] pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 @@ -125,7 +125,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.11.0' ] + python-version: [ '3.11-dev' ] pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 From c19ce2e3ee38d32c6e55afeeaa9c84389bdd7545 Mon Sep 17 00:00:00 2001 From: Dan Lawrence Date: Sun, 30 Oct 2022 14:30:03 +0000 Subject: [PATCH 5/6] No 3.11 on runners yet, try again next week --- .github/workflows/run_tests_ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_tests_ci.yml b/.github/workflows/run_tests_ci.yml index 9523c8a3..04047230 100644 --- a/.github/workflows/run_tests_ci.yml +++ b/.github/workflows/run_tests_ci.yml @@ -48,7 +48,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.10', '3.11-dev'] + python-version: [ '3.10'] pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 @@ -88,7 +88,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.11-dev' ] + python-version: [ '3.10' ] pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 @@ -125,7 +125,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ '3.11-dev' ] + python-version: [ '3.10' ] pygame-version: [ '2.1.3.dev8' ] steps: - uses: actions/checkout@v1 From 78e94457588c480fa8566b419c0578581d43904b Mon Sep 17 00:00:00 2001 From: Dan Lawrence Date: Sun, 30 Oct 2022 14:33:21 +0000 Subject: [PATCH 6/6] downgrade mac to pygame 2.1.2 (no freetype wheel in dev8) --- .github/workflows/run_tests_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests_ci.yml b/.github/workflows/run_tests_ci.yml index 04047230..c8add37f 100644 --- a/.github/workflows/run_tests_ci.yml +++ b/.github/workflows/run_tests_ci.yml @@ -126,7 +126,7 @@ jobs: max-parallel: 4 matrix: python-version: [ '3.10' ] - pygame-version: [ '2.1.3.dev8' ] + pygame-version: [ '2.1.2' ] steps: - uses: actions/checkout@v1 - name: Set up Python ${{ matrix.python-version }}