From 1f3832c6cfca89097495d61eb838b975fceeb972 Mon Sep 17 00:00:00 2001 From: Aaron Voelker Date: Wed, 17 Apr 2019 11:13:00 -0400 Subject: [PATCH] [META] Do not support nengo>=3.0 Resolves #174. --- .travis.yml | 34 ++++++---------------------------- docs/index.rst | 3 ++- setup.py | 2 +- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10555a2..e26d3f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,73 +6,58 @@ notifications: env: global: + - PYTHON="3.6" - TEST_CMD="py.test nengolib" - NUMPY="1.13" - SCIPY="0.19.0" - PIP_DEPS="" - - NENGO="https://github.com/nengo/nengo/archive/master.tar.gz" - CONDA_DEPS="matplotlib" matrix: include: - env: PYTHON="2.7" - NENGO="" PIP_DEPS="nengo==2.2.0 pytest==3.2" - env: PYTHON="2.7" - NENGO="" PIP_DEPS="nengo==2.3.0 pytest==3.2" - env: PYTHON="2.7" - NENGO="" PIP_DEPS="nengo==2.4.0 pytest==3.2" - env: PYTHON="2.7" - NENGO="" PIP_DEPS="nengo==2.5.0 pytest==3.2" - env: PYTHON="2.7" - NENGO="" PIP_DEPS="nengo==2.6.0 pytest==3.2" - env: PYTHON="2.7" - NENGO="" PIP_DEPS="nengo==2.7.0 pytest==3.2" - - env: - PYTHON="2.7" - NENGO="" - PIP_DEPS="nengo==2.8.0 pytest==3.2" - env: CODE_COV="True" TEST_CMD="py.test nengolib --cov=nengolib" - PYTHON="2.7" - PIP_DEPS="codecov pytest pytest-cov" + PIP_DEPS="nengo==2.8.0 pytest==3.6 pytest-cov codecov" - env: > EXTRA_CMD="flake8 -v nengolib" CONDA_DEPS="flake8" - PYTHON="2.7" TEST_CMD="" NUMPY="" SCIPY="" - NENGO="" - env: TEST_CMD="py.test nengolib/tests/test_notebooks.py --slow" - PYTHON="2.7" CONDA_DEPS="matplotlib jupyter ipython pygments" - PIP_DEPS="pytest" + PIP_DEPS="nengo==2.8.0 pytest==3.6" - env: PYTHON="3.4" - PIP_DEPS="pytest numpy==1.13.0 scipy==0.19.0" + PIP_DEPS="nengo==2.8.0 pytest==3.6 numpy==1.13.0 scipy==0.19.0" NUMPY="" SCIPY="" - env: PYTHON="3.5" - PIP_DEPS="pytest" + PIP_DEPS="nengo==2.8.0 pytest==3.6" - env: - PYTHON="3.6" SCIPY="1.0.0" - PIP_DEPS="pytest" + PIP_DEPS="nengo==2.8.0 pytest==3.6" # Setup Miniconda before_install: @@ -91,13 +76,6 @@ install: - if [[ -n $SCIPY ]]; then export CONDA_DEPS="$CONDA_DEPS scipy=$SCIPY"; fi - if [[ -n $CONDA_DEPS ]]; then conda install $CONDA_DEPS; fi - if [[ -n $PIP_DEPS ]]; then eval pip install "$PIP_DEPS"; fi - - if [[ -n $NENGO ]]; then - wget $NENGO; - tar -xzvf master.tar.gz; - cd nengo-master; - python setup.py -q install; - cd ../; - fi # Run the tests script: diff --git a/docs/index.rst b/docs/index.rst index 6f38e51..aaff2c3 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -21,6 +21,7 @@ Installation is tested against Python 2.7, 3.4, 3.5, and 3.6, and `Nengo`_ 2.2.0, 2.3.0, 2.4.0, 2.5.0, 2.6.0, 2,7.0, and 2.8.0. We recommend ``nengo==2.8.0`` for complete access to features. +We do not currently support ``nengo>=3.0``. The `Nengo GUI `_ is not officially supported. To install:: @@ -28,7 +29,7 @@ To install:: pip install nengolib This requires -`nengo>=2.1.0 `_ +`nengo>=2.2.0,<3.0 `_ `numpy>=1.13 `_, and `scipy>=0.19.0 `_. If you are having difficulty installing SciPy or NumPy, we recommend the diff --git a/setup.py b/setup.py index 7beadd6..e8ab266 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ def read(*filenames, **kwargs): 'version', os.path.join(root, name, 'version.py')) deps = [ # https://github.com/nengo/nengo/issues/508 - "nengo>=2.2.0", + "nengo>=2.2.0,<3.0", "numpy>=1.13", "scipy>=0.19.0", ]