[choreolib] Merge spec version into main package

Author: calcmogul

choreolib/py/choreo/__init__.py

@@ -1,6 +1,5 @@
 import json
 
-from choreo.spec_version import SPEC_VERSION
 from choreo.trajectory import (
     DifferentialSample,
     DifferentialTrajectory,
@@ -10,6 +9,8 @@
     load_event_marker,
 )
 
+SPEC_VERSION = "v2025.0.0"
+
 
 def load_differential_trajectory_string(
     trajectory_json_string: str,

choreolib/py/choreo/spec_version.py

@@ -4,7 +4,7 @@
 import math
 import os
 
-from choreo.spec_version import SPEC_VERSION
+from choreo import SPEC_VERSION
 from choreo.util import DEFAULT_YEAR, get_flipper_for_year
 from wpimath.geometry import Pose2d, Rotation2d
 from wpimath.kinematics import ChassisSpeeds

choreolib/py/choreo/trajectory/__init__.py

@@ -17,14 +17,15 @@
 #include <wpi/MemoryBuffer.h>
 #include <wpi/json.h>
 
-#include "choreo/SpecVersion.h"
 #include "choreo/trajectory/ProjectFile.h"
 #include "choreo/trajectory/Trajectory.h"
 #include "choreo/trajectory/TrajectorySample.h"
 #include "choreo/util/AllianceFlipperUtil.h"
 
 namespace choreo {
 
+inline constexpr std::string_view kSpecVersion = "v2025.0.0";
+
 template <TrajectorySample SampleType, int Year>
 class AutoFactory;
 

choreolib/src/main/native/include/choreo/Choreo.h

@@ -3,7 +3,6 @@
 #include <gtest/gtest.h>
 
 #include "choreo/Choreo.h"
-#include "choreo/SpecVersion.h"
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);