Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/requirements-middle.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
numpy==1.23.5
scipy==1.9.3
numpy==2.0.1
scipy==1.14.0
4 changes: 2 additions & 2 deletions .github/workflows/requirements-newest.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
numpy==2.0.1
scipy==1.14.0
numpy==2.4.1
scipy==1.17.0
4 changes: 2 additions & 2 deletions .github/workflows/requirements-oldest.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
numpy==1.20.3
scipy==1.7.3
numpy==1.23.5
scipy==1.9.3
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions lazyarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
11 changes: 5 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]"}
]
Expand All @@ -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]
Expand Down
211 changes: 0 additions & 211 deletions test/test_lazy_arrays_from_Sparse_Matrices.py

This file was deleted.

Loading