Skip to content

Commit 491f9ff

Browse files
authored
Merge pull request #22 from robotpy/2025-dev
Update for 2025
2 parents 762c5c3 + ee4d224 commit 491f9ff

File tree

4 files changed

+75
-70
lines changed

4 files changed

+75
-70
lines changed

.github/workflows/bump.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515
with:
1616
token: ${{ secrets.REPO_ACCESS_TOKEN }}
1717
fetch-depth: 0
18-
- uses: actions/setup-python@v4
18+
- uses: actions/setup-python@v5
1919
with:
20-
python-version: 3.8
20+
python-version: "3.9"
2121

2222
- name: Install script requirements
2323
shell: bash
2424
run: |
2525
python -m pip --disable-pip-version-check install packaging tomlkit
26-
26+
2727
- name: Bump requirements
2828
shell: bash
2929
run: |

.github/workflows/dist.yml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ jobs:
2525

2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: actions/setup-python@v4
28+
- uses: actions/setup-python@v5
2929
with:
30-
python-version: 3.8
30+
python-version: "3.9"
3131

3232
- run: pip install build
3333

3434
- name: Build packages
3535
run: python -m build
36-
36+
3737
- name: Upload build artifacts
38-
uses: actions/upload-artifact@v3
38+
uses: actions/upload-artifact@v4
3939
with:
4040
name: dist
4141
path: dist
@@ -45,24 +45,24 @@ jobs:
4545
runs-on: ${{ matrix.os }}
4646
strategy:
4747
matrix:
48-
os: [windows-2022, macos-12, ubuntu-22.04]
48+
os: [windows-2022, macos-13, ubuntu-22.04]
4949
python_version:
50-
- '3.8'
5150
- '3.9'
5251
- '3.10'
5352
- '3.11'
5453
- '3.12'
54+
- '3.13'
5555
architecture: [x64]
5656

5757
steps:
5858
- uses: actions/checkout@v4
59-
- uses: actions/setup-python@v4
59+
- uses: actions/setup-python@v5
6060
with:
6161
python-version: ${{ matrix.python_version }}
6262
architecture: ${{ matrix.architecture }}
63-
63+
6464
- name: Download build artifacts
65-
uses: actions/download-artifact@v3
65+
uses: actions/download-artifact@v4
6666
with:
6767
name: dist
6868
path: dist
@@ -71,7 +71,7 @@ jobs:
7171
shell: bash
7272
run: |
7373
python -m pip list
74-
74+
7575
- name: Install native wheel
7676
shell: bash
7777
run: |
@@ -92,44 +92,44 @@ jobs:
9292
strategy:
9393
matrix:
9494
os:
95-
- container: wpilib/roborio-cross-ubuntu:2024-22.04-py312
95+
- container: wpilib/roborio-cross-ubuntu:2025-22.04-py313
9696
name: roborio
9797

98-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py38
99-
name: raspbian
100-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py39
101-
name: raspbian
102-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py310
103-
name: raspbian
104-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py311
105-
name: raspbian
106-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py312
107-
name: raspbian
108-
109-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py38
110-
name: raspbian
111-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py39
112-
name: raspbian
113-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py310
114-
name: raspbian
115-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py311
116-
name: raspbian
117-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py312
118-
name: raspbian
98+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py39
99+
name: raspbian-py39
100+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py310
101+
name: raspbian-py310
102+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py311
103+
name: raspbian-py311
104+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py312
105+
name: raspbian-py312
106+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py313
107+
name: raspbian-py313
108+
109+
- container: wpilib/aarch64-cross-ubuntu:2025-bullseye-22.04-py39
110+
name: raspbian-aarch64-py39
111+
- container: wpilib/aarch64-cross-ubuntu:2025-bullseye-22.04-py310
112+
name: raspbian-aarch64-py310
113+
- container: wpilib/aarch64-cross-ubuntu:2025-bullseye-22.04-py311
114+
name: raspbian-aarch64-py311
115+
- container: wpilib/aarch64-cross-ubuntu:2025-bullseye-22.04-py312
116+
name: raspbian-aarch64-py312
117+
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py313
118+
name: raspbian-aarch64-py313
119119

120120
container:
121121
image: "${{ matrix.os.container }}"
122122

123123
steps:
124124
- uses: actions/checkout@v4
125-
if: (inputs.enable_raspbian && matrix.os.name == 'raspbian') || (inputs.enable_roborio && matrix.os.name == 'roborio')
125+
if: (inputs.enable_raspbian && startsWith(matrix.os.name, 'raspbian')) || (inputs.enable_roborio && matrix.os.name == 'roborio')
126126

127127
- name: Show installed packages
128128
shell: bash
129129
run: |
130130
/build/venv/bin/cross-python -m pip list
131131
132-
- uses: actions/download-artifact@v3
132+
- uses: actions/download-artifact@v4
133133
with:
134134
name: dist
135135
path: dist/
@@ -153,7 +153,7 @@ jobs:
153153
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
154154

155155
steps:
156-
- uses: actions/download-artifact@v3
156+
- uses: actions/download-artifact@v4
157157
with:
158158
name: dist
159159
path: dist/

pyproject.toml

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ navx = ["robotpy-navx"]
3939

4040
pathplannerlib = ["robotpy-pathplannerlib"]
4141

42-
photonvision = ["photonlibpy"]
42+
# photonvision = ["photonlibpy"]
4343

44-
playingwithfusion = ["robotpy-playingwithfusion"]
44+
# playingwithfusion = ["robotpy-playingwithfusion"]
4545

46-
phoenix5 = ["robotpy-ctre"]
46+
# phoenix5 = ["robotpy-ctre"]
4747

4848
phoenix6 = ["phoenix6"]
4949

