Merge branch 'dvc-gdrive3' of https://github.com/nickdelgrosso/suite2p …

…into nickdelgrosso-dvc-gdrive3

.dvc/.gitignore

@@ -1,12 +1,9 @@
-/config.local
-/updater
-/lock
-/updater.lock
-/state-journal
-/state-wal
-/state
-/cache
-/tmp
-/tmp
-/tmp
-/tmp
+/config.local
+/cache
+/updater
+/lock
+/updater.lock
+/state-journal
+/state-wal
+/state
+/tmp

.dvc/config

@@ -1,6 +1,14 @@
 [core]
-    remote = gdrive2
+    remote = gdrive3
 ['remote "local"']
     url = ../../suite2p_data
-['remote "gdrive2"']
-    url = gdrive://1BH9yQf735uGMGyoGrPJ_HgxtwxEsVCGp
+['remote "gdrive3"']
+    url = gdrive://0ACw_QYaWTX7mUk9PVA
+    gdrive_client_id = 81639168383-ardpa0rrsolgo9geqekdeef5k78n3hh2.apps.googleusercontent.com
+    gdrive_client_secret = _2kMgM7BoFg27ID9zSNmdpy_
+    gdrive_user_credentials_file = tmp/gdrive-user-credentials.json
+['remote "gdrive-travis"']
+    url = gdrive://0ACw_QYaWTX7mUk9PVA
+    gdrive_use_service_account = true
+    gdrive_service_account_email = [email protected]
+    gdrive_service_account_p12_file_path = .dvc/creds/suite2p-testdata-dvc-b0d23791539c.p12

.dvc/plots/confusion.json

@@ -0,0 +1,30 @@
+{
+    "$schema": "https://vega.github.io/schema/vega-lite/v4.json",
+    "data": {
+        "values": "<DVC_METRIC_DATA>"
+    },
+    "title": "<DVC_METRIC_TITLE>",
+    "mark": "rect",
+    "encoding": {
+        "x": {
+            "field": "<DVC_METRIC_X>",
+            "type": "nominal",
+            "sort": "ascending",
+            "title": "<DVC_METRIC_X_LABEL>"
+        },
+        "y": {
+            "field": "<DVC_METRIC_Y>",
+            "type": "nominal",
+            "sort": "ascending",
+            "title": "<DVC_METRIC_Y_LABEL>"
+        },
+        "color": {
+            "aggregate": "count",
+            "type": "quantitative"
+        },
+        "facet": {
+            "field": "rev",
+            "type": "nominal"
+        }
+    }
+}

.dvc/plots/default.json

@@ -0,0 +1,29 @@
+{
+    "$schema": "https://vega.github.io/schema/vega-lite/v4.json",
+    "data": {
+        "values": "<DVC_METRIC_DATA>"
+    },
+    "title": "<DVC_METRIC_TITLE>",
+    "mark": {
+        "type": "line"
+    },
+    "encoding": {
+        "x": {
+            "field": "<DVC_METRIC_X>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_X_LABEL>"
+        },
+        "y": {
+            "field": "<DVC_METRIC_Y>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_Y_LABEL>",
+            "scale": {
+                "zero": false
+            }
+        },
+        "color": {
+            "field": "rev",
+            "type": "nominal"
+        }
+    }
+}

.dvc/plots/scatter.json

@@ -0,0 +1,27 @@
+{
+    "$schema": "https://vega.github.io/schema/vega-lite/v4.json",
+    "data": {
+        "values": "<DVC_METRIC_DATA>"
+    },
+    "title": "<DVC_METRIC_TITLE>",
+    "mark": "point",
+    "encoding": {
+        "x": {
+            "field": "<DVC_METRIC_X>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_X_LABEL>"
+        },
+        "y": {
+            "field": "<DVC_METRIC_Y>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_Y_LABEL>",
+            "scale": {
+                "zero": false
+            }
+        },
+        "color": {
+            "field": "rev",
+            "type": "nominal"
+        }
+    }
+}

.dvc/plots/smooth.json

@@ -0,0 +1,39 @@
+{
+    "$schema": "https://vega.github.io/schema/vega-lite/v4.json",
+    "data": {
+        "values": "<DVC_METRIC_DATA>"
+    },
+    "title": "<DVC_METRIC_TITLE>",
+    "mark": {
+        "type": "line"
+    },
+    "encoding": {
+        "x": {
+            "field": "<DVC_METRIC_X>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_X_LABEL>"
+        },
+        "y": {
+            "field": "<DVC_METRIC_Y>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_Y_LABEL>",
+            "scale": {
+                "zero": false
+            }
+        },
+        "color": {
+            "field": "rev",
+            "type": "nominal"
+        }
+    },
+    "transform": [
+        {
+            "loess": "<DVC_METRIC_Y>",
+            "on": "<DVC_METRIC_X>",
+            "groupby": [
+                "rev"
+            ],
+            "bandwidth": 0.3
+        }
+    ]
+}

.gitignore

@@ -65,3 +65,6 @@ doctrees/
 Network Trash Folder
 Temporary Items
 .apdisk
+
+# data
+data/test_data

.travis.yml

@@ -25,7 +25,7 @@ install:
 - conda env create -f environment.yml
 - source activate suite2p
 - pip install .[data]
-- dvc pull
+- dvc pull -r gdrive-travis
 - pip install coveralls
 script:
 - coverage run --source=suite2p setup.py test

README.md

@@ -58,7 +58,9 @@ The software has been heavily tested on Windows 10 and Ubuntu 18.04, and less we
 2. Run `conda env create -f environment.yml`
 3. To activate this new environment, run `conda activate suite2p` (you will have to activate every time you want to run suite2p)
 4. Install the local version of suite2p into this environment in develop mode, with everything to get test data: `pip install .[data]`
-5. Download the data: ``dvc pull``. Follow the authentication instructions in the output.
+5. Download the data: ``dvc pull``. Follow the authentication instructions in the output.  
+   a. (**Note**: do *not* commit the json credentials file that comes out afterwards, git should ignore it.)
+   b. if you only wan to download the data, you can download from the read-only remote with this command: ``dvc pull -r gdrive-travis``
 6. Run tests: `python setup.py test`
 
 

data/test_data.dvc

@@ -0,0 +1,3 @@
+outs:
+- md5: 484b58990efd6929863cd77108f68ab0.dir
+  path: test_data