hapc 0.1.2__tar.gz → 0.1.5__tar.gz

{hapc-0.1.2/python/hapc.egg-info → hapc-0.1.5}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: hapc
-Version: 0.1.2
-Summary: Hierarchical Additive Polynomial Complexity regression
+Version: 0.1.5
+Summary: Highly Adaptive Principal Components
 Home-page: https://github.com/meixide/hapc
 Author: Carlos García Meixide
 Author-email: Carlos García Meixide <cgmeixide@gmail.com>
-License: YEAR: 2025
-        COPYRIGHT HOLDER: Carlos García Meixide
+License: MIT
 Project-URL: Homepage, https://github.com/meixide/hapc
 Project-URL: Documentation, https://github.com/meixide/hapc#readme
 Project-URL: Repository, https://github.com/meixide/hapc.git

{hapc-0.1.2 → hapc-0.1.5}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hapc"
-version = "0.1.2"
-description = "Hierarchical Additive Polynomial Complexity regression"
+version = "0.1.5"
+description = "Highly Adaptive Principal Components"
 readme = "README.md"
 requires-python = ">=3.8"
 authors = [
     {name = "Carlos García Meixide", email = "cgmeixide@gmail.com"}
 ]
-license = {file = "LICENSE"}
+license = {text = "MIT"}
 classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.8",

{hapc-0.1.2 → hapc-0.1.5}/python/hapc/__init__.py

@@ -1,6 +1,6 @@
 """HAPC: Highly Adaptive Principal Components."""
 
-__version__ = "0.1.2"
+__version__ = "0.1.5"
 
 from .core import (
     pchal_design,

{hapc-0.1.2 → hapc-0.1.5}/python/hapc/core.py

@@ -6,42 +6,18 @@ import sys
 from pathlib import Path
 
 # Try to import hapc_core module
-hapc_core = None
-
-# Try direct import
 try:
-    import hapc_core
+    # This is the standard way for an installed package
+    from . import hapc_core
 except ImportError:
-    pass
-
-# Try relative import
-if hapc_core is None:
+    # Fallback for development mode
     try:
-        from .. import hapc_core
+        import hapc_core
     except ImportError:
-        pass
-
-# Try to find it in known locations
-if hapc_core is None:
-    search_paths = [
-        Path(__file__).parent,  # Same directory as this file
-        Path(__file__).parent.parent.parent / "build",  # Build directory
-    ]
-    
-    for path in search_paths:
-        if path.exists():
-            sys.path.insert(0, str(path))
-            try:
-                import hapc_core
-                break
-            except ImportError:
-                continue
-
-if hapc_core is None:
-    raise ImportError(
-        "hapc_core module not found. The C++ extension may not be built.\n"
-        "Try: pip install -e . --force-reinstall --no-cache-dir"
-    )
+        raise ImportError(
+            "hapc_core module not found. The C++ extension may not be built.\n"
+            "Try: pip install -e . --force-reinstall --no-cache-dir"
+        )
 
 class DesignOutput(NamedTuple):
     """Output from pchal_design."""

{hapc-0.1.2 → hapc-0.1.5/python/hapc.egg-info}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: hapc
-Version: 0.1.2
-Summary: Hierarchical Additive Polynomial Complexity regression
+Version: 0.1.5
+Summary: Highly Adaptive Principal Components
 Home-page: https://github.com/meixide/hapc
 Author: Carlos García Meixide
 Author-email: Carlos García Meixide <cgmeixide@gmail.com>
-License: YEAR: 2025
-        COPYRIGHT HOLDER: Carlos García Meixide
+License: MIT
 Project-URL: Homepage, https://github.com/meixide/hapc
 Project-URL: Documentation, https://github.com/meixide/hapc#readme
 Project-URL: Repository, https://github.com/meixide/hapc.git

{hapc-0.1.2 → hapc-0.1.5}/setup.py

@@ -44,29 +44,43 @@ class CMakeBuild(build_ext):
         import time
         
         # Search recursively for the built library
+        # Try multiple patterns to ensure we find it on all platforms
+        search_patterns = [
+            os.path.join(str(build_temp), "**", "hapc_core.*"),
+            os.path.join(str(build_temp), "**", "*", "hapc_core.*"),
+            os.path.join(str(build_temp), "**", "*", "*", "hapc_core.*"),
+        ]
+        
         found = False
-        for lib in glob.glob(os.path.join(str(build_temp), "**", "hapc_core.*"), recursive=True):
-            if lib.endswith(('.pyd', '.so', '.dylib')):
-                try:
-                    dest = lib_dir / Path(lib).name
-                    # Retry on Windows if file is locked
-                    max_retries = 3
-                    for attempt in range(max_retries):
-                        try:
-                            shutil.copy2(lib, dest)
-                            print(f"Copied {lib} to {dest}")
-                            found = True
+        for pattern in search_patterns:
+            for lib in glob.glob(pattern, recursive=True):
+                if lib.endswith(('.pyd', '.so', '.dylib')):
+                    try:
+                        dest = lib_dir / Path(lib).name
+                        # Retry on Windows if file is locked
+                        max_retries = 3
+                        for attempt in range(max_retries):
+                            try:
+                                shutil.copy2(lib, dest)
+                                print(f"[OK] Copied {lib} to {dest}")
+                                found = True
+                                break
+                            except (OSError, PermissionError) as e:
+                                if attempt < max_retries - 1:
+                                    time.sleep(0.5)
+                                else:
+                                    raise
+                        if found:
                             break
-                        except (OSError, PermissionError) as e:
-                            if attempt < max_retries - 1:
-                                time.sleep(0.5)
-                            else:
-                                raise
-                except Exception as e:
-                    print(f"Warning: Failed to copy {lib}: {e}")
+                    except Exception as e:
+                        print(f"Warning: Failed to copy {lib}: {e}")
+            if found:
+                break
         
         if not found:
-            print("Warning: No compiled library found in build directory")
+            print(f"ERROR: No compiled library found in build directory {build_temp}")
+            print(f"  Searched for: hapc_core.pyd (Windows), hapc_core.so (Linux), hapc_core.dylib (macOS)")
+            raise RuntimeError("Failed to locate compiled hapc_core extension")
         
         # Don't call parent run() to avoid setuptools trying to clean Windows locked files
         # Just mark as complete
@@ -92,7 +106,7 @@ if readme_file.exists():
 setup(
     name="hapc",
     version=version,
-    description="Hierarchical Additive Polynomial Complexity regression",
+    description="Highly Adaptive Principal Components",
     long_description=readme_content,
     long_description_content_type="text/markdown",
     author="Carlos García Meixide",
@@ -101,7 +115,8 @@ setup(
     license="MIT",
     packages=find_packages(where="python"),
     package_dir={"": "python"},
-    ext_modules=[Extension("hapc._core", [])],
+    # Correctly name the extension to be part of the 'hapc' package
+    ext_modules=[Extension("hapc.hapc_core", [])],
     cmdclass={"build_ext": CMakeBuild},
     python_requires=">=3.8",
     include_package_data=True,