Skip to content

Commit

Permalink
Make nwb-schema a submodule (#1045)
Browse files Browse the repository at this point in the history
Ignoring the failure with Py3.5 on Windows, since this is problem is unrelated to these changes (See #1043).

* make nwb-schema a submodule

* remove YAML in pynwb/data

* set submodule as package data

* retrieve submodules on Circle

* retrieve submodules on Azure

* fix package data path

* make submodule over HTTP
  • Loading branch information
ajtritt authored Aug 20, 2019
1 parent afb0616 commit 1ecefca
Show file tree
Hide file tree
Showing 18 changed files with 15 additions and 2,417 deletions.
6 changes: 6 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ references:
ci-steps: &ci-steps
steps:
- checkout
- run: git submodule sync
- run: git submodule update --init
- run:
<<: *initialize-venv
- run:
Expand Down Expand Up @@ -65,6 +67,8 @@ references:
conda-steps: &conda-steps
steps:
- checkout
- run: git submodule sync
- run: git submodule update --init
- run:
name: Configure conda
command: |
Expand All @@ -89,6 +93,8 @@ references:
gallery-steps: &gallery-steps
steps:
- checkout
- run: git submodule sync
- run: git submodule update --init
- restore_cache:
keys:
- ophys-data-cache
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "src/pynwb/nwb-schema"]
path = src/pynwb/nwb-schema
url = http://github.com/NeurodataWithoutBorders/nwb-schema.git
3 changes: 3 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ jobs:

steps:

- checkout: self
submodules: true

- task: UsePythonVersion@0
inputs:
versionSpec: '$(pythonVersion)'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
pkgs = find_packages('src', exclude=['data'])
print('found these packages:', pkgs)

schema_dir = 'data'
schema_dir = 'nwb-schema/core'

reqs_re = re.compile("[<=>]+")
with open('requirements.txt', 'r') as fp:
Expand Down
2 changes: 1 addition & 1 deletion src/pynwb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def __get_resources():
from pkg_resources import resource_filename
from os.path import join
ret = dict()
ret['namespace_path'] = join(resource_filename(__name__, 'data'), __core_ns_file_name)
ret['namespace_path'] = join(resource_filename(__name__, 'nwb-schema/core'), __core_ns_file_name)
return ret


Expand Down
306 changes: 0 additions & 306 deletions src/pynwb/data/nwb.base.yaml

This file was deleted.

Loading

0 comments on commit 1ecefca

Please sign in to comment.