Refactored wheel building and testing

Author: bnbailey-psl

.github/workflows/build-wheels.yml

@@ -153,44 +153,32 @@ jobs:
         CIBW_BEFORE_BUILD_WINDOWS: "set CMAKE_RC_COMPILER= && set PYHELIOS_CUDA_ARCHITECTURES=50;60;70;75;80;86;90 && python build_scripts/prepare_wheel.py --buildmode release --verbose"
         CIBW_BEFORE_BUILD_LINUX: "export PYHELIOS_CUDA_ARCHITECTURES=50;60;70;75;80;86;90 && python build_scripts/prepare_wheel.py --buildmode release --verbose"
 
-        # Test wheel installation with comprehensive asset validation
+        # Comprehensive wheel testing using pytest suite
         CIBW_TEST_COMMAND: |
           python -c "
           import pyhelios
           print(f'PyHelios {pyhelios.__version__} imported successfully')
           
-          # Validate asset path management
+          # Quick asset validation
           from pyhelios.assets import get_asset_manager
           manager = get_asset_manager()
-          
-          # Check HELIOS_BUILD path resolution
           helios_build = manager._get_helios_build_path()
           if helios_build:
               print(f'HELIOS_BUILD assets found at: {helios_build}')
           else:
-              print('WARNING: HELIOS_BUILD assets not found')
-          
-          # Validate packaged assets
-          from pathlib import Path
-          package_root = Path(pyhelios.__file__).parent
-          expected_assets = package_root / 'assets' / 'build' / 'lib' / 'images'
-          if expected_assets.exists():
-              asset_count = len(list(expected_assets.glob('*')))
-              print(f'Found {asset_count} core assets in packaged location')
-              if asset_count == 0:
-                  raise RuntimeError('Core assets directory exists but is empty')
-          else:
-              print('WARNING: Expected packaged assets not found')
+              raise RuntimeError('CRITICAL: HELIOS_BUILD assets not found')
           
-          # Test asset validation function
-          results = manager.validate_assets()
-          for plugin, result in results.items():
-              if result['exists']:
-                  print(f'{plugin}: {result[\"files_found\"]} asset files')
-          
-          print('Asset validation completed')
-          "
-        CIBW_TEST_REQUIRES: "pytest"
+          # Plugin status check
+          from pyhelios.plugins import print_plugin_status
+          print_plugin_status()
+          print('Initial validation completed')
+          " &&
+          python -m pytest {project}/tests/test_cross_platform.py {project}/tests/test_datatypes.py --tb=short -v
+        
+        CIBW_TEST_REQUIRES: "pytest pytest-forked"
+        
+        # Skip problematic platforms for testing
+        CIBW_TEST_SKIP: "*-win32 *-manylinux_i686 *-musllinux*"
 
         # Repair wheels to bundle dependencies
         CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"

pyhelios/__init__.py

@@ -2,6 +2,38 @@
 from .Logger import Logger
 from .Context import Context, PrimitiveType
 
+# Version information with robust fallback strategies
+def _get_version():
+    """Get version with multiple fallback strategies."""
+    try:
+        from ._version import version
+        return version
+    except ImportError:
+        pass
+    
+    try:
+        # Try setuptools-scm directly for development installs
+        from setuptools_scm import get_version
+        from pathlib import Path
+        return get_version(root=Path(__file__).parent.parent)
+    except (ImportError, LookupError):
+        pass
+    
+    try:
+        # Try pkg_resources/importlib.metadata as final fallback
+        try:
+            from importlib.metadata import version
+        except ImportError:
+            # Python < 3.8 fallback
+            from importlib_metadata import version
+        return version('pyhelios')
+    except Exception:
+        pass
+    
+    return "unknown"
+
+__version__ = _get_version()
+
 # Initialize asset paths for C++ plugins
 try:
     from .assets import initialize_asset_paths

pyhelios/assets/__init__.py

@@ -60,6 +60,19 @@ def get_helios_core_path(self) -> Optional[Path]:
         """Get the path to the helios-core directory."""
         return self._find_helios_core()
 
+    def _is_wheel_install(self) -> bool:
+        """
+        Detect if we're running from an installed wheel package.
+        
+        Returns:
+            True if running from wheel installation, False otherwise
+        """
+        package_root = Path(__file__).parent
+        pyhelios_parent = package_root.parent.parent  # Go up to site-packages level
+        
+        # Look for .dist-info directory which indicates wheel installation
+        return any(pyhelios_parent.glob('pyhelios-*.dist-info'))
+    
     def _get_helios_build_path(self) -> Optional[Path]:
         """
         Find the HELIOS_BUILD directory containing assets.
@@ -74,18 +87,47 @@ def _get_helios_build_path(self) -> Optional[Path]:
         Returns:
             Path to build directory, or None if not found
         """
-        # PRIORITY 1: For pip-installed PyHelios, check packaged assets first
-        # This ensures pip users always get proper assets even if dev dirs exist
         package_root = Path(__file__).parent
-        packaged_build = package_root / 'build'
+        packaged_build = package_root / 'build'  # pyhelios/assets/build/
 
-        # Check for packaged assets structure with comprehensive validation
+        # Check if we're in a wheel installation
+        is_wheel_install = self._is_wheel_install()
+        
+        if is_wheel_install:
+            # WHEEL INSTALL: Only check packaged assets location
+            if (packaged_build.exists() and 
+                (packaged_build / 'lib' / 'images').exists() and
+                len(list((packaged_build / 'lib' / 'images').glob('*'))) > 0):
+                logger.debug(f"Using wheel-installed assets: {packaged_build}")
+                return packaged_build
+            else:
+                # This is a critical packaging error for wheels
+                raise RuntimeError(
+                    f"Wheel installation detected but assets not found at {packaged_build}. "
+                    f"This indicates a packaging error. Expected structure:\n"
+                    f"  {packaged_build / 'lib' / 'images'} with image files"
+                )
+        
+        # DEVELOPMENT INSTALL: Check packaged assets first, then development paths
+        
+        # PRIORITY 1: Check for packaged assets (even in development)
         if (packaged_build.exists() and 
             (packaged_build / 'lib' / 'images').exists() and
             len(list((packaged_build / 'lib' / 'images').glob('*'))) > 0):
-            logger.debug(f"Using pip-installed assets: {packaged_build}")
+            logger.debug(f"Using development packaged assets: {packaged_build}")
             return packaged_build
 
+        # Log diagnostic information if packaged assets are missing or incomplete
+        if packaged_build.exists():
+            logger.debug(f"Packaged assets directory exists but incomplete: {packaged_build}")
+            if not (packaged_build / 'lib' / 'images').exists():
+                logger.debug("  Missing lib/images directory")
+            else:
+                image_count = len(list((packaged_build / 'lib' / 'images').glob('*')))
+                logger.debug(f"  Found {image_count} images (need > 0 for validation)")
+        else:
+            logger.debug(f"Packaged assets directory does not exist: {packaged_build}")
+        
         # PRIORITY 2: For development, look for pyhelios_build/build directory
         # Only used if pip-installed assets are not available
         helios_core = self.get_helios_core_path()