Skip to content

Commit 7b83aa6

Browse files
itzpr3d4t0ritzpr3d4t0r
authored
Merge branch 'main' into line.scale()
2 parents f88700f + 2720df1 commit 7b83aa6

33 files changed

+3129
-629
lines changed

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
# Check for updates to GitHub Actions every week
7+
interval: "weekly"

‎.github/workflows/black.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ jobs:
66
lint:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v3
1010
- uses: psf/black@stable

‎.github/workflows/cppcheck.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v3.0.2
20+
- uses: actions/checkout@v3
2121

2222
- name: Install deps
2323
run: |
24+
sudo apt-mark hold grub-efi-amd64-signed
2425
sudo apt-get update --fix-missing
2526
sudo apt-get upgrade
2627
sudo apt install cppcheck

‎.github/workflows/macos_test.yml‎

Lines changed: 18 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2,86 +2,30 @@ name: macOS latest
22

33
on: [ push, pull_request ]
44

5-
env:
6-
TEMP_FIX_PYGAME_VERSION: 2.1.3.dev8
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
78

89
jobs:
9-
Python_37:
10+
Python:
1011
runs-on: macos-latest
12+
strategy:
13+
fail-fast: false # if a particular matrix build fails, don't skip the rest
14+
matrix:
15+
python-version: [3.7, 3.8, 3.9, '3.10', 3.11]
1116
steps:
12-
- uses: actions/checkout@v3.0.2
13-
- name: Install Python 3.7
14-
run: |
15-
brew install python@3.7
16-
- name: Install dependencies
17-
run: |
18-
brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf pkg-config
19-
python3 -m pip install setuptools -U
20-
python3 -m pip install pygame==$TEMP_FIX_PYGAME_VERSION
21-
python3 -m pip install .
22-
- name: Run Tests
23-
run: python3 -m unittest
24-
25-
Python_38:
26-
runs-on: macos-latest
27-
steps:
28-
- uses: actions/checkout@v3.0.2
29-
- name: Install Python 3.8
30-
run: |
31-
brew install python@3.8
32-
- name: Install dependencies
33-
run: |
34-
brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf pkg-config
35-
python3 -m pip install setuptools -U
36-
python3 -m pip install pygame==$TEMP_FIX_PYGAME_VERSION
37-
python3 -m pip install .
38-
- name: Run Tests
39-
run: python3 -m unittest
40-
41-
Python_39:
42-
runs-on: macos-latest
43-
steps:
44-
- uses: actions/checkout@v3.0.2
45-
- name: Install Python 3.9
46-
run: |
47-
brew install python@3.9
48-
- name: Install dependencies
49-
run: |
50-
brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf pkg-config
51-
python3 -m pip install setuptools -U
52-
python3 -m pip install pygame==$TEMP_FIX_PYGAME_VERSION
53-
python3 -m pip install .
54-
- name: Run Tests
55-
run: python3 -m unittest
56-
57-
Python_310:
58-
runs-on: macos-latest
59-
steps:
60-
- uses: actions/checkout@v3.0.2
61-
- name: Install Python 3.10
62-
run: |
63-
brew install python@3.10
17+
- uses: actions/checkout@v3
18+
- name: Install Python
19+
uses: actions/setup-python@v4
20+
with:
21+
python-version: ${{ matrix.python-version }}
6422
- name: Install dependencies
6523
run: |
6624
brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf pkg-config
67-
python3 -m pip install setuptools -U
68-
python3 -m pip install pygame==$TEMP_FIX_PYGAME_VERSION
69-
python3 -m pip install .
25+
python -m pip install --upgrade pip
26+
python -m pip install wheel
27+
python -m pip install pygame-ce
28+
python -m pip install .
7029
- name: Run Tests
71-
run: python3 -m unittest
72-
73-
Python_311:
74-
runs-on: macos-latest
75-
steps:
76-
- uses: actions/checkout@v3.0.2
77-
- name: Install Python 3.11
7830
run: |
79-
brew install python@3.11
80-
- name: Install dependencies
81-
run: |
82-
brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf pkg-config
83-
python3 -m pip install setuptools -U
84-
python3 -m pip install pygame==$TEMP_FIX_PYGAME_VERSION
85-
python3 -m pip install .
86-
- name: Run Tests
87-
run: python3 -m unittest
31+
python -m unittest

