Update circle.

Author: T4rk1n

.circleci/config.yml

@@ -0,0 +1,74 @@
+version: 2
+
+jobs:
+  "python-2.7": &test-template
+    docker:
+      - image: circleci/python:2.7-stretch-node-browsers
+        environment:
+          PYTHON_VERSION: py27
+
+    steps:
+      - checkout
+
+      - run:
+          name: Create virtual env
+          command: python -m venv || virtualenv venv
+
+      - run:
+          name: Write job name
+          command: echo $CIRCLE_JOB > circlejob.txt
+
+      - restore_cache:
+          key: deps1-{{ .Branch }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }}
+
+      - run:
+          name: Install dependencies
+          command: |
+              sudo pip install virtualenv --upgrade
+              . venv/bin/activate
+              pip install -r requirements-dev.txt
+              npm install --ignore-scripts
+
+      - save_cache:
+          key: deps1-{{ .Branch }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }}
+          paths:
+              - "venv"
+              - "node_modules"
+      - run:
+          name: Build
+          command: |
+              . venv/bin/activate
+              npm run build:js
+              npm run build:py
+
+      - run:
+          name: Run tests
+          command: |
+              npm run test
+              . venv/bin/activate
+              python --version
+              python -m unittest test.test_integration
+              python -m unittest test.test_dash_import
+
+  "python-3.6":
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.6-stretch-node-browsers
+        environment:
+          PYTHON_VERSION: py36
+
+  "python-3.7":
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.7-stretch-node-browsers
+        environment:
+          PYTHON_VERSION: py37
+
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - "python-2.7"
+      - "python-3.6"
+      - "python-3.7"

circle.yml

@@ -0,0 +1,77 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const reactDocs = require('react-docgen');
+
+const componentPaths = process.argv.slice(2);
+if (!componentPaths.length) {
+    help();
+    process.exit(1);
+}
+
+const metadata = Object.create(null);
+componentPaths.forEach(componentPath =>
+    collectMetadataRecursively(componentPath)
+);
+writeOut(metadata);
+
+function help() {
+    console.error('usage: ');
+    console.error(
+        'extract-meta path/to/component(s) ' +
+            ' [path/to/more/component(s), ...] > metadata.json'
+    );
+}
+
+function writeError(msg, filePath) {
+    if (filePath) {
+        process.stderr.write(`Error with path ${filePath}`);
+    }
+
+    process.stderr.write(msg + '\n');
+    if (msg instanceof Error) {
+        process.stderr.write(msg.stack + '\n');
+    }
+}
+
+function parseFile(filepath) {
+    const urlpath = filepath.split(path.sep).join('/');
+    let src;
+
+    if (!['.jsx', '.js'].includes(path.extname(filepath))) {
+        return;
+    }
+
+    try {
+        src = fs.readFileSync(filepath);
+        metadata[urlpath] = reactDocs.parse(src);
+    } catch (error) {
+        writeError(error, filepath);
+    }
+}
+
+function collectMetadataRecursively(componentPath) {
+    if (fs.lstatSync(componentPath).isDirectory()) {
+        let dirs;
+        try {
+            dirs = fs.readdirSync(componentPath);
+        } catch (error) {
+            writeError(error, componentPath);
+        }
+        dirs.forEach(filename => {
+            const filepath = path.join(componentPath, filename);
+            if (fs.lstatSync(filepath).isDirectory()) {
+                collectMetadataRecursively(filepath);
+            } else {
+                parseFile(filepath);
+            }
+        });
+    } else {
+        parseFile(componentPath);
+    }
+}
+
+function writeOut(result) {
+    console.log(JSON.stringify(result, '\t', 2));
+}

extract-meta

@@ -17,17 +17,25 @@
     "publish-all": "npm publish && python setup.py sdist upload",
     "publish-pypi": "npm run prepublish && python setup.py sdist && twine upload --sign --skip-existing",
     "start": "./node_modules/.bin/builder run build-dev",
-    "test": "./node_modules/.bin/eslint --fix .",
+    "test": "./node_modules/.bin/eslint --fix src",
     "test-watch": "./node_modules/.bin/builder run test-frontend-watch",
     "test-debug": "./node_modules/.bin/builder run test-frontend-debug",
