Skip to content

Commit

Permalink
Fixing doc builds (NeuralEnsemble#429)
Browse files Browse the repository at this point in the history
* First test to move viziphant to the environment.yml

* Back to start

* Update Python

* Remove mpi4py

* Remove pip

* Add mpi4py, viziphant

* Hopefully working version

* Remove viziphant again

* Added deprecated fake_neo objects from neo to allow neo 0.10.0+.

* Fix imports to Python 3.

* Another attempt to fix imports to Python 3.

* Attempt relative import.

* Cross-test with UE analysis test suite.

* Next attempt....

* Remove viziphant to prevent elephant install and new attempt.

* Remove viziphant to prevent elephant install and new attempt.

* Try with a new version number

* Stop trying to fix neo 0.10.0, must be separate.

* Reintroduce viziphant in conda environment.

* Introduce concurrent requirement for neo in environment and use pip install .

* Final beautification measures
  • Loading branch information
mdenker committed Aug 14, 2021
1 parent 8c388e4 commit 00f0cd3
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ install:
- pip -V
- pip install -r requirements/requirements-tests.txt
- pip install pytest-cov coveralls
- python setup.py install
- python -c "import sys; sys.path.remove(''); import elephant; print(elephant.__file__)"
- pip install .
- python -c "import sys; sys.path.remove(''); import elephant; print(elephant.__file__, elephant.__version__)"
- python -c "import sys; sys.path.remove(''); from elephant.spade import HAVE_FIM; assert HAVE_FIM"
- pip list
- python --version
Expand Down
2 changes: 1 addition & 1 deletion elephant/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.0
0.10.1
2 changes: 0 additions & 2 deletions elephant/test/test_neo_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
:license: Modified BSD, see LICENSE.txt for details.
"""

from __future__ import division, print_function, unicode_literals

from itertools import chain
import unittest

Expand Down
2 changes: 0 additions & 2 deletions elephant/test/test_pandas_bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
:license: Modified BSD, see LICENSE.txt for details.
"""

from __future__ import division, print_function

import unittest
import warnings
from distutils.version import StrictVersion
Expand Down
3 changes: 0 additions & 3 deletions readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@ python:
- docs
- extras
- tutorials
- method: pip
path: viziphant
# This install is only necessary until viziphant can be put into the tutorials requirements file
5 changes: 3 additions & 2 deletions requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ channels:

dependencies:
- python>=3.6
- pip
- mpi4py
- numpy
- scipy
Expand All @@ -15,4 +14,6 @@ dependencies:
- statsmodels
- jinja2
- pip:
- -r file:requirements.txt
- neo>=0.9.0,<0.10.0
- viziphant
# neo, viziphant can be removed once it is integrated into requirements-tutorials.txt

0 comments on commit 00f0cd3

Please sign in to comment.