Merge branch 'master' into fix/index_error_synchrotool_493

Author: Moritz-Alexander-Kern

.github/workflows/CI.yml

@@ -135,20 +135,14 @@ jobs:
       matrix:
         # OS [ubuntu-latest, macos-latest, windows-latest]
         os: [macos-13,macos-14]
-        python-version: [3.11]
+        python-version: [3.12]
     steps:
       - name: Get current year-month
         id: date
         run: echo "date=$(date +'%Y-%m')" >> $GITHUB_OUTPUT
 
       - uses: actions/[email protected]
 
-      - name: Cache conda
-        uses: actions/cache@v4
-        with:
-          path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-conda-${{hashFiles('requirements/environment.yml') }}-${{ hashFiles('**/CI.yml') }}-${{ steps.date.outputs.date }}
-
       - name: Get current hash (SHA) of the elephant_data repo
         id: elephant-data
         run: |
@@ -162,29 +156,17 @@ jobs:
           key: datasets-${{ steps.elephant-data.outputs.dataset_hash }}
           restore-keys: datasets-      
 
-      - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # corresponds to v3.1.0
-        with:
-          auto-update-conda: true
-          python-version: ${{ matrix.python-version }}
-          mamba-version: "*"
-          channels: conda-forge
-          channel-priority: true
-          activate-environment: elephant
-          environment-file: requirements/environment-tests.yml
-          conda-remove-defaults: true
-
       - name: Install dependencies
         shell: bash -l {0}
         run: |
           python --version
-          mamba install pytest pytest-cov coveralls
-          pip install -e .[extras]
+          pip install -e .[extras,tests]
+          pip install pytest-cov coveralls
 
       - name: List packages
         shell: bash -l {0}
         run: |
           pip list
-          mamba list
           python --version
 
       - name: Test with pytest

elephant/conversion.py

@@ -708,7 +708,17 @@ def __getitem__(self, item):
             the returned binned sparse matrix will affect the original data.
         """
         # taken from csr_matrix.__getitem__
-        row, col = self.sparse_matrix._validate_indices(item)
+        valid_indices = self.sparse_matrix._validate_indices(item)
+        # TODO: The following is a hot fix to compensate an API change in SciPy 1.15 (#653)
+        # Currently, we cannot set scipy>=1.15 since this would not allow for Python 3.9.
+        # Once we phase out support for Python 3.9, remove the if statement and the else 
+        # branch and require scipy>=1.15.
+        if isinstance(valid_indices[0], tuple):
+            # New version of SciPy (1.15 and later)
+            row, col = valid_indices[0]
+        else:
+            # Previous version of SciPy
+            row, col = valid_indices
         spmat = self.sparse_matrix[item]
         if np.isscalar(spmat):
             # data with one element