From 7c8d4c6b37e582f188475f7e7b0bbdbcc8be8725 Mon Sep 17 00:00:00 2001 From: byron Date: Tue, 17 Sep 2019 14:05:31 -0400 Subject: [PATCH 1/7] try more --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 999f91d604..6dc0af4141 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -96,7 +96,7 @@ jobs: command: | sudo pip install --upgrade virtualenv python -m venv venv || virtualenv venv && . venv/bin/activate - sed -i '/dash-/d' requires-install.txt + sed -i '/dash/d' requires-install.txt pip install -e . -r requires-install.txt -r requires-dev.txt -r requires-testing.txt --quiet - save_cache: key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-dev.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }} @@ -106,7 +106,7 @@ 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 .. + cd dash-renderer && pip install -e . && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd .. python setup.py sdist && mv dist/* packages/ 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 .. From 4e6feb998f0300721b74fb2a7b092a3deddf9694 Mon Sep 17 00:00:00 2001 From: byron Date: Tue, 17 Sep 2019 14:19:35 -0400 Subject: [PATCH 2/7] use old renderer and upgrade --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6dc0af4141..2ada0e9f3a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -96,7 +96,7 @@ jobs: command: | sudo pip install --upgrade virtualenv python -m venv venv || virtualenv venv && . venv/bin/activate - sed -i '/dash/d' requires-install.txt + sed -i '/dash-/d' requires-install.txt pip install -e . -r requires-install.txt -r requires-dev.txt -r requires-testing.txt --quiet - save_cache: key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-dev.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }} @@ -106,8 +106,8 @@ jobs: name: ️️🏗️ build core command: | . venv/bin/activate && pip install --upgrade -e . --quiet && mkdir packages - cd dash-renderer && pip install -e . && renderer build && 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 --upgrade && 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: From 9d43c47a32f25537d57aad0e0244463e8c32d66e Mon Sep 17 00:00:00 2001 From: byron Date: Tue, 17 Sep 2019 14:28:43 -0400 Subject: [PATCH 3/7] use -I --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ada0e9f3a..ca682766a9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -201,7 +201,7 @@ jobs: name: 🧪 Run Integration Tests command: | . venv/bin/activate && cd packages && ls -la - find . -name "*.gz" | xargs pip install --upgrade && 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: From cb2d1b3e0368c95bb5c1565ca4c986dca97f396d Mon Sep 17 00:00:00 2001 From: alexcjohnson Date: Tue, 17 Sep 2019 20:47:31 -0400 Subject: [PATCH 4/7] elaborate about serve_locally warning and append_(scripts|css) --- dash/resources.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dash/resources.py b/dash/resources.py index 1c4574061d..a1853a51fd 100644 --- 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: From f676935eb50e6d2e626232c3dc8f5921d05f544d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Thu, 19 Sep 2019 08:38:07 -0400 Subject: [PATCH 5/7] loosen dash version requirements --- requires-install.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requires-install.txt b/requires-install.txt index 7b26a12201..44ac7b7dcc 100644 --- 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.0 dash-html-components==1.0.1 dash-table==4.3.0 future \ No newline at end of file From b0fd605883829e361aaee5fe783f39b73a89a59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Thu, 19 Sep 2019 08:59:24 -0400 Subject: [PATCH 6/7] bump version to 1.3.1 --- dash/CHANGELOG.md | 4 ++++ dash/version.py | 2 +- requires-install.txt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dash/CHANGELOG.md b/dash/CHANGELOG.md index 81e3fc37e8..f74fb37877 100644 --- 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/version.py b/dash/version.py index 19b4f1d605..72837bdc78 100644 --- 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 index 44ac7b7dcc..6ef7f4c2f3 100644 --- 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 \ No newline at end of file From 009c34507f95c0510287b0fe1df8ae0a2d2a89bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Thu, 19 Sep 2019 09:35:40 -0400 Subject: [PATCH 7/7] update lock --- dash-renderer/package-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dash-renderer/package-lock.json b/dash-renderer/package-lock.json index 13754acdf7..ed274e08ea 100644 --- a/dash-renderer/package-lock.json +++ b/dash-renderer/package-lock.json @@ -3935,9 +3935,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.260", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz", - "integrity": "sha512-wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ==", + "version": "1.3.262", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.262.tgz", + "integrity": "sha512-YFr53qZWr2pWkiTUorWEhAweujdf0ALiUp8VkNa0WGtbMVR+kZ8jNy3VTCemLsA4sT6+srCqehNn8TEAD0Ngrw==", "dev": true }, "elliptic": { @@ -4363,9 +4363,9 @@ } }, "eslint-plugin-prettier": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz", - "integrity": "sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz", + "integrity": "sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA==", "dev": true, "requires": { "prettier-linter-helpers": "^1.0.0" @@ -4478,9 +4478,9 @@ "dev": true }, "eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", + "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==", "dev": true }, "events": { @@ -6282,12 +6282,12 @@ "dev": true }, "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", + "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", "dev": true, "requires": { - "eventemitter3": "^3.0.0", + "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", "requires-port": "^1.0.0" } @@ -9370,9 +9370,9 @@ } }, "parse-asn1": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", - "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", + "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", "dev": true, "requires": { "asn1.js": "^4.0.0",