Resolve conflicts

Author: ft-lab

tests/testConverter.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 The Newton Developers
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 The Newton Developers
 # SPDX-License-Identifier: Apache-2.0
 import pathlib
 import shutil
@@ -178,3 +178,16 @@ def test_ros_packages(self):
         self.assertEqual(diffuse_color, None)
         opacity = self.get_material_opacity(texture_material)
         self.assertAlmostEqual(opacity, 1.0, places=6)
+
+    def test_asset_identifer(self):
+        model = pathlib.Path("tests/data/prismatic_joints.urdf")
+        model_name = model.stem
+        output_dir = pathlib.Path(self.tmpDir()) / model_name
+        usdc_path = output_dir / f"{model_name}.usdc"
+
+        asset_identifier = urdf_usd_converter.Converter(layer_structure=False).convert(model, output_dir)
+        self.assertTrue(usdc_path.exists())
+
+        # check that the asset identifier returned from convert() is the same as the usdc path
+        flattened_usdc_path = pathlib.Path(asset_identifier.path).absolute().as_posix()
+        self.assertEqual(flattened_usdc_path, usdc_path.absolute().as_posix())

tools/license_format.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 The Newton Developers
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 The Newton Developers
 # SPDX-License-Identifier: Apache-2.0
 import argparse
 import logging
@@ -9,9 +9,20 @@
 
 __copyright = "# SPDX-FileCopyrightText: Copyright (c) {years} The Newton Developers"
 __identifier = "# SPDX-License-Identifier: Apache-2.0"
+__start_year = 2025
+
+# Build regex to match valid year patterns
+# Valid: single year (2025-current) OR range (start_year-end_year) where both <= current year
+# Invalid: future years beyond current year
+__current_year = datetime.now().year
+__single_years = "|".join(str(year) for year in range(__start_year, __current_year + 1))
+__range_starts = "|".join(str(year) for year in range(__start_year, __current_year + 1))
+__range_ends = "|".join(str(year) for year in range(__start_year, __current_year + 1))
+__years_pattern = f"(?:{__single_years}|(?:{__range_starts})-(?:{__range_ends}))"
+
 # Escape special regex characters in the copyright template
 __copyright_template = re.escape(__copyright).replace(re.escape("{years}"), "{years}")
-__copyright_years = __copyright_template.replace("{years}", f"(?:2025|(?:20[0-9][0-4])-{datetime.now().year})")
+__copyright_years = __copyright_template.replace("{years}", __years_pattern)
 __copyright_regex = re.compile(f"^{__copyright_years}$")
 
 

urdf_usd_converter/_impl/_flatten.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 The Newton Developers
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 The Newton Developers
 # SPDX-License-Identifier: Apache-2.0
 import pathlib
 import shutil
@@ -11,7 +11,7 @@
 from .utils import get_authoring_metadata
 
 
-def export_flattened(asset_stage: Usd.Stage, output_dir: str, asset_dir: str, asset_stem: str, asset_format: str, comment: str):
+def export_flattened(asset_stage: Usd.Stage, output_dir: str, asset_dir: str, asset_stem: str, asset_format: str, comment: str) -> str:
     output_path = pathlib.Path(output_dir)
     layer: Sdf.Layer = asset_stage.Flatten()
     asset_identifier = f"{output_path.absolute().as_posix()}/{asset_stem}.{asset_format}"
@@ -40,3 +40,4 @@ def export_flattened(asset_stage: Usd.Stage, output_dir: str, asset_dir: str, as
         Tf.Status(f"Copied textures from {temp_textures_dir} to {output_textures_dir}")
 
     shutil.rmtree(asset_dir, ignore_errors=True)
+    return asset_identifier

urdf_usd_converter/_impl/convert.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 The Newton Developers
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 The Newton Developers
 # SPDX-License-Identifier: Apache-2.0
 import pathlib
 import tempfile
@@ -149,7 +149,7 @@ def convert(self, input_file: str, output_dir: str) -> Sdf.AssetPath:
 
         # optionally flatten the asset
         if not self.params.layer_structure:
-            export_flattened(asset_stage, output_dir, asset_dir, asset_stem, asset_format, self.params.comment)
+            asset_identifier = export_flattened(asset_stage, output_dir, asset_dir, asset_stem, asset_format, self.params.comment)
         else:
             usdex.core.saveStage(asset_stage, comment=self.params.comment)