Merge branch 'master' of https://github.com/PennBBL/fw-heudiconv

.circleci/config.yml

@@ -27,6 +27,7 @@ jobs:
             conda info -a
             conda create -n flywheel python=3.7
             source activate flywheel
+<<<<<<< HEAD
 
             # Add nodejs and the validator
             mkdir -p /tmp/validator
@@ -35,6 +36,13 @@ jobs:
             sudo npm install -g yarn --unsafe-perm=true --allow-root
             sudo npm install -g bids-validator --unsafe-perm=true --allow-root
             # install fw cli https://storage.googleapis.com/flywheel-dist/cli/14.4.4/fw-linux_amd64-14.4.4.zip
+=======
+            #conda install -c conda-forge -y datalad
+            # Add nodejs and the validator
+            conda install nodejs
+            npm install -g yarn && \
+            npm install -g [email protected]
+>>>>>>> 451d0170cd190ca6cceb86def6dc51bc45a73802
             cd /tmp
             mkdir -p /tmp/fw_cli && \
             cd /tmp/fw_cli

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "python.pythonPath": "/opt/miniconda3/envs/flywheel/bin/python"
+    "python.pythonPath": "/opt/miniconda3/envs/flywheel/bin/python",
+    "restructuredtext.confPath": "${workspaceFolder}/docs/source"
 }

release.sh

@@ -14,6 +14,7 @@ echo Building docker image:
 echo docker build -t pennbbl/fw-heudiconv:$VERSION .
 
 docker build -t pennbbl/fw-heudiconv:$VERSION .
+docker push pennbbl/fw-heudiconv:$VERSION
 
 echo Testing local help call...
 
@@ -28,7 +29,11 @@ fi
 echo Uploading to pip...
 
 python setup.py sdist
+<<<<<<< HEAD
 twine upload dist/* --skip-existing
+=======
+twine upload --skip-existing dist/*
+>>>>>>> 451d0170cd190ca6cceb86def6dc51bc45a73802
 
 echo Uploading gear...