Merged with master and updated eslint

makebrainwaves · Mar 31, 2019 · b7c4ad1 · b7c4ad1
2 parents f0caba2 + 993d0e3
commit b7c4ad1
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 167 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -24,6 +24,7 @@
     "no-use-before-define": "off",
     "no-multi-assign": "off",
     "no-plusplus": "off",
+    "no-param-reassign": "warn",
     "promise/param-names": "error",
     "promise/always-return": "error",
     "promise/catch-or-return": "error",

diff --git a/.gitignore b/.gitignore
@@ -90,3 +90,4 @@ main.js.map
 
 .idea
 npm-debug.log.*
+keys.js
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/environment.yml b/environment.yml
@@ -4,45 +4,12 @@ channels:
 dependencies:
 - python>=3.6
 - pip
-- mkl
 - numpy
 - scipy
 - matplotlib
 - pyqt>=5.9
-- vtk>=8
 - pandas
-- scikit-learn
-- h5py
-- pillow
-- statsmodels
-- jupyter
-- pytest
-- pytest-cov
-- sphinx
-- joblib
-- psutil
-- numpydoc
-- flake8
-- spyder
-- numexpr
-- traits>=4.6.0
-- pyface>=6
-- traitsui>=6
 - seaborn
 - jupyter
 - pip:
   - mne
-  - pyriemann
-  - mayavi
-  - "https://api.github.com/repos/nipy/PySurfer/zipball/master"
-  - nitime
-  - nibabel
-  - nilearn
-  - neo
-  - pytest-sugar
-  - pytest-faulthandler
-  - pydocstyle
-  - sphinx_bootstrap_theme
-  - "https://api.github.com/repos/sphinx-gallery/sphinx-gallery/zipball/master"
-  - python-picard
-  - sphinx_fontawesome