Merge remote-tracking branch 'upstream/master' into consistent-entities

Author: effigies

.travis.yml

@@ -39,6 +39,12 @@ matrix:
       env:
         - PYTHON_VERSION=3.7
         - MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh"
+  allow_failures:
+    - os: osx
+      language: generic
+      env:
+        - PYTHON_VERSION=3.5
+        - MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh"
 
 before_install:
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then

bids/__init__.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import, division, print_function
 from .due import due, Doi
-from .layout import BIDSLayout, BIDSValidator
+from .layout import BIDSLayout
+
+# For backwards compatibility
+from bids_validator import BIDSValidator
 
 
 __all__ = [

bids/layout/__init__.py

@@ -1,4 +1,5 @@
 from .layout import BIDSLayout, add_config_paths
-from .validation import BIDSValidator
+# Backwards compatibility
+from bids_validator import BIDSValidator
 
 __all__ = ["BIDSLayout", "BIDSValidator", "add_config_paths"]