From cecb4b3a340e57e3f970b150cb85e95dd5d9359e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 09:42:51 -0500 Subject: [PATCH 1/5] change `~` for `-` --- .config/webpack/base.js | 6 +++++- dash_table_base/__init__.py | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.config/webpack/base.js b/.config/webpack/base.js index b15636ed7..087c56d14 100644 --- a/.config/webpack/base.js +++ b/.config/webpack/base.js @@ -96,7 +96,11 @@ module.exports = (options = {}) => { name: true, cacheGroups: { async: { - + chunks: 'async', + minSize: 0, + name(module, chunks, cacheGroupKey) { + return `${cacheGroupKey}-${chunks[0].name}`; + } } } } diff --git a/dash_table_base/__init__.py b/dash_table_base/__init__.py index 8d83e1f1b..562a31187 100644 --- a/dash_table_base/__init__.py +++ b/dash_table_base/__init__.py @@ -37,20 +37,20 @@ _js_dist = [] _js_dist.extend([{ - 'relative_package_path': 'async~{}.js'.format(async_resource), + 'relative_package_path': 'async-{}.js'.format(async_resource), 'external_url': ( 'https://unpkg.com/dash-table@{}' - '/dash_table/async~{}.js' + '/dash_table/async-{}.js' ).format(__version__, async_resource), 'namespace': package_name, 'async': True } for async_resource in async_resources]) _js_dist.extend([{ - 'relative_package_path': 'async~{}.js.map'.format(async_resource), + 'relative_package_path': 'async-{}.js.map'.format(async_resource), 'external_url': ( 'https://unpkg.com/dash-table@{}' - '/dash_table/async~{}.js.map' + '/dash_table/async-{}.js.map' ).format(__version__, async_resource), 'namespace': package_name, 'dynamic': True From 2332aa26026bc5cc4027d658ae1a3914420b341f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 12:36:43 -0500 Subject: [PATCH 2/5] 3.6.9 server tests --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa94dacf3..fd41bd20c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: "server-test": docker: - - image: circleci/python:3.6-node-browsers + - image: circleci/python:3.6.9-node-browsers - image: cypress/base:10 steps: From cb5edf26fcff69da2e21e0e101af53b40eaa1572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 13:48:31 -0500 Subject: [PATCH 3/5] update manifest --- MANIFEST.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 3201355c4..a6eba2652 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,7 @@ include dash_table/bundle.js include dash_table/bundle.js.map -include dash_table/async~*.js -include dash_table/async~*.js.map +include dash_table/async-*.js +include dash_table/async-*.js.map include dash_table/metadata.json include dash_table/package-info.json include LICENSE From a814dca14f965b98023a4242e4211ded8af9805e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 19:59:51 -0500 Subject: [PATCH 4/5] install table from tarball, not local env --- .circleci/config.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fd41bd20c..867af1f79 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,9 @@ jobs: . venv/bin/activate npm run private::build:js-test npm run private::build:py - pip install -e . + python setup.py sdist + cd dist + find . -name "*.gz" | xargs pip install --no-cache-dir --ignore-installed && cd .. - run: name: Run tests @@ -225,7 +227,9 @@ jobs: command: | . venv/bin/activate npm run build - pip install -e . + python setup.py sdist + cd dist + find . -name "*.gz" | xargs pip install --no-cache-dir --ignore-installed && cd .. - run: name: ⚙️ run integration test From 0ed4296d77e1227d58a67f60da904c247919bf73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 21:07:47 -0500 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e5f612b8..dd01eed64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] +### Changed +- [#704](https://github.com/plotly/dash-table/pull/704) Renamed async modules with hyphen `-` instead of tilde `~` + ## [4.6.0] - 2020-01-14 ### Added - [#606](https://github.com/plotly/dash-table/pull/606) Add markdown support for table cells. Cells will be rendered as markdown if the column `presentation` is specified as `markdown`.