Merge pull request #25 from apdavison/update-reqs

Update Python, NumPy and SciPy versions used in CI testing

Author: apdavison

.github/workflows/requirements-middle.txt

@@ -1,2 +1,2 @@
-numpy==1.23.5
-scipy==1.9.3
+numpy==2.0.1
+scipy==1.14.0

.github/workflows/requirements-newest.txt

@@ -1,2 +1,2 @@
-numpy==2.0.1
-scipy==1.14.0
+numpy==2.4.1
+scipy==1.17.0

.github/workflows/requirements-oldest.txt

@@ -1,2 +1,2 @@
-numpy==1.20.3
-scipy==1.7.3
+numpy==1.23.5
+scipy==1.9.3

.github/workflows/test.yml

@@ -11,20 +11,20 @@ jobs:
     name: Test with Python ${{ matrix.python-version }} and ${{ matrix.req-version }} requirements on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        python-version: ["3.8", "3.10", "3.12"]
+        python-version: ["3.10", "3.12", "3.14"]
         req-version: ["oldest", "middle", "newest"]
         os: ["ubuntu-24.04"]
         exclude:
-          - python-version: "3.8"
-            req-version: "newest"
           - python-version: "3.10"
-            req-version: "oldest"
+            req-version: "newest"
           - python-version: "3.12"
             req-version: "oldest"
-          - python-version: "3.12"
+          - python-version: "3.14"
             req-version: "middle"
+          - python-version: "3.14"
+            req-version: "oldest"
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

lazyarray.py

@@ -510,10 +510,10 @@ def evaluate(self, simplify=False, empty_val=0):
                 x = x.reshape(self._shape)
         elif have_scipy and sparse.issparse(self.base_value):  # For sparse matrices
             if empty_val != 0:
-                x = self.base_value.toarray((sparse.csc_matrix))
+                x = self.base_value.toarray()
                 x = np.where(x, x, np.nan)
             else:
-                x = self.base_value.toarray((sparse.csc_matrix))
+                x = self.base_value.toarray()
         elif isinstance(self.base_value, Iterator):
             x = np.fromiter(self.base_value, dtype=self.dtype or float, count=self.size)
             if x.shape != self._shape:

pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "lazyarray"
-version = "0.6.0"
+version = "0.7.0.dev.0"
 description = "A Python package that provides a lazily-evaluated numerical array class, larray, based on and compatible with NumPy arrays."
 readme = "README.rst"
-requires-python = ">=3.8"
-license = {text = "Modified BSD"}
+requires-python = ">=3.10"
+license = "BSD-3-Clause"
 authors = [
   {name = "Andrew P. Davison", email = "andrew.davison@cnrs.fr"}
 ]
@@ -15,18 +15,17 @@ keywords = ["lazy evaluation, array"]
 classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: BSD License",
   "Natural Language :: English",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
   "Topic :: Scientific/Engineering"
 ]
 dependencies = [
-  "numpy>=1.20.3"
+  "numpy>=1.23.5"
 ]
 
 [project.optional-dependencies]
-sparse = ["scipy>=1.7.3"]
+sparse = ["scipy>=1.9.3"]
 dev = ["sphinx", "pytest", "pytest-cov", "flake8", "wheel"]
 
 [project.urls]