diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index c16c30a..0dabb5a 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -11,7 +11,7 @@ on: jobs: ci: - uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2025 + uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2026 with: enable_sphinx_check: false secrets: @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.13" + python-version: "3.14" - name: Install requirements run: | pip --disable-pip-version-check install mypy editables hatchling hatch-vcs types-paramiko wheel diff --git a/pyproject.toml b/pyproject.toml index d8d28be..a3c338c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "robotpy-installer" dynamic = ["version"] description = "Installation utility program for RobotPy" readme = "README.rst" -requires-python = ">=3.9" +requires-python = ">=3.10" authors = [ { name = "RobotPy Development Team", email = "robotpy@googlegroups.com" }, ] @@ -27,7 +27,7 @@ dependencies = [ "paramiko", "pip", "pynetconsole~=2.0.2", - "robotpy-cli~=2024.0", + "robotpy-cli~=2026.0.1b1", "tomli", "tomlkit", ] @@ -38,7 +38,7 @@ dependencies = [ [project.scripts] robotpy-installer = "robotpy_installer.installer:main" -[project.entry-points.robotpy] +[project.entry-points."robotpy_cli.2026"] deploy = "robotpy_installer.cli_deploy:Deploy" deploy-info = "robotpy_installer.cli_deploy_info:DeployInfo" init = "robotpy_installer.cli_init:Init" diff --git a/robotpy_installer/installer.py b/robotpy_installer/installer.py index 89e2e27..d49dedd 100755 --- a/robotpy_installer/installer.py +++ b/robotpy_installer/installer.py @@ -22,27 +22,27 @@ from .sshcontroller import SshController, ssh_from_cfg from .utils import _urlretrieve -_WPILIB_YEAR = "2025" -_IS_BETA = False +_WPILIB_YEAR = "2026" +_IS_BETA = True _ROBORIO_WHEELS = f"https://wpilib.jfrog.io/artifactory/api/pypi/wpilib-python-release-{_WPILIB_YEAR}/simple" _ROBORIO_IMAGES = [ - "2025_v2.0", + "2026_v1.2", ] _ROBORIO2_IMAGES = [ - "2025_v2.0", + "2026_v1.2", ] _ROBOTPY_PYTHON_PLATFORM = "linux_roborio" -_ROBOTPY_PYTHON_VERSION_TUPLE = (3, 13) +_ROBOTPY_PYTHON_VERSION_TUPLE = (3, 14) _ROBOTPY_PYTHON_VERSION_NUM = "".join(map(str, _ROBOTPY_PYTHON_VERSION_TUPLE)) _ROBOTPY_PYTHON_VERSION = f"python{_ROBOTPY_PYTHON_VERSION_NUM}" _PIP_STUB_PATH = "/home/admin/rpip" -_PYTHON_IPK = "https://github.com/robotpy/roborio-python/releases/download/2025-3.13.1-r1/python313_3.13.1-r1_cortexa9-vfpv3.ipk" +_PYTHON_IPK = "https://github.com/robotpy/roborio-python/releases/download/2026-3.14.0-r1/python314_3.14.0-r1_cortexa9-vfpv3.ipk" logger = logging.getLogger("robotpy.installer") @@ -659,10 +659,10 @@ def get_pypi_version(self, package: str, use_certifi: bool) -> Version: versions = [Version(v) for v in data["versions"]] # Sort the versions - maxv = Version(str(int(_WPILIB_YEAR) + 1)) + major = int(_WPILIB_YEAR) def _version_ok(v: Version) -> bool: - ok = v < maxv and not v.is_devrelease + ok = v.major == major and not v.is_devrelease if ok and not _IS_BETA: ok = not v.is_prerelease return ok