Fixing tests (#7)

* cleanup

* style fix

* fixing tests

---------

Co-authored-by: Salvador Santoluctio <salvador.santolucito@ni.com>

Author: ssantolu

labview_fpga_hdl_tools/__main__.py

@@ -23,7 +23,6 @@
     migrate_clip,
 )
 from .common import generate_guid
-from .common import generate_guid
 
 
 @click.group(help=f"LabVIEW FPGA HDL Tools (v{__version__})")

labview_fpga_hdl_tools/common.py

@@ -79,8 +79,11 @@ class FileConfiguration:
     lv_target_install_folder: Optional[str] = None  # Installation folder for target plugins
     lv_target_menus_folder: Optional[str] = None  # Folder containing target plugin menu files
     lv_target_info_ini: Optional[str] = None  # Path to TargetInfo.ini file
-    lv_target_exclude_files: Optional[str] = None  # Path to Python script with file exclusion patterns
+    lv_target_exclude_files: Optional[str] = (
+        None  # Path to Python script with file exclusion patterns
+    )
     num_hdl_registers: Optional[int] = None  # Number of HDL registers
+    max_hdl_reg_offset: Optional[int] = None  # Maximum HDL register byte offset
     # ----- CLIP MIGRATION SETTINGS -----
     input_xml_path: Optional[str] = None  # Path to source CLIP XML file
     output_csv_path: Optional[str] = None  # Path where CSV signals will be written
@@ -552,6 +555,10 @@ def process_constraints_template(config):
     """
     # Define output directory
     output_folder = os.path.join(os.getcwd(), "objects", "xdc")
+    period_content = ""
+    clip_content = ""
+    from_to_content = ""
+
     if config.the_window_folder_input is None:
         print("TheWindowFolder input is not specified in the configuration.")
     else:
@@ -571,7 +578,9 @@ def process_constraints_template(config):
                 period_pattern = (
                     r"# BEGIN_LV_FPGA_PERIOD_CONSTRAINTS(.*?)# END_LV_FPGA_PERIOD_CONSTRAINTS"
                 )
-                clip_pattern = r"# BEGIN_LV_FPGA_CLIP_CONSTRAINTS(.*?)# END_LV_FPGA_CLIP_CONSTRAINTS"
+                clip_pattern = (
+                    r"# BEGIN_LV_FPGA_CLIP_CONSTRAINTS(.*?)# END_LV_FPGA_CLIP_CONSTRAINTS"
+                )
                 from_to_pattern = (
                     r"# BEGIN_LV_FPGA_FROM_TO_CONSTRAINTS(.*?)# END_LV_FPGA_FROM_TO_CONSTRAINTS"
                 )
@@ -760,8 +769,9 @@ def get_invalid_paths_error(invalid_paths):
 
 def generate_guid():
     """Generate a new GUID (UUID4) in standard format.
-    
+
     Returns:
-        str: A new GUID in lowercase format with hyphens (e.g., '8943868e-fc0c-4e48-a2e9-1ebce7779d5c')
+        str: A new GUID in lowercase format with hyphens
+        (e.g., '8943868e-fc0c-4e48-a2e9-1ebce7779d5c')
     """
     return str(uuid.uuid4())

labview_fpga_hdl_tools/create_vivado_project.py

@@ -653,17 +653,16 @@ def create_project(overwrite=False, update=False, test=False, config_path=None):
     # Process the xdc_template to ensure that we have one for the Vivado project
     common.process_constraints_template(config)
 
- 
     # Validate that all constraints files exist - do this after processing the templates
     try:
         _validate_constraints_files(config)
     except Exception as e:
         print(f"Error: {e}")
         return 1
-    
+
     if len(config.window_vhdl_templates) > 0:
-        # Run (or rerun) generate LV Window VHDL - this is needed to generate TheWindow.vhd that goes
-        # into the objects directory and which gets used in the Vivado project
+        # Run (or rerun) generate LV Window VHDL - this is needed to generate TheWindow.vhd that
+        # goes into the objects directory and which gets used in the Vivado project
         try:
             gen_labview_target_plugin.gen_window_vhdl(config_path=config_path)
         except Exception as e:

labview_fpga_hdl_tools/gen_labview_target_plugin.py

@@ -59,6 +59,13 @@
 }
 
 
+def _ensure_text(value):
+    """Return template output as a text string."""
+    if isinstance(value, bytes):
+        return value.decode("utf-8")
+    return value
+
+
 def _write_tree_to_xml(root, output_file):
     """Write an XML tree to a formatted XML file.
 
