Merge remote-tracking branch 'origin/dev'

plotly · Sep 19, 2019 · 5b30bad · 5b30bad
2 parents cdbf2be + 009c345
commit 5b30bad
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -106,8 +106,8 @@ jobs:
           name: ️️🏗️ build core
           command: |
               . venv/bin/activate && pip install --upgrade -e . --quiet && mkdir packages
-              cd dash-renderer && renderer build && pip uninstall -y dash-renderer &&  pip install -e . && python setup.py sdist && mv dist/* ../packages/ && cd ..
               python setup.py sdist && mv dist/* packages/
+              cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
               git clone --depth 1 https://github.com/plotly/dash-core-components.git
               cd dash-core-components && npm install --ignore-scripts && npm run build && python setup.py sdist && mv dist/* ../packages/  && cd ..
               git clone --depth 1 https://github.com/plotly/dash-renderer-test-components
@@ -201,7 +201,7 @@ jobs:
           name: 🧪 Run Integration Tests
           command: |
             . venv/bin/activate && cd packages && ls -la
-            find . -name "*.gz" | xargs pip install --force-reinstall && pip list | grep dash && cd ..
+            find . -name "*.gz" | xargs pip install --ignore-installed && pip list | grep dash && cd ..
             TESTFILES=$(circleci tests glob "tests/integration/**/test_*.py" | circleci tests split --split-by=timings)
             pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml ${TESTFILES}
       - store_artifacts:

diff --git a/dash-renderer/package-lock.json b/dash-renderer/package-lock.json
diff --git a/dash/CHANGELOG.md b/dash/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.3.1] - 2019-09-19
+### Changed
+- Bumped dash-core-components version from 1.2.0 to [1.2.1](https://github.com/plotly/dash-core-components/blob/master/CHANGELOG.md#120---2019-09-19)
+
 ## [1.3.0] - 2019-09-17
 ### Added
 - [#923](https://github.com/plotly/dash/pull/923) Adds one configuration `--percy-assets` in `pytest` to specify extra application assets path if needed

diff --git a/dash/resources.py b/dash/resources.py
@@ -39,10 +39,14 @@ def _filter_resources(self, all_resources, dev_bundles=False):
                 filtered_resource['asset_path'] = s['asset_path']
                 filtered_resource['ts'] = info.st_mtime
             elif self.config.serve_locally:
-                warnings.warn(
-                    'A local version of {} is not available'.format(
-                        s['external_url']
-                    )
+                warnings.warn((
+                    'You have set your config to `serve_locally=True` but '
+                    'A local version of {} is not available.\n'
+                    'If you added this file with `app.scripts.append_script` '
+                    'or `app.css.append_css`, use `external_scripts` '
+                    'or `external_stylesheets` instead.\n'
+                    'See https://dash.plot.ly/external-resources'
+                    ).format(s['external_url'])
                 )
                 continue
             else:

diff --git a/dash/version.py b/dash/version.py
@@ -1 +1 @@
-__version__ = '1.3.0'
+__version__ = '1.3.1'
diff --git a/requires-install.txt b/requires-install.txt
@@ -2,7 +2,7 @@ Flask>=1.0.2
 flask-compress
 plotly
 dash_renderer==1.1.0
-dash-core-components==1.2.0
+dash-core-components==1.2.1
 dash-html-components==1.0.1
 dash-table==4.3.0
 future