Update ntcore for 2027

Author: virtuald

subprojects/pyntcore/pyproject.toml

@@ -8,6 +8,7 @@ requires = [
     "robotpy-native-ntcore==2027.0.0a1",
     "robotpy-wpiutil==2027.0.0a1",
     "robotpy-wpinet==2027.0.0a1",
+    "robotpy-wpilog==2027.0.0a1",
 ]
 
 
@@ -23,6 +24,7 @@ dependencies = [
     "robotpy-native-ntcore==2027.0.0a1",
     "robotpy-wpiutil==2027.0.0a1",
     "robotpy-wpinet==2027.0.0a1",
+    "robotpy-wpilog==2027.0.0a1",
 ]
 
 [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/robotpy-native-ntcore/pyproject.toml

@@ -6,6 +6,7 @@ requires = [
     "hatch-robotpy~=0.2",
     "robotpy-native-wpiutil==2027.0.0a1",
     "robotpy-native-wpinet==2027.0.0a1",
+    "robotpy-native-datalog==2027.0.0a1",
 ]
 
 [project]
@@ -17,6 +18,7 @@ license = "BSD-3-Clause"
 dependencies = [
     "robotpy-native-wpiutil==2027.0.0a1",
     "robotpy-native-wpinet==2027.0.0a1",
+    "robotpy-native-datalog==2027.0.0a1",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -38,4 +40,4 @@ name = "ntcore"
 includedir = "src/native/ntcore/include"
 libdir = "src/native/ntcore/lib"
 shared_libraries = ["ntcore"]
-requires = ["robotpy-native-wpinet", "robotpy-native-wpiutil"]
+requires = ["robotpy-native-datalog", "robotpy-native-wpinet", "robotpy-native-wpiutil"]