‎.github/workflows/ubuntu_test.yml‎

Lines changed: 20 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -2,96 +2,33 @@ name: Ubuntu latest
22

33
on: [ push, pull_request ]
44

5-
jobs:
6-
Python_37:
7-
runs-on: ubuntu-latest
8-
steps:
9-
- uses: actions/checkout@v3.0.2
10-
- name: Update package list
11-
run: sudo apt-get update
12-
- name: Add Deadsnakes PPA
13-
run: sudo add-apt-repository ppa:deadsnakes/ppa
14-
- name: Install Python 3.7
15-
run: sudo apt-get install -y python3.7
16-
- name: Install dependencies
17-
run: |
18-
sudo apt install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev pkg-config -y
19-
python3 -m pip install --upgrade pip
20-
python3 -m pip install pygame
21-
python3 -m pip install .
22-
- name: Run Tests
23-
run: python3 -m unittest
24-
- name: Remove Deadsnakes PPA
25-
run: |
26-
sudo add-apt-repository --remove ppa:deadsnakes/ppa
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
278

28-
Python_38:
29-
runs-on: ubuntu-latest
30-
steps:
31-
- uses: actions/checkout@v3.0.2
32-
- name: Update package list
33-
run: sudo apt-get update
34-
- name: Add Deadsnakes PPA
35-
run: sudo add-apt-repository ppa:deadsnakes/ppa
36-
- name: Install Python 3.8
37-
run: sudo apt-get install -y python3.8
38-
- name: Install dependencies
39-
run: |
40-
sudo apt install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev pkg-config -y
41-
python3 -m pip install --upgrade pip
42-
python3 -m pip install pygame
43-
python3 -m pip install .
44-
- name: Run Tests
45-
run: python3 -m unittest
46-
- name: Remove Deadsnakes PPA
47-
run: |
48-
sudo add-apt-repository --remove ppa:deadsnakes/ppa
499

50-
Python_39:
51-
runs-on: ubuntu-latest
52-
steps:
53-
- uses: actions/checkout@v3.0.2
54-
- name: Install Python 3.9
55-
run: |
56-
sudo apt-get update
57-
sudo apt-get install python3.9
58-
- name: Install dependencies
59-
run: |
60-
sudo apt install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev pkg-config -y
61-
python3 -m pip install setuptools -U
62-
python3 -m pip install pygame
63-
python3 -m pip install .
64-
- name: Run Tests
65-
run: python3 -m unittest
66-
Python_310:
67-
runs-on: ubuntu-latest
68-
steps:
69-
- uses: actions/checkout@v3.0.2
70-
- name: Install Python 3.10
71-
run: |
72-
sudo apt-get update
73-
sudo apt-get install python3.10
74-
- name: Install dependencies
75-
run: |
76-
sudo apt install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev pkg-config -y
77-
python3 -m pip install setuptools -U
78-
python3 -m pip install pygame
79-
python3 -m pip install .
80-
- name: Run Tests
81-
run: python3 -m unittest
82-
Python_311:
10+
jobs:
11+
Python:
8312
runs-on: ubuntu-latest
13+
strategy:
14+
fail-fast: false # if a particular matrix build fails, don't skip the rest
15+
matrix:
16+
python-version: [3.7, 3.8, 3.9, '3.10', 3.11]
8417
steps:
85-
- uses: actions/checkout@v3.0.2
86-
- name: Install Python 3.11
18+
- uses: actions/checkout@v3
19+
- name: Install Python
8720
run: |
21+
# Add the deadsnakes PPA to install python
22+
sudo add-apt-repository ppa:deadsnakes/ppa
8823
sudo apt-get update
89-
sudo apt-get install python3.11
24+
sudo apt-get install python${{ matrix.python-version }}-dev
25+
sudo apt-get install python${{ matrix.python-version }}-distutils
9026
- name: Install dependencies
9127
run: |
9228
sudo apt install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev pkg-config -y
93-
python3 -m pip install setuptools -U
94-
python3 -m pip install pygame
95-
python3 -m pip install .
29+
python${{ matrix.python-version }} -m pip install --upgrade pip
30+
python${{ matrix.python-version }} -m pip install wheel
31+
python${{ matrix.python-version }} -m pip install pygame-ce
32+
python${{ matrix.python-version }} -m pip install .
9633
- name: Run Tests
97-
run: python3 -m unittest
34+
run: python${{ matrix.python-version }} -m unittest

