scikit-sparse 0.4.13__tar.gz → 0.4.15__tar.gz

{scikit-sparse-0.4.13/scikit_sparse.egg-info → scikit_sparse-0.4.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scikit-sparse
-Version: 0.4.13
+Version: 0.4.15
 Summary: Scikit sparse matrix package
 Home-page: https://github.com/scikit-sparse/scikit-sparse
 Maintainer: Aaron Johnson

{scikit-sparse-0.4.13 → scikit_sparse-0.4.15}/pyproject.toml

@@ -25,6 +25,11 @@ requires = [
     "setuptools>=40.8.0",
     "wheel",
     "Cython>=0.22",
-    'numpy>=1.13.3; python_version>="3.6"',
+    'numpy>=1.13.3; python_version=="3.6"',
+    'numpy>=1.14.5; python_version=="3.7"',
+    'numpy>=1.17.3; python_version=="3.8"',
+    'numpy>=1.19.3; python_version=="3.9"',
+    'numpy>=1.23.1; python_version=="3.10"',
+    'numpy>=1.23.5; python_version>="3.11"',
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"

{scikit-sparse-0.4.13 → scikit_sparse-0.4.15/scikit_sparse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scikit-sparse
-Version: 0.4.13
+Version: 0.4.15
 Summary: Scikit sparse matrix package
 Home-page: https://github.com/scikit-sparse/scikit-sparse
 Maintainer: Aaron Johnson

{scikit-sparse-0.4.13 → scikit_sparse-0.4.15}/setup.py

@@ -22,6 +22,7 @@ decomposition. Further contributions are welcome!
 """
 
 import os
+import subprocess
 import sys
 
 import numpy as np
@@ -36,18 +37,35 @@ MAINTAINER_EMAIL = "justin.ellis18@gmail.com"
 URL = "https://github.com/scikit-sparse/scikit-sparse"
 LICENSE = "BSD"
 
-
 INCLUDE_DIRS = [
     np.get_include(),
     sys.prefix + "/include",
     # Debian's suitesparse-dev installs to
     "/usr/include/suitesparse",
-    # Homebrew macos-latest installs to
-    '/usr/local/opt/suite-sparse/include/suitesparse/',
-]
-LIBRARY_DIRS = [# Homebrew macos-latest installs to
-                '/usr/local/opt/suite-sparse/lib'
 ]
+LIBRARY_DIRS = []
+
+# check if suitesparse is installed via homebrew
+homebrew_suitesparse_dir = (
+    subprocess.run(
+        "readlink -f $(brew --prefix suitesparse)",
+        shell=True,
+        stdout=subprocess.PIPE,
+    )
+    .stdout.decode()
+    .strip()
+)
+if homebrew_suitesparse_dir:  # empty string if not found (because error is printed to stderr)
+    INCLUDE_DIRS.append(
+        # Include directory for homebrew-installed suitesparse
+        homebrew_suitesparse_dir
+        + "/include/suitesparse/",
+    )
+    LIBRARY_DIRS.append(
+        # Library directory for homebrew-installed suitesparse
+        homebrew_suitesparse_dir
+        + "/lib"
+    )
 
 user_include_dir = os.getenv("SUITESPARSE_INCLUDE_DIR")
 user_library_dir = os.getenv("SUITESPARSE_LIBRARY_DIR")
@@ -65,7 +83,7 @@ setup(
         "": ["test_data/*.mtx.gz"],
     },
     name=DISTNAME,
-    version="0.4.13",  # remember to update __init__.py
+    version="0.4.15",  # remember to update __init__.py
     maintainer=MAINTAINER,
     maintainer_email=MAINTAINER_EMAIL,
     description=DESCRIPTION,

scikit_sparse-0.4.15/sksparse/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.15"

{scikit-sparse-0.4.13 → scikit_sparse-0.4.15}/tests/test_cholmod.py

@@ -94,7 +94,7 @@ def complex_matrix():
 
 def factor_of(factor, matrix):
     return np.allclose(
-        (factor.L() * factor.L().H).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
+        (factor.L() * factor.L().T.conjugate()).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
     )
 
 

scikit-sparse-0.4.13/sksparse/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.4.13"