50-
rev = ["robotpy-rev"]
50+
# rev = ["robotpy-rev"]
5151

5252
romi = ["robotpy-romi"]
5353

@@ -60,7 +60,7 @@ xrp = ["robotpy-xrp"]
6060
#
6161

6262
[tool.meta.packages."mostrobotpy"]
63-
version = "==2024.3.2.1"
63+
version = "==2025.0.0b1"
6464

6565
[tool.meta.packages."pyntcore"]
6666
version = "mostrobotpy"
@@ -111,68 +111,73 @@ version = "mostrobotpy"
111111
#
112112

113113
[tool.meta.packages."pyfrc"]
114-
max_version = "2025.0.0"
115-
min_version = "2024.0.0"
114+
max_version = "2026.0.0"
115+
min_version = "2025.0.0b1"
116116
constraint = 'platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"'
117117

118118
[tool.meta.packages."robotpy-cli"]
119-
max_version = "2025.0.0"
119+
max_version = "2026.0.0"
120120
min_version = "2024.0.0"
121121

122122
[tool.meta.packages."robotpy-commands-v2"]
123-
max_version = "2025.0.0"
124-
min_version = "2024.3.1"
123+
max_version = "2026.0.0"
124+
min_version = "2025.0.0b1"
125125

126126
[tool.meta.packages."robotpy-installer"]
127-
max_version = "2025.0.0"
128-
min_version = "2024.2.0"
127+
max_version = "2026.0.0"
128+
min_version = "2025.0.0b1"
129129
constraint = 'platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"'
130130

131131
[tool.meta.packages."robotpy-wpilib-utilities"]
132-
max_version = "2025.0.0"
133-
min_version = "2024.0.0"
132+
max_version = "2026.0.0"
133+
min_version = "2025.0.0b1"
134134

135135

136136
#
137137
# Third party and vendor
138138
#
139139

140140
[tool.meta.packages."numpy"]
141-
version = "==1.25.2"
141+
version = "==2.1.2"
142142
constraint = "platform_machine == 'roborio'" # only require on RoboRIO
143143

144144
[tool.meta.packages."robotpy-opencv"]
145145
version = ""
146146
constraint = "platform_machine == 'roborio'" # only require on RoboRIO
147147

148148
[tool.meta.packages."phoenix6"]
149-
version = "~=24.1"
150-
constraint = "python_version >= '3.9' and platform_machine != 'armv7l' and platform_machine != 'aarch64'"
149+
version = "~=25.0.0b1"
150+
# the arm constraint is only here because we can't check this in CI, I think
151+
# their package will actually work
152+
constraint = "python_version >= '3.12' and platform_machine != 'armv7l' and platform_machine != 'aarch64'"
151153

152154
[tool.meta.packages."photonlibpy"]
153-
max_version = "2025.0.0"
154-
min_version = "2024.2.2"
155+
max_version = "2026.0.0"
156+
min_version = "2025.0.0b1"
155157

156158
[tool.meta.packages."robotpy-ctre"]
157-
max_version = "2025.0.0"
158-
min_version = "2024.1.3"
159-
constraint = "python_version >= '3.9' and platform_machine != 'armv7l' and platform_machine != 'aarch64'"
159+
max_version = "2026.0.0"
160+
min_version = "2025.0.0b1"
161+
constraint = "python_version >= '3.12' and platform_machine != 'armv7l' and platform_machine != 'aarch64'"
160162

161163
[tool.meta.packages."robotpy-navx"]
162-
max_version = "2025.0.0"
163-
min_version = "2024.1.1"
164+
max_version = "2026.0.0"
165+
min_version = "2025.0.0b1"
164166

165167
[tool.meta.packages."robotpy-pathplannerlib"]
166-
max_version = "2025.0.0"
167-
min_version = "2024.1.1"
168+
max_version = "2026.0.0"
169+
min_version = "2025.0.0b1"
170+
# depends on numpy 2.1.2 which depends on python 3.11+, and crossenv can't
171+
# install numpy for arm/aarch64
172+
constraint = "python_version >= '3.10' and platform_machine != 'armv7l' and platform_machine != 'aarch64'"
168173

169174
[tool.meta.packages."robotpy-playingwithfusion"]
170-
max_version = "2025.0.0"
171-
min_version = "2024.2.0"
175+
max_version = "2026.0.0"
176+
min_version = "2025.0.0b1"
172177

173178
[tool.meta.packages."robotpy-rev"]
174-
max_version = "2025.0.0"
175-
min_version = "2024.2.3"
179+
max_version = "2026.0.0"
180+
min_version = "2025.0.0b1"
176181

177182
[tool.meta.packages."invalid"]
178183
available = false

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,18 @@
7171
license="BSD-3-Clause",
7272
install_requires=install_requires,
7373
extras_require=extras_require,
74-
python_requires=">=3.8,<3.13",
74+
python_requires=">=3.9,<3.14",
7575
classifiers=[
7676
"Development Status :: 5 - Production/Stable",
7777
"Intended Audience :: Developers",
7878
"Intended Audience :: Education",
7979
"License :: OSI Approved :: BSD License",
8080
"Programming Language :: Python :: 3 :: Only",
81-
"Programming Language :: Python :: 3.8",
8281
"Programming Language :: Python :: 3.9",
8382
"Programming Language :: Python :: 3.10",
8483
"Programming Language :: Python :: 3.11",
8584
"Programming Language :: Python :: 3.12",
85+
"Programming Language :: Python :: 3.13",
8686
"Topic :: Scientific/Engineering",
8787
"Topic :: Software Development",
8888
"Topic :: Software Development :: Testing",

0 commit comments

Comments
 (0)