Skip to content

Commit 5b30bad

Browse files
author
Marc-André Rivet
committed
Merge remote-tracking branch 'origin/dev'
2 parents cdbf2be + 009c345 commit 5b30bad

File tree

6 files changed

+32
-24
lines changed

6 files changed

+32
-24
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ jobs:
106106
name: ️️🏗️ build core
107107
command: |
108108
. venv/bin/activate && pip install --upgrade -e . --quiet && mkdir packages
109-
cd dash-renderer && renderer build && pip uninstall -y dash-renderer && pip install -e . && python setup.py sdist && mv dist/* ../packages/ && cd ..
110109
python setup.py sdist && mv dist/* packages/
110+
cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
111111
git clone --depth 1 https://github.com/plotly/dash-core-components.git
112112
cd dash-core-components && npm install --ignore-scripts && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd ..
113113
git clone --depth 1 https://github.com/plotly/dash-renderer-test-components
@@ -201,7 +201,7 @@ jobs:
201201
name: 🧪 Run Integration Tests
202202
command: |
203203
. venv/bin/activate && cd packages && ls -la
204-
find . -name "*.gz" | xargs pip install --force-reinstall && pip list | grep dash && cd ..
204+
find . -name "*.gz" | xargs pip install --ignore-installed && pip list | grep dash && cd ..
205205
TESTFILES=$(circleci tests glob "tests/integration/**/test_*.py" | circleci tests split --split-by=timings)
206206
pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml ${TESTFILES}
207207
- store_artifacts:

dash-renderer/package-lock.json

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dash/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [1.3.1] - 2019-09-19
2+
### Changed
3+
- 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)
4+
15
## [1.3.0] - 2019-09-17
26
### Added
37
- [#923](https://github.com/plotly/dash/pull/923) Adds one configuration `--percy-assets` in `pytest` to specify extra application assets path if needed

dash/resources.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,14 @@ def _filter_resources(self, all_resources, dev_bundles=False):
3939
filtered_resource['asset_path'] = s['asset_path']
4040
filtered_resource['ts'] = info.st_mtime
4141
elif self.config.serve_locally:
42-
warnings.warn(
43-
'A local version of {} is not available'.format(
44-
s['external_url']
45-
)
42+
warnings.warn((
43+
'You have set your config to `serve_locally=True` but '
44+
'A local version of {} is not available.\n'
45+
'If you added this file with `app.scripts.append_script` '
46+
'or `app.css.append_css`, use `external_scripts` '
47+
'or `external_stylesheets` instead.\n'
48+
'See https://dash.plot.ly/external-resources'
49+
).format(s['external_url'])
4650
)
4751
continue
4852
else:

dash/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.3.0'
1+
__version__ = '1.3.1'

requires-install.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Flask>=1.0.2
22
flask-compress
33
plotly
44
dash_renderer==1.1.0
5-
dash-core-components==1.2.0
5+
dash-core-components==1.2.1
66
dash-html-components==1.0.1
77
dash-table==4.3.0
88
future

0 commit comments

Comments
 (0)