Skip to content

Commit

Permalink
Use pip to update weave
Browse files Browse the repository at this point in the history
  • Loading branch information
guyer committed Apr 5, 2019
1 parent 0fc714e commit 0374689
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ install:
- cmd: if "%TARGET_ARCH%" == "x86" if "%CONDA_PY%" == "27" conda.exe install --quiet --name root mayavi weave
- cmd: if "%TARGET_ARCH%" == "x86" if "%FIPY_SOLVERS%" == "pysparse" conda.exe install --quiet --name root pysparse

# conda-forge weave 0.17 is incompatible with something
> # else and conda-forge weave 0.15 is
# [broken](https://github.com/scipy/weave/issues/11)
- cmd: conda.exe remove --channel conda-forge weave
- cmd: pip install weave

- cmd: if "%CONDA_PY%" == "36" 2to3 --write . 1> NUL 2>&1
- cmd: if "%CONDA_PY%" == "36" 2to3 --write --doctests_only . 1> NUL 2>&1

Expand Down
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ commands:
source activate ~/project/<< parameters.env >>
conda uninstall --quiet fipy
pip install scikit-fmm
# conda-forge weave 0.17 is incompatible with something
# else and conda-forge weave 0.15 is
# [broken](https://github.com/scipy/weave/issues/11)
conda remove --channel conda-forge weave
pip install weave
test_fipy:
description: "Run FiPy Tests"
Expand Down
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ before_install:
# Useful for debugging any issues with conda
- conda info -a
- pip install scikit-fmm
# conda-forge weave 0.17 is incompatible with something
# else and conda-forge weave 0.15 is
# [broken](https://github.com/scipy/weave/issues/11)
- conda remove --channel conda-forge weave
- pip install weave

install:
- if [[ $PY3K -eq 1 ]]; then
2to3 --write . &> /dev/null;
Expand Down

0 comments on commit 0374689

Please sign in to comment.