Skip to content

Commit

Permalink
Revert "Revert "Merge branch 'feature/dev-o'""
Browse files Browse the repository at this point in the history
This reverts commit aad564f.
  • Loading branch information
Olivier Winter committed Jul 26, 2018
1 parent 553d903 commit 5dee711
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 5 deletions.
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
## Documentation
https://ibllib.readthedocs.io/en/latest/

## Requirements
Requires Python 3.6 or higher.

Requires Matlab R2014b or higher.

## Development practices
Gitflow.

- run tests
- flake8
- build documentation

1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
sys.path.insert(0, os.path.abspath('.'))
sys.path.insert(0, os.path.abspath('../python/alf'))
sys.path.insert(0, os.path.abspath('../python/openneurodata'))
sys.path.insert(0, os.path.abspath('../python/openneurodata/oneibl'))
sys.path.insert(0, os.path.abspath('../python'))
print('Python %s on %s' % (sys.version, sys.platform))

Expand Down
3 changes: 3 additions & 0 deletions python/openneurodata/oneibl/params_secret.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# TODO: not very happy with this state of affairs of having unencrypted passwords (keyring ?)
ALYX_PWD = 'ThisIsNotTheProductionPassword!'
HTTP_DATA_SERVER_PWD = 'ThoseAreOnlyForGitHub!'
4 changes: 0 additions & 4 deletions python/openneurodata/oneibl/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion python/openneurodata/oneibl/tests/test_one.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ class TestLoad(unittest.TestCase):

def setUp(self):
# Init connection to the database
# TODO force credentials on test server
self.One = ONE()

def test_load(self):
Expand Down Expand Up @@ -65,7 +66,6 @@ def test_list(self):
self.assertTrue(isinstance(l[0], list) and isinstance(l[0], list))

def test_search_simple(self):
# Test when the dataset type requested is not unique
myone = self.One
# Test users
usr = ['Morgane', 'miles', 'armin']
Expand Down
3 changes: 3 additions & 0 deletions python/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dataclasses
numpy
requests
7 changes: 7 additions & 0 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# .readthedocs.yml

build:
image: latest

python:
version: 3.6

0 comments on commit 5dee711

Please sign in to comment.