Skip to content

Commit 43a314c

Browse files
authored
Merge pull request #157 from robotpy/2026-dev
Update for 2026
2 parents 0dddd9a + af8cd48 commit 43a314c

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/workflows/dist.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
ci:
14-
uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2025
14+
uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2026
1515
with:
1616
enable_sphinx_check: false
1717
secrets:
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v3
2525
- uses: actions/setup-python@v4
2626
with:
27-
python-version: "3.13"
27+
python-version: "3.14"
2828
- name: Install requirements
2929
run: |
3030
pip --disable-pip-version-check install mypy editables hatchling hatch-vcs types-paramiko wheel

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "robotpy-installer"
77
dynamic = ["version"]
88
description = "Installation utility program for RobotPy"
99
readme = "README.rst"
10-
requires-python = ">=3.9"
10+
requires-python = ">=3.10"
1111
authors = [
1212
{ name = "RobotPy Development Team", email = "robotpy@googlegroups.com" },
1313
]
@@ -27,7 +27,7 @@ dependencies = [
2727
"paramiko",
2828
"pip",
2929
"pynetconsole~=2.0.2",
30-
"robotpy-cli~=2024.0",
30+
"robotpy-cli~=2026.0.1b1",
3131
"tomli",
3232
"tomlkit",
3333
]
@@ -38,7 +38,7 @@ dependencies = [
3838
[project.scripts]
3939
robotpy-installer = "robotpy_installer.installer:main"
4040

41-
[project.entry-points.robotpy]
41+
[project.entry-points."robotpy_cli.2026"]
4242
deploy = "robotpy_installer.cli_deploy:Deploy"
4343
deploy-info = "robotpy_installer.cli_deploy_info:DeployInfo"
4444
init = "robotpy_installer.cli_init:Init"

robotpy_installer/installer.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@
2222
from .sshcontroller import SshController, ssh_from_cfg
2323
from .utils import _urlretrieve
2424

25-
_WPILIB_YEAR = "2025"
26-
_IS_BETA = False
25+
_WPILIB_YEAR = "2026"
26+
_IS_BETA = True
2727

2828
_ROBORIO_WHEELS = f"https://wpilib.jfrog.io/artifactory/api/pypi/wpilib-python-release-{_WPILIB_YEAR}/simple"
2929

3030
_ROBORIO_IMAGES = [
31-
"2025_v2.0",
31+
"2026_v1.2",
3232
]
3333

3434
_ROBORIO2_IMAGES = [
35-
"2025_v2.0",
35+
"2026_v1.2",
3636
]
3737

3838
_ROBOTPY_PYTHON_PLATFORM = "linux_roborio"
39-
_ROBOTPY_PYTHON_VERSION_TUPLE = (3, 13)
39+
_ROBOTPY_PYTHON_VERSION_TUPLE = (3, 14)
4040
_ROBOTPY_PYTHON_VERSION_NUM = "".join(map(str, _ROBOTPY_PYTHON_VERSION_TUPLE))
4141
_ROBOTPY_PYTHON_VERSION = f"python{_ROBOTPY_PYTHON_VERSION_NUM}"
4242

4343
_PIP_STUB_PATH = "/home/admin/rpip"
4444

45-
_PYTHON_IPK = "https://github.com/robotpy/roborio-python/releases/download/2025-3.13.1-r1/python313_3.13.1-r1_cortexa9-vfpv3.ipk"
45+
_PYTHON_IPK = "https://github.com/robotpy/roborio-python/releases/download/2026-3.14.0-r1/python314_3.14.0-r1_cortexa9-vfpv3.ipk"
4646

4747
logger = logging.getLogger("robotpy.installer")
4848

@@ -659,10 +659,10 @@ def get_pypi_version(self, package: str, use_certifi: bool) -> Version:
659659
versions = [Version(v) for v in data["versions"]]
660660

661661
# Sort the versions
662-
maxv = Version(str(int(_WPILIB_YEAR) + 1))
662+
major = int(_WPILIB_YEAR)
663663

664664
def _version_ok(v: Version) -> bool:
665-
ok = v < maxv and not v.is_devrelease
665+
ok = v.major == major and not v.is_devrelease
666666
if ok and not _IS_BETA:
667667
ok = not v.is_prerelease
668668
return ok

0 commit comments

Comments
 (0)