Merge pull request #175 from robotpy/initial-2027

Initial 2027 updates

Author: virtuald

.github/workflows/dist.yml

@@ -81,9 +81,9 @@ jobs:
  max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
  fail-fast: true
  matrix:
- os: ["ubuntu-22.04", "ubuntu-22.04-arm", "macos-14", "windows-2022"]
+ os: ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-14", "windows-2022"]
  include:
- - os: ubuntu-22.04-arm
+ - os: ubuntu-24.04-arm
  container: python:3.13-bookworm
 
  container: ${{ matrix.container }}
@@ -94,7 +94,7 @@ jobs:
  fetch-depth: 0
 
  - name: Install python
- if: matrix.os != 'ubuntu-22.04-arm'
+ if: matrix.os != 'ubuntu-24.04-arm'
  uses: actions/setup-python@v5
  with:
  python-version: '3.13'
@@ -126,7 +126,7 @@ jobs:
  fail-fast: true
  matrix:
  os:
- - "ubuntu-22.04"
+ - "ubuntu-24.04"
  - "macos-13" # x86_64
  - "macos-14" # arm64
  - "windows-2022"
@@ -137,13 +137,13 @@ jobs:
  - '3.12'
  - '3.13'
  include:
- - os: ubuntu-22.04-arm
+ - os: ubuntu-24.04-arm
  python_version: '3.11'
  container: python:3.11-bookworm
- - os: ubuntu-22.04-arm
+ - os: ubuntu-24.04-arm
  python_version: '3.12'
  container: python:3.12-bookworm
- - os: ubuntu-22.04-arm
+ - os: ubuntu-24.04-arm
  python_version: '3.13'
  container: python:3.13-bookworm
 
@@ -155,7 +155,7 @@ jobs:
  fetch-depth: 0
 
  - name: Install python
- if: matrix.os != 'ubuntu-22.04-arm'
+ if: matrix.os != 'ubuntu-24.04-arm'
  uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python_version }}
@@ -172,7 +172,7 @@ jobs:
 
  - name: Install libgl
  run: apt-get update && apt-get install -y libgl1
- if: matrix.os == 'ubuntu-22.04-arm'
+ if: matrix.os == 'ubuntu-24.04-arm'
 
  - name: Setup MSVC
  uses: bus1/cabuild/action/msdevshell@e22aba57d6e74891d059d66501b6b5aed8123c4d # v1
@@ -222,7 +222,7 @@ jobs:
  path: dist
 
  #
- # Build roboRIO/raspbian wheels
+ # Build robot/raspbian wheels
  #
 
  cross-other:
@@ -232,9 +232,9 @@ jobs:
  max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
  matrix:
  os:
- - container: wpilib/roborio-cross-ubuntu:2025-22.04-py313
- name: roborio
- - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py313
+ - container: wpilib/systemcore-cross-ubuntu:2025-22.04-py313
+ name: systemcore
+ - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py313
  name: raspbian
 
  container:
@@ -246,7 +246,7 @@ jobs:
  fetch-depth: 0
 
  - name: Setup cross environment for meson
- uses: robotpy/build-actions/setup-cross-meson@semiwrap
+ uses: robotpy/build-actions/setup-cross-meson@v2025
 
  - name: Install deps
  shell: bash
@@ -270,17 +270,17 @@ jobs:
  max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
  matrix:
  os:
- - container: wpilib/roborio-cross-ubuntu:2025-22.04-py313
- name: roborio
- base: roborio
+ - container: wpilib/systemcore-cross-ubuntu:2025-22.04-py313
+ name: systemcore
+ base: systemcore
 
- - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py311
+ - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py311
  name: raspbian-py311
  base: raspbian
- - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py312
+ - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py312
  name: raspbian-py312
  base: raspbian
- - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py313
+ - container: wpilib/raspbian-cross-ubuntu:2025-bookworm-24.04-py313
  name: raspbian-py313
  base: raspbian
 
@@ -298,7 +298,7 @@ jobs:
  path: dist-other
 
  - name: Setup cross environment for meson
- uses: robotpy/build-actions/setup-cross-meson@semiwrap
+ uses: robotpy/build-actions/setup-cross-meson@v2025
 
  - run: apt-get update
  - name: Setup ccache

rdev.toml

@@ -11,39 +11,43 @@
 [py_versions]
 
 # Usually the same as wpilib_bin_version
