incf-nidash · cmaumet · Mar 14, 2017 · Mar 14, 2017 · Mar 14, 2017 · Mar 14, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,6 @@ python:
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: 
  - pip install --upgrade setuptools
-  # Install nidmresults from source in GitHub repo
- - pip install --upgrade --no-deps git+https://github.com/cmaumet/nidmresults.git@json_ld#egg=nidmresults
  - pip install -r requirements.txt
  # command to run tests, e.g. python setup.py test
 script:  

diff --git a/exporter/spm_results_nidm.m b/exporter/spm_results_nidm.m
@@ -342,7 +342,7 @@
 pp.add_namespace('niiri','http://iri.nidash.org/');
 pp.add_namespace('spm','http://purl.org/nidash/spm#');
 pp.add_namespace('neurolex','http://neurolex.org/wiki/');
-pp.add_namespace('crypto','http://id.loc.gov/vocabulary/preservation/cryptographicHashFunctions#');
+pp.add_namespace('crypto','http://id.loc.gov/vocabulary/preservation/cryptographicHashFunctions/');
 pp.add_namespace('dct','http://purl.org/dc/terms/');
 pp.add_namespace('nfo','http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#');
 pp.add_namespace('dc','http://purl.org/dc/elements/1.1/');

diff --git a/spmexport/ex_spm_HRF_informed_basis/nidm.jsonld b/spmexport/ex_spm_HRF_informed_basis/nidm.jsonld
diff --git a/spmexport/ex_spm_HRF_informed_basis/nidm.ttl b/spmexport/ex_spm_HRF_informed_basis/nidm.ttl
diff --git a/spmexport/ex_spm_con_f/nidm.jsonld b/spmexport/ex_spm_con_f/nidm.jsonld
diff --git a/spmexport/ex_spm_con_f/nidm.ttl b/spmexport/ex_spm_con_f/nidm.ttl
diff --git a/spmexport/ex_spm_conjunction/nidm.jsonld b/spmexport/ex_spm_conjunction/nidm.jsonld
diff --git a/spmexport/ex_spm_conjunction/nidm.ttl b/spmexport/ex_spm_conjunction/nidm.ttl
diff --git a/spmexport/ex_spm_contrast_mask/nidm.jsonld b/spmexport/ex_spm_contrast_mask/nidm.jsonld
diff --git a/spmexport/ex_spm_contrast_mask/nidm.ttl b/spmexport/ex_spm_contrast_mask/nidm.ttl
diff --git a/spmexport/ex_spm_default/nidm.jsonld b/spmexport/ex_spm_default/nidm.jsonld
diff --git a/spmexport/ex_spm_default/nidm.ttl b/spmexport/ex_spm_default/nidm.ttl
diff --git a/spmexport/ex_spm_full_example001/nidm.jsonld b/spmexport/ex_spm_full_example001/nidm.jsonld
diff --git a/spmexport/ex_spm_full_example001/nidm.ttl b/spmexport/ex_spm_full_example001/nidm.ttl
diff --git a/spmexport/ex_spm_group_ols/nidm.jsonld b/spmexport/ex_spm_group_ols/nidm.jsonld
diff --git a/spmexport/ex_spm_group_ols/nidm.ttl b/spmexport/ex_spm_group_ols/nidm.ttl
diff --git a/spmexport/ex_spm_group_wls/nidm.jsonld b/spmexport/ex_spm_group_wls/nidm.jsonld
diff --git a/spmexport/ex_spm_group_wls/nidm.ttl b/spmexport/ex_spm_group_wls/nidm.ttl
diff --git a/spmexport/ex_spm_hrf_fir/nidm.jsonld b/spmexport/ex_spm_hrf_fir/nidm.jsonld
diff --git a/spmexport/ex_spm_hrf_fir/nidm.ttl b/spmexport/ex_spm_hrf_fir/nidm.ttl
diff --git a/spmexport/ex_spm_non_sphericity/nidm.jsonld b/spmexport/ex_spm_non_sphericity/nidm.jsonld
diff --git a/spmexport/ex_spm_non_sphericity/nidm.ttl b/spmexport/ex_spm_non_sphericity/nidm.ttl
diff --git a/spmexport/ex_spm_partial_conjunction/nidm.jsonld b/spmexport/ex_spm_partial_conjunction/nidm.jsonld
diff --git a/spmexport/ex_spm_partial_conjunction/nidm.ttl b/spmexport/ex_spm_partial_conjunction/nidm.ttl
diff --git a/spmexport/ex_spm_temporal_derivative/nidm.jsonld b/spmexport/ex_spm_temporal_derivative/nidm.jsonld
diff --git a/spmexport/ex_spm_temporal_derivative/nidm.ttl b/spmexport/ex_spm_temporal_derivative/nidm.ttl
diff --git a/spmexport/ex_spm_thr_clustfwep05/nidm.jsonld b/spmexport/ex_spm_thr_clustfwep05/nidm.jsonld
diff --git a/spmexport/ex_spm_thr_clustfwep05/nidm.ttl b/spmexport/ex_spm_thr_clustfwep05/nidm.ttl
diff --git a/spmexport/ex_spm_thr_clustunck10/nidm.jsonld b/spmexport/ex_spm_thr_clustunck10/nidm.jsonld
diff --git a/spmexport/ex_spm_thr_clustunck10/nidm.ttl b/spmexport/ex_spm_thr_clustunck10/nidm.ttl
diff --git a/spmexport/ex_spm_thr_voxelfdrp05/nidm.jsonld b/spmexport/ex_spm_thr_voxelfdrp05/nidm.jsonld
diff --git a/spmexport/ex_spm_thr_voxelfdrp05/nidm.ttl b/spmexport/ex_spm_thr_voxelfdrp05/nidm.ttl
diff --git a/spmexport/ex_spm_thr_voxelfwep05/nidm.jsonld b/spmexport/ex_spm_thr_voxelfwep05/nidm.jsonld
diff --git a/spmexport/ex_spm_thr_voxelfwep05/nidm.ttl b/spmexport/ex_spm_thr_voxelfwep05/nidm.ttl
diff --git a/spmexport/ex_spm_thr_voxelunct4/nidm.jsonld b/spmexport/ex_spm_thr_voxelunct4/nidm.jsonld
diff --git a/spmexport/ex_spm_thr_voxelunct4/nidm.ttl b/spmexport/ex_spm_thr_voxelunct4/nidm.ttl