Skip to content

Commit f98192a

Browse files
committed
some clean CI and requirements
1 parent 85ad8de commit f98192a

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

.github/workflows/full-test.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ jobs:
1818
- uses: actions/checkout@v2
1919
with:
2020
python-version: 3.8
21-
- name: Which python
22-
run: |
23-
which python
2421
- uses: actions/cache@v2
2522
id: cache-venv
2623
with:
@@ -57,7 +54,6 @@ jobs:
5754
- name: Test with pytest
5855
run: |
5956
source ~/test_env/bin/activate
60-
# onbly rawiotest is tested at the moment
57+
# onbly neo.rawio and neo.io
6158
pytest --cov=neo neo/test/rawiotest
62-
# TODO uncomment this soon
6359
pytest --cov=neo neo/test/iotest

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ before_install:
3030
- pip install "numpy==$NUMPY_VERSION"
3131
install:
3232
- pip install -r requirements.txt
33+
- pip install nose
3334
- pip install coveralls
3435
- pip install .
3536
- pip install pillow

neo/utils/datasets.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313

1414
global local_testing_data_folder
15-
if os.getenv('TESTING_DATA_FOLDER', default=None) is not None:
16-
local_testing_data_folder = Path(os.getenv('TESTING_DATA_FOLDER'))
15+
if os.getenv('EPHY_TESTING_DATA_FOLDER', default=None) is not None:
16+
local_testing_data_folder = Path(os.getenv('EPHY_TESTING_DATA_FOLDER'))
1717
else:
1818
# set in home
1919
local_testing_data_folder = Path.home() / 'ephy_testing_data'
@@ -52,6 +52,8 @@ def download_dataset(repo=None, remote_path=None, local_folder=None):
5252
local_path:
5353
The local path of the downloaded file or folder
5454
"""
55+
assert HAVE_DATALAD, 'You need to install datalad'
56+
5557
if repo is None:
5658
# Use gin NeuralEnsemble/ephy_testing_data
5759
repo = 'https://gin.g-node.org/NeuralEnsemble/ephy_testing_data'
@@ -72,10 +74,7 @@ def download_dataset(repo=None, remote_path=None, local_folder=None):
7274
return
7375

7476
dataset.get(remote_path)
75-
77+
7678
local_path = local_folder / remote_path
7779

7880
return local_path
79-
80-
81-

requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
# essential
21
numpy>=1.13.0,!=1.16.0
32
quantities>=0.12.1
4-
# for running tests
5-
nose>=1.1.2

0 commit comments

Comments
 (0)