‎.github/workflows/windows_test.yml‎

Lines changed: 15 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,25 @@ name: Windows latest
22

33
on: [ push, pull_request ]
44

5-
jobs:
6-
Python_37:
7-
runs-on: windows-latest
8-
steps:
9-
- uses: actions/checkout@v3.0.2
10-
- name: Install packages
11-
run: |
12-
py -3.7 -m pip install --upgrade pip
13-
py -3.7 -m pip install pygame
14-
py -3.7 -m pip install .
15-
- name: Run Tests
16-
run: py -3.7 -m unittest
17-
18-
Python_38:
19-
runs-on: windows-latest
20-
steps:
21-
- uses: actions/checkout@v3.0.2
22-
- name: Install packages
23-
run: |
24-
py -3.8 -m pip install --upgrade pip
25-
py -3.8 -m pip install pygame
26-
py -3.8 -m pip install .
27-
- name: Run Tests
28-
run: py -3.8 -m unittest
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
298

30-
Python_39:
31-
runs-on: windows-latest
32-
steps:
33-
- uses: actions/checkout@v3.0.2
34-
- name: Install packages
35-
run: |
36-
py -3.9 -m pip install --upgrade pip
37-
py -3.9 -m pip install pygame
38-
py -3.9 -m pip install .
39-
- name: Run Tests
40-
run: py -3.9 -m unittest
41-
42-
Python_310:
9+
jobs:
10+
Python:
4311
runs-on: windows-latest
12+
strategy:
13+
fail-fast: false # if a particular matrix build fails, don't skip the rest
14+
matrix:
15+
python-version: [3.7, 3.8, 3.9, '3.10', 3.11]
4416
steps:
45-
- uses: actions/checkout@v3.0.2
17+
- uses: actions/checkout@v3
4618
- name: Install packages
4719
run: |
48-
py -3.10 -m pip install --upgrade pip
49-
py -3.10 -m pip install pygame
50-
py -3.10 -m pip install .
20+
py -${{ matrix.python-version }} -m pip install --upgrade pip
21+
py -${{ matrix.python-version }} -m pip install wheel
22+
py -${{ matrix.python-version }} -m pip install pygame-ce
23+
py -${{ matrix.python-version }} -m pip install .
5124
- name: Run Tests
52-
run: py -3.10 -m unittest
25+
run: py -${{ matrix.python-version }} -m unittest
5326

54-
Python_311:
55-
runs-on: windows-latest
56-
steps:
57-
- uses: actions/checkout@v3.0.2
58-
- name: Install packages
59-
run: |
60-
py -3.11 -m pip install --upgrade pip
61-
py -3.11 -m pip install pygame==2.1.3.dev8
62-
py -3.11 -m pip install .
63-
- name: Run Tests
64-
run: py -3.11 -m unittest

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ purpose of this repository is to help users integrate
1414
special colliders easier for their video game.
1515

1616
**Everything you see in this repository is subject to change as
17-
this project is heavily in development.** This decision is also
18-
subject to change when this project migrates to the
19-
[official pygame repository](https://github.com/pygame/pygame) or
20-
becomes a third-party library.
17+
this project is heavily in development.** The project is set to be migrated to the
18+
[official pygame-ce repository](https://github.com/pygame-community/pygame-ce).
2119

2220
## Installation (Python 3.7+)
2321
Please follow [this guide](https://github.com/novialriptide/pygame_geometry/blob/main/CONTRIBUTING.md)

0 commit comments

Comments
 (0)