-native = "2025.3.2.1"
+native = "2027.0.0a2"
 
 # Will eventually sync with native
-halsim_native = "2025.3.2.2"
+halsim_native = "2027.0.0a2"
 
 # Usually similar to native, but subminor version is bumped for bugfixes
 # - ./rdev.sh ci check_tag will fail if this doesn't match current tag
-wrapper = "2025.3.2.4"
+wrapper = "2027.0.0a2"
 
 [params]
 
-# wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release"
-wpilib_bin_version = "2025.3.2-54-g7a3df61"
-wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development"
+wpilib_bin_version = "2027.0.0-alpha-2"
+wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release-2027"
+# wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development-2027"
 
 # Don't update these maven artifacts
 exclude_artifacts = [
  "opencv-cpp"
 ]
 
-robot_wheel_platform = "linux-roborio"
+robot_wheel_platform = "linux-systemcore"
 
 [params.requirements]
 semiwrap = "~=0.1.4"
 hatch-meson = "~=0.1.0b2"
 hatch-nativelib = "~=0.2.0"
-hatch-robotpy = "~=0.2"
+hatch-robotpy = "~=0.2.1"
 
 
 [subprojects."robotpy-native-wpiutil"]
 py_version = "native"
 robot = true
 
+[subprojects."robotpy-native-datalog"]
+py_version = "native"
+robot = true
+
 [subprojects."robotpy-native-wpinet"]
 py_version = "native"
 robot = true
@@ -80,6 +84,10 @@ robot = false
 py_version = "wrapper"
 robot = true
 
+[subprojects."robotpy-wpilog"]
+py_version = "wrapper"
+robot = true
+
 [subprojects."robotpy-wpinet"]
 py_version = "wrapper"
 robot = true

subprojects/pyntcore/pyproject.toml

@@ -3,26 +3,28 @@ build-backend = "hatchling.build"
 requires = [
  "semiwrap~=0.1.4",
  "hatch-meson~=0.1.0b2",
- "hatch-robotpy~=0.2",
+ "hatch-robotpy~=0.2.1",
  "hatchling",
- "robotpy-native-ntcore==2025.3.2.1",
- "robotpy-wpiutil==2025.3.2.4",
- "robotpy-wpinet==2025.3.2.4",
+ "robotpy-native-ntcore==2027.0.0a2",
+ "robotpy-wpiutil==2027.0.0a2",
+ "robotpy-wpinet==2027.0.0a2",
+ "robotpy-wpilog==2027.0.0a2",
 ]
 
 
 [project]
 name = "pyntcore"
