Skip to content

Commit

Permalink
unpin scipy (#361)
Browse files Browse the repository at this point in the history
* unpin scipy

* pin numpy in conda

* Update patched version of skbio
  • Loading branch information
grst authored Aug 18, 2022
1 parent cfb9c3b commit 831f817
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ requirements:
- scanpy>=1.6.0
- pandas>=1.0
- numpy<1.22
- scipy<1.9.0
- scipy
- parasail-python
- scikit-learn
- python-levenshtein
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
python -m pip install --upgrade "pip!=22.1"
# TODO this is to workaround an issue with the skbio dependency
# This will work in the next release, see https://github.com/biocore/scikit-bio/pull/1813
pip install git+https://github.com/grst/scikit-bio.git@a3423e4
pip install git+https://github.com/grst/scikit-bio.git@main
pip install .[doc,test,rpack,dandelion]
- name: run sphinx
run: |
Expand Down Expand Up @@ -94,10 +94,9 @@ jobs:
with:
name: docs
path: docs/_build/html

# Temporarily disable docs deployment
# The way the target directory is calculated is broken. It overwrites everything.
#
# The way the target directory is calculated is broken. It overwrites everything.
#
# - name: Deploy to gh-pages
# if: ( matrix.os == 'ubuntu-latest' ) && ( github.event_name != 'pull_request' )
# uses: JamesIves/github-pages-deploy-action@releases/v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
python -m pip install --upgrade "pip!=22.1"
# TODO this is to workaround an issue with the skbio dependency
# This will work in the next release, see https://github.com/biocore/scikit-bio/pull/1813
pip install git+https://github.com/grst/scikit-bio.git@a3423e4
pip install git+https://github.com/grst/scikit-bio.git@main
pip install .[test,rpack,dandelion]
- name: Check black formatting
run: |
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
'scanpy>=1.6.0',
'pandas>=1.0',
'numpy>=1.17.0',
'scipy<1.9.0',
'scipy',
# parasail 1.2.1 fails to be installd on MacOS
'parasail != 1.2.1',
'scikit-learn',
Expand Down

0 comments on commit 831f817

Please sign in to comment.