Skip to content

Commit 831f817

Browse files
authored
unpin scipy (#361)
* unpin scipy * pin numpy in conda * Update patched version of skbio
1 parent cfb9c3b commit 831f817

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.conda/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ requirements:
2929
- scanpy>=1.6.0
3030
- pandas>=1.0
3131
- numpy<1.22
32-
- scipy<1.9.0
32+
- scipy
3333
- parasail-python
3434
- scikit-learn
3535
- python-levenshtein

.github/workflows/docs.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
python -m pip install --upgrade "pip!=22.1"
6464
# TODO this is to workaround an issue with the skbio dependency
6565
# This will work in the next release, see https://github.com/biocore/scikit-bio/pull/1813
66-
pip install git+https://github.com/grst/scikit-bio.git@a3423e4
66+
pip install git+https://github.com/grst/scikit-bio.git@main
6767
pip install .[doc,test,rpack,dandelion]
6868
- name: run sphinx
6969
run: |
@@ -94,10 +94,9 @@ jobs:
9494
with:
9595
name: docs
9696
path: docs/_build/html
97-
9897
# Temporarily disable docs deployment
99-
# The way the target directory is calculated is broken. It overwrites everything.
100-
#
98+
# The way the target directory is calculated is broken. It overwrites everything.
99+
#
101100
# - name: Deploy to gh-pages
102101
# if: ( matrix.os == 'ubuntu-latest' ) && ( github.event_name != 'pull_request' )
103102
# uses: JamesIves/github-pages-deploy-action@releases/v3

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
python -m pip install --upgrade "pip!=22.1"
5353
# TODO this is to workaround an issue with the skbio dependency
5454
# This will work in the next release, see https://github.com/biocore/scikit-bio/pull/1813
55-
pip install git+https://github.com/grst/scikit-bio.git@a3423e4
55+
pip install git+https://github.com/grst/scikit-bio.git@main
5656
pip install .[test,rpack,dandelion]
5757
- name: Check black formatting
5858
run: |

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies = [
2929
'scanpy>=1.6.0',
3030
'pandas>=1.0',
3131
'numpy>=1.17.0',
32-
'scipy<1.9.0',
32+
'scipy',
3333
# parasail 1.2.1 fails to be installd on MacOS
3434
'parasail != 1.2.1',
3535
'scikit-learn',

0 commit comments

Comments
 (0)