-version = "2025.3.2.4"
+version = "2027.0.0a2"
 description = "Binary wrappers for the FRC ntcore library"
 authors = [
  {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"},
 ]
 license = "BSD-3-Clause"
 dependencies = [
- "robotpy-native-ntcore==2025.3.2.1",
- "robotpy-wpiutil==2025.3.2.4",
- "robotpy-wpinet==2025.3.2.4",
+ "robotpy-native-ntcore==2027.0.0a2",
+ "robotpy-wpiutil==2027.0.0a2",
+ "robotpy-wpinet==2027.0.0a2",
+ "robotpy-wpilog==2027.0.0a2",
 ]
 
 [project.urls]
@@ -60,7 +62,7 @@ scan_headers_ignore = [
 [tool.semiwrap.extension_modules."ntcore._ntcore"]
 name = "ntcore"
 wraps = ["robotpy-native-ntcore"]
-depends = ["wpiutil", "wpinet"]
+depends = ["wpiutil", "wpinet", "wpilog"]
 
 
 [tool.semiwrap.extension_modules."ntcore._ntcore".headers]

subprojects/pyntcore/semiwrap/NetworkTableInstance.yml

@@ -17,7 +17,7 @@ extra_includes:
 - networktables/Topic.h
 - src/py2value.h
 - src/nt_instance.h
-- wpi/DataLog.h
+- wpi/datalog/DataLog.h
 - wpystruct.h
 
 classes:
@@ -120,10 +120,10 @@ classes:
  StartServer:
  cpp_code: |
  [](NetworkTableInstance * self, std::string_view persist_filename, const char* listen_address,
- unsigned int port3, unsigned int port4) {
+ unsigned int port) {
  pyntcore::onInstanceStart(self);
  py::gil_scoped_release release;
- self->StartServer(persist_filename, listen_address, port3, port4);
+ self->StartServer(persist_filename, listen_address, port);
  }
  StopServer:
  StartClient3:

subprojects/pyntcore/tests/conftest.py

@@ -70,11 +70,10 @@ def _init_common(self):
 
  # self._wait_init()
 
- def _init_server(self, port3=23232, port4=23233):
+ def _init_server(self, port=23232):
  self._init_common()
 
- self.port3 = port3
- self.port4 = port4
+ self.port = port
 
  def _init_client(self):
  self._init_common()
@@ -122,23 +121,18 @@ def expect_changes(self, count):
 @pytest.fixture()
 def nt_server(request, cfg_logging):
  class NtServer(NtTestBase):
- _test_saved_port3 = None
- _test_saved_port4 = None
+ _test_saved_port = None
 
  def start_test(self):
  logger.info("NtServer::start_test")
 
  # Restore server port on restart
- if self._test_saved_port3 is not None:
- self.port3 = self._test_saved_port3
- self.port4 = self._test_saved_port4
+ if self._test_saved_port is not None:
+ self.port = self._test_saved_port
 
- self._impl.startServer(
- listen_address="127.0.0.1", port3=self.port3, port4=self.port4
- )
+ self._impl.startServer(listen_address="127.0.0.1", port=self.port)
 
- self._test_saved_port3 = self.port3
- self._test_saved_port4 = self.port4
+ self._test_saved_port = self.port
 
  server = NtServer()
  server._init_server()
@@ -149,26 +143,11 @@ def start_test(self):
 
 
 @pytest.fixture()
-def nt_client3(request, nt_server):
+def nt_client(request, nt_server):
  class NtClient(NtTestBase):
  def start_test(self):
- self._impl.startClient3("C3")
- self._impl.setServer("127.0.0.1", nt_server.port3)
-
- client = NtClient()
- client._init_client()
- try:
- yield client
- finally:
- client.shutdown()
-
-
-@pytest.fixture()
-def nt_client4(request, nt_server):
- class NtClient(NtTestBase):
- def start_test(self):
- self._impl.startClient4("C4")
- self._impl.setServer("127.0.0.1", nt_server.port4)
+ self._impl.startClient("C4")
+ self._impl.setServer("127.0.0.1", nt_server.port)
 
  client = NtClient()
  client._init_client()
@@ -177,10 +156,10 @@ def start_test(self):
 
 
 @pytest.fixture
-def nt_live(nt_server, nt_client4):
+def nt_live(nt_server, nt_client):
  """This fixture automatically starts the client and server"""
 
  nt_server.start_test()
- nt_client4.start_test()
+ nt_client.start_test()
 
- return nt_server, nt_client4
+ return nt_server, nt_client

subprojects/pyntcore/tests/test_api.py

@@ -97,6 +97,7 @@ def do(nt1, nt2, t):
  assert t2.getStringArray("sa", None) == ["t", "s"]
 
 
+@pytest.mark.xfail(reason="ntcore is broken")
 def test_basic(nt_live):
  nt_server, nt_client = nt_live
 

subprojects/robotpy-apriltag/pyproject.toml

@@ -3,25 +3,25 @@ build-backend = "hatchling.build"
 requires = [
  "semiwrap~=0.1.4",
  "hatch-meson~=0.1.0b2",
- "hatch-robotpy~=0.2",
+ "hatch-robotpy~=0.2.1",
  "hatchling",
- "robotpy-native-apriltag==2025.3.2.1",
- "robotpy-wpiutil==2025.3.2.4",
- "robotpy-wpimath==2025.3.2.4",
+ "robotpy-native-apriltag==2027.0.0a2",
+ "robotpy-wpiutil==2027.0.0a2",
+ "robotpy-wpimath==2027.0.0a2",
 ]
 
 [project]
 name = "robotpy-apriltag"
-version = "2025.3.2.4"
+version = "2027.0.0a2"
 description = "RobotPy bindings for WPILib's AprilTag library"
 authors = [
  {name = "RobotPy Development Team", email = "robotpy@googlegroups.com"},
 ]
 license = "BSD-3-Clause"
 dependencies = [
- "robotpy-native-apriltag==2025.3.2.1",
- "robotpy-wpiutil==2025.3.2.4",
- "robotpy-wpimath==2025.3.2.4",
+ "robotpy-native-apriltag==2027.0.0a2",
+ "robotpy-wpiutil==2027.0.0a2",
+ "robotpy-wpimath==2027.0.0a2",
 ]
 
 [project.urls]