@@ -422,7 +429,7 @@ def _generate_window_vhdl_from_csv(
             # Write output file
             os.makedirs(os.path.dirname(output_path), exist_ok=True)
             with open(output_path, "w", encoding="utf-8") as f:
-                f.write(output_text)
+                f.write(_ensure_text(output_text))
 
             print(f"Generated VHDL file: {output_path}")
 
@@ -467,7 +474,8 @@ def _generate_target_xml(
         clock_filename = os.path.basename(clock_path)
 
         # Calculate min_lv_reg_offset from max_hdl_reg_offset
-        # Formula: max_hdl_reg_offset + 4 (next 32-bit register), converted to hex with 5 hex digits (0x00000 format)
+        # Formula: max_hdl_reg_offset + 4 (next 32-bit register), converted to hex with
+        # 5 hex digits (0x00000 format)
         offset_value = max_hdl_reg_offset + 4 if max_hdl_reg_offset is not None else 0
         min_lv_reg_offset = f"0x{offset_value:05X}"
 
@@ -503,7 +511,7 @@ def _generate_target_xml(
 
                 # Write output file
                 with open(current_output_path, "w", encoding="utf-8") as f:
-                    f.write(output_text)
+                    f.write(_ensure_text(output_text))
 
                 print(f"Generated Target XML file: {current_output_path}")
 

labview_fpga_hdl_tools/install_dependencies.py

@@ -8,18 +8,18 @@
 
 Pre-release handling (--pre flag):
   Follows pip's PEP 440 pre-release behavior:
-  
+
   Without --pre:
     - Pre-release versions (dev, alpha, beta, rc, etc.) are excluded
     - Example: ">=26.0.0" matches only 26.0.0, 26.0.1, etc.
     - Example: ">=26.0.0" does NOT match 26.0.0.dev0 (pre-releases come before releases)
-  
+
   With --pre:
     - Pre-release versions are included in version resolution
     - Example: ">=26.0.0.dev0" matches 26.0.0.dev0, 26.0.0.dev1, 26.0.0, 26.0.1, etc.
     - Example: ">=26.0.0" matches 26.0.0, 26.0.1, 26.1.0.dev0, etc.
     - Note: 26.0.0.dev0 < 26.0.0 in PEP 440 (pre-releases sort before releases)
-  
+
 Version ordering (PEP 440):
   - 25.0.0 < 26.0.0.dev0 < 26.0.0.dev1 < 26.0.0 < 26.0.1
 
@@ -46,8 +46,8 @@
 except ModuleNotFoundError:
     import tomli as tomllib  # type: ignore[import]
 
-from packaging.version import Version, InvalidVersion
 from packaging.specifiers import SpecifierSet
+from packaging.version import InvalidVersion, Version
 
 
 def _remove_readonly(func, path, exc_info):
@@ -58,12 +58,12 @@ def _remove_readonly(func, path, exc_info):
 
 def _normalize_tag(tag):
     """Normalize a git tag to a PEP 440 compliant version string.
-    
+
     Removes 'v' or 'V' prefix to match PEP 440 format.
-    
+
     Args:
         tag: Git tag string (e.g., "v26.0.0", "26.0.0.dev3")
-        
+
     Returns:
         Normalized version string without 'v' prefix (e.g., "26.0.0", "26.0.0.dev3")
     """
@@ -72,49 +72,49 @@ def _normalize_tag(tag):
 
 def _parse_dependency(dep_string):
     """Parse dependency string with PEP 440 version specifier.
-    
+
     Supports the same specifiers as pip install:
       owner/repo==1.2.3       - exact version
       owner/repo>=1.2.3       - minimum version
       owner/repo<2.0.0        - maximum version
       owner/repo~=1.2.3       - compatible release (>=1.2.3, <1.3.0)
-    
+
     Args:
         dep_string: Dependency string
-        
+
     Returns:
         tuple: (repo, specifier, version) where specifier is one of '==', '>=', '<', '~='
                Returns (None, None, None) if parsing fails
     """
     # Try each specifier in order of length (longest first to avoid conflicts)
-    specifiers = ['~=', '>=', '==', '<']
-    
+    specifiers = ["~=", ">=", "==", "<"]
+
     for spec in specifiers:
         if spec in dep_string:
             parts = dep_string.split(spec, 1)
             if len(parts) == 2:
                 return parts[0].strip(), spec, parts[1].strip()
-    
+
     return None, None, None
 
 
 def _filter_tags_by_specifier(tags, specifier, version, allow_prerelease=False):
     """Filter tags based on version specifier using PEP 440.
-    
+
     Uses packaging library for PEP 440 compliance, matching pip install behavior.
-    
+
     Args:
         tags: List of tag names
         specifier: Version specifier ('==', '>=', '<', '~=')
         version: Version string
         allow_prerelease: Include pre-release versions (equivalent to pip --pre)
-        
+
     Returns:
         Best matching tag, or None if no match
     """
     # Create specifier set (PEP 440)
     spec_set = SpecifierSet(f"{specifier}{version}", prereleases=allow_prerelease)
-    
+
     # Filter tags that match the specifier
     matching_tags = []
     for tag in tags:
@@ -126,10 +126,10 @@ def _filter_tags_by_specifier(tags, specifier, version, allow_prerelease=False):
         except InvalidVersion:
             # Skip tags that aren't valid PEP 440 versions
             continue
-    
+
     if not matching_tags:
         return None
-    
+
     # Sort by version (highest first) and return the best match
     matching_tags.sort(reverse=True, key=lambda x: x[0])
     return matching_tags[0][1]
@@ -205,29 +205,31 @@ def _clone_repo_at_tag(repo, tag_or_spec, base_dir, delete_allowed=False, allow_
     tag = tag_or_spec
     specifier = None
     version = None
-    
+
     # Check for version specifiers
-    for spec in ['~=', '>=', '==', '<']:
+    for spec in ["~=", ">=", "==", "<"]:
         if tag_or_spec.startswith(spec):
             specifier = spec
-            version = tag_or_spec[len(spec):]
+            version = tag_or_spec[len(spec) :]
             break
-    
+
     # Resolve version if specifier is used (or if --latest flag forces "latest")
     if specifier or tag_or_spec.lower() == "latest":
         if specifier:
             print(f"Resolving version {specifier}{version} for {repo}...")
         else:
             print(f"Resolving latest version for {repo}...")
-        
+
         try:
             all_tags = _get_all_tags(repo_url, allow_prerelease)
             if not all_tags:
                 print(f"  [FAIL] No tags found in repository {repo}")
                 return False
             else:
                 if specifier:
-                    matched_tag = _filter_tags_by_specifier(all_tags, specifier, version, allow_prerelease)
+                    matched_tag = _filter_tags_by_specifier(
+                        all_tags, specifier, version, allow_prerelease
+                    )
                 else:
                     # "latest" - get the latest tag
                     valid_tags = []
@@ -238,7 +240,7 @@ def _clone_repo_at_tag(repo, tag_or_spec, base_dir, delete_allowed=False, allow_
                             continue
                     valid_tags.sort(reverse=True, key=lambda x: x[0])
                     matched_tag = valid_tags[0][1] if valid_tags else None
-                
+
                 if matched_tag:
                     print(f"    [INFO] Resolved to tag: {matched_tag}")
                     tag = matched_tag
@@ -376,19 +378,23 @@ def install_dependencies(delete_allowed=False, allow_prerelease=False, use_lates
     for dep_string in dependencies:
         # Parse the dependency string
         repo, specifier, version = _parse_dependency(dep_string)
-        
+
         if repo is None:
             print(f"Warning: Invalid dependency format: {dep_string}")
             print(f"         Expected format: owner/repo==version or owner/repo>=version")
             continue
-        
+
+        if specifier is None or version is None:
+            print(f"Warning: Invalid dependency version specifier: {dep_string}")
+            continue
+
         # Build the tag/version string for cloning
         tag_or_spec = specifier + version
-        
+
         # Override with "latest" if --latest flag is used
         if use_latest:
             tag_or_spec = "latest"
-        
+
         total_count += 1
 
         if _clone_repo_at_tag(repo, tag_or_spec, deps_dir, delete_allowed, allow_prerelease):