-    "uninstall-local": "pip uninstall dash-core-components -y"
+    "uninstall-local": "pip uninstall dash-core-components -y",
+    "build:js": "webpack --mode production",
+    "build:py": "node ./extract-meta src/components > dash_core_components/metadata.json && copyfiles package.json dash_core_components"
   },
   "author": "Chris Parmer <[email protected]>",
   "license": "MIT",
   "dependencies": {
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^8.2.3",
+    "babel-loader": "^7.1.4",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-react": "^6.24.1",
     "builder": "3.2.2",
     "copyfiles": "^2.0.0",
     "cross-env": "^5.2.0",
+    "css-loader": "^0.28.11",
     "dash-components-archetype": "^0.3.0-rc1",
     "moment": "^2.20.1",
     "prop-types": "^15.6.0",
@@ -42,7 +50,12 @@
     "react-select-fast-filter-options": "^0.2.2",
     "react-syntax-highlighter": "^5.0.0",
     "react-virtualized-select": "^3.1.0",
-    "styled-jsx": "^2.2.6"
+    "react-docgen": "^2.20.1",
+    "style-loader": "^0.21.0",
+    "styled-jsx": "^2.2.6",
+    "webpack": "^4.8.3",
+    "webpack-cli": "^2.1.3",
+    "webpack-serve": "^1.0.2"
   },
   "devDependencies": {
     "component-playground": "^2.0.0",

package.json

@@ -6,9 +6,9 @@ cffi==1.10.0
 chardet==3.0.4
 click==6.7
 cryptography==2.0.3
-dash==0.23.1
-dash-core-components==0.13.0rc8
-dash-html-components==0.7.0
+dash==0.25.1
+dash_core_components==0.27.1
+dash_html_components==0.12.0rc3
 dash-renderer==0.12.0rc1
 dash-table-experiments==0.5.0
 decorator==4.1.2
@@ -17,7 +17,6 @@ Flask==0.12.2
 Flask-Compress==1.4.0
 Flask-SeaSurf==0.2.2
 funcsigs==1.0.2
-functools32==3.2.3.post2
 idna==2.6
 ipaddress==1.0.18
 ipdb==0.10.3
@@ -31,7 +30,7 @@ loremipsum==1.0.5
 MarkupSafe==1.0
 mock==2.0.0
 nbformat==4.4.0
-numpy==1.13.1
+numpy
 pandas==0.20.3
 pathlib2==2.3.0
 pbr==3.1.1

requirements-locked.txt

@@ -44,6 +44,7 @@ def tearDown(self):
             requests.get('http://localhost:8050/stop')
         else:
             self.server_process.terminate()
+        self.driver.back()
         time.sleep(3)
 
     def startServer(self, app):
@@ -64,7 +65,8 @@ def run():
             app.run_server(
                 port=8050,
                 debug=False,
-                processes=processes
+                processes=processes,
+                threaded=False,
             )
 
         def run_windows():
@@ -97,7 +99,7 @@ def _stop_server_windows():
 
         # Visit the dash page
         self.driver.get('http://localhost:8050')
-        time.sleep(0.5)
+        self.driver.implicitly_wait(2)
 
         # Inject an error and warning logger
         logger = '''

src/components/__tests__/.eslintrc

@@ -254,7 +254,7 @@ def test_gallery(self):
             ),
 
             html.Label('Vertical Tabs'),
-            dcc.Tabs(id="tabs", vertical=True, children=[
+            dcc.Tabs(id="tabs1", vertical=True, children=[
                 dcc.Tab(label='Tab one', children=[
                     html.Div(['Test'])
                 ]),
@@ -607,6 +607,8 @@ def display_page(pathname):
 
         self.startServer(app=app)
 
+        time.sleep(2)
+
         #callback is called twice when defined
         self.assertEqual(
             call_count.value,
@@ -631,7 +633,7 @@ def display_page(pathname):
         #test if callback is only fired once (offset of 2)
         self.assertEqual(
             call_count.value,
-            2 + 1
+            3
         )
 
     def test_candlestick(self):
@@ -742,7 +744,8 @@ def _on_confirmed(submit_n_clicks, cancel_n_clicks,
                 if not submit_n_clicks and not cancel_n_clicks:
                     return ''
                 count.value += 1
-                if submit_timestamp > cancel_timestamp:
+                if (submit_timestamp and cancel_timestamp is None) or\
+                        (submit_timestamp > cancel_timestamp):
                     return 'confirmed'
                 else:
                     return 'canceled'

src/components/__tests__/DropDown.test.js

@@ -0,0 +1,41 @@
+const path = require('path');
+const packagejson = require('./package.json');
+
+const dashLibraryName = packagejson.name.replace(/-/g, '_');
+
+module.exports = {
+    entry: {main: './src/index.js'},
+    output: {
+        path: path.resolve(__dirname, dashLibraryName),
+        filename: 'bundle.js',
+        library: dashLibraryName,
+        libraryTarget: 'window'
+    },
+    externals: {
+        react: 'React',
+        'react-dom': 'ReactDOM',
+        'plotly.js': 'Plotly'
+    },
+    module: {
+        rules: [
+            {
+                test: /\.js$/,
+                exclude: /node_modules/,
+                use: {
+                    loader: 'babel-loader'
+                }
+            },
+            {
+                test: /\.css$/,
+                use: [
+                    {
+                        loader: 'style-loader'
+                    },
+                    {
+                        loader: 'css-loader'
+                    }
+                ]
+            }
+        ]
+    }
+};