Skip to content

Commit

Permalink
Merge c327384 into e69a449
Browse files Browse the repository at this point in the history
  • Loading branch information
jpgill86 committed Jul 3, 2019
2 parents e69a449 + c327384 commit 9f49e96
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions environment.yml
Expand Up @@ -13,5 +13,5 @@ dependencies:
- pip:
- elephant>=0.6.2
- pylttb
- git+https://github.com/jpgill86/python-neo.git@axographrawio
- git+https://github.com/jpgill86/ephyviewer.git@experimental
- git+https://github.com/NeuralEnsemble/python-neo.git
- git+https://github.com/NeuralEnsemble/ephyviewer.git
4 changes: 2 additions & 2 deletions requirements.txt
@@ -1,7 +1,7 @@
av
elephant>=0.6.2
git+https://github.com/jpgill86/ephyviewer.git@experimental
git+https://github.com/jpgill86/python-neo.git@axographrawio
git+https://github.com/NeuralEnsemble/ephyviewer.git
git+https://github.com/NeuralEnsemble/python-neo.git
numpy
pandas
pylttb
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -72,9 +72,9 @@
install_requires = [
# 'av',
# 'elephant>=0.6.2',
# 'ephyviewer @ https://github.com/jpgill86/ephyviewer/archive/experimental.tar.gz', # latest version
# 'ephyviewer @ https://github.com/NeuralEnsemble/ephyviewer/archive/master.tar.gz', # latest version
# 'ipywidgets',
# 'neo @ https://github.com/jpgill86/python-neo/archive/axographrawio.tar.gz', # TODO require >0.7.1 for AxographRawIO
# 'neo @ https://github.com/NeuralEnsemble/python-neo/archive/master.tar.gz', # TODO require >0.7.1 for AxographRawIO
# 'numpy',
# 'pandas',
# 'pylttb',
Expand Down

0 comments on commit 9f49e96

Please sign in to comment.