Merge branch 'master' into csweaver/readme-data

.travis.yml

@@ -9,7 +9,7 @@ install:
   - set -eo pipefail
   - pip install flake8 httpie
   - ./bin/build-client
-  - python setup.py install
+  - pip install -e .
 script:
   - set -eo pipefail
   - flake8 server/app/

README.md

@@ -41,7 +41,8 @@ Started in the context of the Human Cell Atlas Consortium, cellxgene hopes to bo
 
 **Install server**
 
-    python3 setup.py install
+
+     pip install -e .
 
 **Run (with demo data)**
 

client/package.json

@@ -36,7 +36,6 @@
     "gl-matrix": "^2.7.1",
     "halogen": "^0.2.0",
     "hsv2rgb": "^1.1.0",
-    "jest": "^23.4.1",
     "key-pressed": "0.0.1",
     "lodash": "^4.17.4",
     "luma.gl": "^4.0.3",
@@ -44,7 +43,7 @@
     "mouse-pressed": "^1.0.0",
     "orbit-camera": "^1.0.0",
     "query-string": "^5.0.0",
-    "react": "^16.4.1",
+    "react": "^16.4.2",
     "react-autocomplete": "^1.7.2",
     "react-dom": "^16.4.1",
     "react-helmet": "^5.2.0",
@@ -58,7 +57,6 @@
     "scroll-speed": "^1.0.0",
     "serve-favicon": "^2.3.0",
     "urijs": "^1.19.0",
-    "webpack-hot-middleware": "^2.22.3",
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
@@ -94,9 +92,9 @@
     "file-loader": "^0.9.0",
     "filesize": "^3.3.0",
     "gzip-size": "^3.0.0",
-    "html-webpack-inline-source-plugin": "0.0.6",
+    "html-webpack-inline-source-plugin": "0.0.10",
-    "html-webpack-plugin": "^2.22.0",
+    "html-webpack-plugin": "^3.2.0",
-    "jest": "^23.0.1",
+    "jest": "^23.4.1",
     "jsdom": "^9.4.1",
     "json-loader": "^0.5.4",
     "nyc": "^10.0.0",
@@ -111,8 +109,7 @@
     "web-app-manifest-loader": "^0.1.1",
     "webpack": "^2.2.0-rc.4",
     "webpack-dev-middleware": "^1.6.1",
-    "webpack-hot-middleware": "^2.12.2",
+    "webpack-hot-middleware": "^2.22.3"
-    "whatwg-fetch": "^2.0.1"
   },
   "jest": {
     "testMatch": [

client/src/components/categorical/categorical.js

@@ -164,7 +164,7 @@ class Category extends React.Component {
 }
 
 @connect(state => {
-  const ranges = _.get("state.cells.cells.data.ranges", null);
+  const ranges = _.get(state, "cells.cells.data.ranges", null);
 
   return {
     ranges

client/src/components/continuous/continuous.js

@@ -17,9 +17,9 @@ import HistogramBrush from "./histogramBrush";
 import { margin, width, height, createDimensions } from "./util";
 
 @connect(state => {
-  const ranges = _.get("state.cells.cells.data.ranges", null);
+  const ranges = _.get(state, "cells.cells.data.ranges", null);
-  const metadata = _.get("state.cells.cells.data.metadata", null);
+  const metadata = _.get(state, "cells.cells.data.metadata", null);
-  const initializeRanges = _.get("state.initialize.data.data.ranges", null);
+  const initializeRanges = _.get(state, "initialize.data.data.ranges", null);
 
   return {
     ranges,

client/src/components/continuous/histogramBrush.js

@@ -11,7 +11,7 @@ import FaPaintBrush from "react-icons/lib/fa/paint-brush";
 import * as globals from "../../globals";
 
 @connect(state => {
-  const initializeRanges = _.get("state.initialize.data.data.ranges", null);
+  const initializeRanges = _.get(state, "initialize.data.data.ranges", null);
 
   return {
     initializeRanges,
@@ -89,8 +89,7 @@ class HistogramBrush extends React.Component {
     const bins = this.histogramCache.bins;
     const numValues = this.histogramCache.numValues;
 
-    d3
+    d3.select(svgRef)
-      .select(svgRef)
       .insert("g", "*")
       .attr("fill", "#bbb")
       .selectAll("rect")

client/src/components/continuous/parallel.js

@@ -15,9 +15,9 @@ import drawLinesCanvas from "./drawLinesCanvas";
 import { margin, width, height, createDimensions } from "./util";
 
 @connect(state => {
-  const ranges = _.get("state.cells.cells.data.ranges", null);
+  const ranges = _.get(state, "cells.cells.data.ranges", null);
-  const metadata = _.get("state.cells.cells.data.metadata", null);
+  const metadata = _.get(state, "cells.cells.data.metadata", null);
-  const initializeRanges = _.get("state.initialize.data.data.ranges", null);
+  const initializeRanges = _.get(state, "initialize.data.data.ranges", null);
 
   return {
     ranges,

client/src/components/scatterplot/scatterplot.js

@@ -20,9 +20,9 @@ import { scaleLinear } from "../../util/scaleLinear";
 import { margin, width, height, createDimensions } from "./util";
 
 @connect(state => {
-  const ranges = _.get("state.cells.cells.data.ranges", null);
+  const ranges = _.get(state, "cells.cells.data.ranges", null);
-  const metadata = _.get("state.cells.cells.data.metadata", null);
+  const metadata = _.get(state, "cells.cells.data.metadata", null);
-  const initializeRanges = _.get("state.initialize.data.data.ranges", null);
+  const initializeRanges = _.get(state, "initialize.data.data.ranges", null);
 
   return {
     ranges,