diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 3f3e473..00dc17b 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@v2024 + uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2025 with: enable_sphinx_check: false secrets: @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.12" + python-version: "3.13" - name: Install requirements run: | pip --disable-pip-version-check install mypy setuptools types-paramiko wheel setuptools_scm diff --git a/robotpy_installer/_pipstub.py b/robotpy_installer/_pipstub.py index 904360c..aa8b14b 100644 --- a/robotpy_installer/_pipstub.py +++ b/robotpy_installer/_pipstub.py @@ -18,6 +18,6 @@ platform.machine = lambda: "roborio" platform.python_implementation = lambda: "CPython" platform.system = lambda: "Linux" - platform.python_version = lambda: "3.12.0" + platform.python_version = lambda: "3.13.0" runpy.run_module("pip", run_name="__main__") diff --git a/robotpy_installer/installer.py b/robotpy_installer/installer.py index 374cd2c..397979b 100755 --- a/robotpy_installer/installer.py +++ b/robotpy_installer/installer.py @@ -22,28 +22,26 @@ from .sshcontroller import SshController, ssh_from_cfg from .utils import _urlretrieve -_WPILIB_YEAR = "2024" -_IS_BETA = False +_WPILIB_YEAR = "2025" +_IS_BETA = True _ROBORIO_WHEELS = f"https://wpilib.jfrog.io/artifactory/api/pypi/wpilib-python-release-{_WPILIB_YEAR}/simple" _ROBORIO_IMAGES = [ - "2024_v2.1", - "2024_v2.2", + "2025_v1.0", ] _ROBORIO2_IMAGES = [ - "2024_v2.1", - "2024_v2.2", + "2025_v1.0", ] _ROBOTPY_PYTHON_PLATFORM = "linux_roborio" -_ROBOTPY_PYTHON_VERSION_NUM = "312" +_ROBOTPY_PYTHON_VERSION_NUM = "313" _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/2024-3.12.1-r1/python312_3.12.1-r1_cortexa9-vfpv3.ipk" +_PYTHON_IPK = "https://github.com/robotpy/roborio-python/releases/download/2025-3.13.0-r1/python313_3.13.0-r1_cortexa9-vfpv3.ipk" logger = logging.getLogger("robotpy.installer") @@ -625,6 +623,7 @@ def pip_uninstall( "--no-cache-dir", "--disable-pip-version-check", "uninstall", + "--root-user-action=ignore", "--yes", ] pip_args.extend(packages) diff --git a/setup.cfg b/setup.cfg index f39a8d3..ca6e447 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,7 @@ install_requires = tomlkit setup_requires = setuptools_scm > 6 -python_requires = >=3.8 +python_requires = >=3.9 [options.entry_points] console_scripts =