Merge remote-tracking branch 'openbci/master'

.travis.yml

@@ -39,6 +39,7 @@ install:
   - sudo pip3 install cmake==3.13.3
   - sudo -H pip3 install --upgrade setuptools wheel virtualenv
   - sudo -H pip3 install $TRAVIS_BUILD_DIR/emulator
+  - sudo -H pip3 install awscli
   # R disabled. It's taking up too much time in CI
   # # install required packages for R
   # - sudo -H R --vanilla -e 'install.packages("knitr", repos="http://cran.us.r-project.org")'
@@ -173,7 +174,6 @@ script:
   - cd $TRAVIS_BUILD_DIR/java-package/brainflow && mvn exec:java -Dexec.mainClass="brainflow.examples.Transforms"
 
 after_success:
-  - sudo -H pip3 install awscli
   # push libraries from docker!
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
       aws s3 cp $TRAVIS_BUILD_DIR/installed_docker/lib/ s3://brainflow/$TRAVIS_COMMIT/$TRAVIS_OS_NAME --recursive ;

docs/notebooks/brainflow_mne.ipynb

@@ -25,11 +25,8 @@
     "import brainflow\n",
     "from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds\n",
     "\n",
-    "from mne.viz.topomap import _prepare_topo_plot, plot_topomap\n",
     "import mne\n",
-    "from mne.channels import read_layout\n",
-    "\n",
-    "from mpl_toolkits.axes_grid1 import make_axes_locatable"
+    "from mne.channels import read_layout"
    ]
   },
   {
@@ -98,7 +95,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.4"
   },
   "pycharm": {
    "stem_cell": {

python-package/brainflow/board_shim.py

@@ -124,6 +124,7 @@ def __init__ (self):
             if platform.system () == 'Darwin':
                 os.environ['DYLD_LIBRARY_PATH '] = dir_path + os.pathsep + os.environ.get ('DYLD_LIBRARY_PATH ', '')
                 os.environ['DYLD_FALLBACK_LIBRARY_PATH '] = dir_path + os.pathsep + os.environ.get ('DYLD_FALLBACK_LIBRARY_PATH ', '')
+                ctypes.cdll.LoadLibrary (pkg_resources.resource_filename (__name__, 'lib/libneurosdk-shared.dylib'))
             self.lib = ctypes.cdll.LoadLibrary (full_path)
         else:
             raise FileNotFoundError ('Dynamic library %s is missed, did you forget to compile brainflow before installation of python package?' % full_path)

tests/python/brainflow_to_mne.py

@@ -8,12 +8,9 @@
 import brainflow
 from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds
 
-from mne.viz.topomap import _prepare_topo_plot, plot_topomap
 import mne
 from mne.channels import read_layout
 
-from mpl_toolkits.axes_grid1 import make_axes_locatable
-
 
 def main():
     BoardShim.enable_dev_board_logger ()