Skip to content

Commit 7170a56

Browse files
Merge branch 'master' into raylib-5.6
2 parents 59aaabf + 48bcc23 commit 7170a56

3 files changed

Lines changed: 57 additions & 9 deletions

File tree

.github/FUNDING.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# These are supported funding model platforms
2+
3+
github: [electronstudio, raysan5]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
12+
polar: # Replace with a single Polar username
13+
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
14+
thanks_dev: # Replace with a single thanks.dev username
15+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/test_pypi.yml

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,60 @@ on:
1010
type: string
1111
required: true
1212
default: "raylib"
13+
version:
14+
description: "Package version to install (e.g., 5.5.0.2, or leave empty for latest)"
15+
type: string
16+
required: false
17+
default: ""
18+
pre_release:
19+
description: "Allow pre-release versions?"
20+
type: boolean
21+
required: false
22+
default: false
1323

1424
jobs:
1525
test-pypi-install:
1626
runs-on: ${{ matrix.os }}
1727
strategy:
1828
fail-fast: false
1929
matrix:
20-
os: [macos-15-intel, macos-14]
21-
python-version: ["3.14", "3.11", "3.12", "3.13"]
30+
os: [macos-15-intel, macos-14, macos-26]
31+
python-version: ["3.14", "3.13"]
32+
python-source: [homebrew, python-org]
2233
steps:
2334
- name: Install Python from Homebrew
35+
if: matrix.python-source == 'homebrew'
2436
run: |
2537
brew install python@${{ matrix.python-version }}
2638
PYTHON_BIN="$(brew --prefix python@${{ matrix.python-version }})/bin/python${{ matrix.python-version }}"
2739
echo "PYTHON_BIN=$PYTHON_BIN" >> "$GITHUB_ENV"
2840
$PYTHON_BIN --version
2941
42+
- name: Setup Python (python.org)
43+
if: matrix.python-source == 'python-org'
44+
uses: actions/setup-python@v5
45+
with:
46+
python-version: ${{ matrix.python-version }}
47+
48+
- name: Set Python bin (python.org)
49+
if: matrix.python-source == 'python-org'
50+
shell: bash
51+
run: |
52+
PYTHON_BIN="$(command -v python${{ matrix.python-version }} || command -v python3)"
53+
echo "PYTHON_BIN=$PYTHON_BIN" >> "$GITHUB_ENV"
54+
$PYTHON_BIN --version
55+
3056
- name: Install package from PyPI
3157
run: |
32-
"$PYTHON_BIN" -m pip install --upgrade pip
33-
"$PYTHON_BIN" -m pip install "${{ inputs.package_name }}"
58+
PRE_FLAG=""
59+
if [ "${{ inputs.pre_release }}" = "true" ]; then
60+
PRE_FLAG="--pre"
61+
fi
62+
if [ -n "${{ inputs.version }}" ]; then
63+
"$PYTHON_BIN" -m pip install $PRE_FLAG "${{ inputs.package_name }}==${{ inputs.version }}" --break-system-packages
64+
else
65+
"$PYTHON_BIN" -m pip install $PRE_FLAG "${{ inputs.package_name }}" --break-system-packages
66+
fi
3467
3568
- name: Test import and basic initialization
3669
run: |

examples/extra/vector2_extended.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ def __imul__(self, other):
8989

9090
def __truediv__(self, other):
9191
if isinstance(other, Vector2Ex):
92-
res = vector_2divide(self, other)
92+
res = vector2_divide(self, other)
9393
return self.to_Vec2(res)
9494
return Vector2Ex(self.x / other, self.y / other)
9595

9696
def __itruediv__(self, other):
9797
if isinstance(other, Vector2Ex):
98-
res = vector_2divide(self, other)
98+
res = vector2_divide(self, other)
9999
else:
100100
res = vector2_scale(self, 1/other)
101101
self.x = res.x
@@ -125,13 +125,13 @@ def clamp_value(self, min_val: float, max_val: float):
125125
return self.to_Vec2(res)
126126

127127
def distance(self, vec2):
128-
return vector_2distance(self, vec2)
128+
return vector2_distance(self, vec2)
129129

130130
def distance_sqr(self, vec2) -> float:
131-
return vector_2distance_sqr(self, vec2)
131+
return vector2_distance_sqr(self, vec2)
132132

133133
def dot_product(self, vec2) -> float:
134-
return vector_2dot_product(self, vec2)
134+
return vector2_dot_product(self, vec2)
135135

136136
def invert(self):
137137
res = vector2_invert(self)

0 commit comments

Comments
 (0)