Merge dash renderer with DashPy

.circleci/config.yml

@@ -61,6 +61,7 @@ jobs:
           command: |
             . venv/bin/activate
             set -eo pipefail
+            cd dash/dash-renderer && renderer build && cd ../../
             pip install -e . --progress-bar off && pip list | grep dash
             npm install --production && npm run initialize
             npm run lint
@@ -121,7 +122,7 @@ jobs:
           name: ️️🏗️ build core
           command: |
             . venv/bin/activate && pip install --no-cache-dir --upgrade -e . --progress-bar off && mkdir packages
-            cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
+            cd dash/dash-renderer && renderer build && 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 ci && npm run build && python setup.py sdist && mv dist/* ../packages/  && cd ..
             ls -la packages
@@ -223,7 +224,7 @@ jobs:
           name: ️️🏗️ build core
           command: |
             pip install --no-cache-dir --upgrade -e .[dev,testing] --progress-bar off
-            cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
+            cd dash/dash-renderer && renderer build && 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 ci && npm run build && python setup.py sdist && cd ..
 
@@ -256,12 +257,7 @@ jobs:
             cd dash-html-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
             cd ../dash-core-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
             cd ../dash-table; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build); cd ..
-
-      - run:
-          name: 🔧 fix up dash metadata
-          command: |
-            sudo Rscript dashR/tests/circleci/fixup_metadata.R
-
+
       - run:
           name: 🎛 set environment variables
           command: |

.gitignore

@@ -42,6 +42,7 @@ coverage.xml
 # Distribution / packaging
 .Python
 build/
+dash/deps/
 develop-eggs/
 dist/
 downloads/
@@ -63,7 +64,6 @@ node_modules/
 .npm
 npm-debug*
 
-dash_renderer/
 dash_generator_test_component_standard/
 dash_generator_test_component_nested/
 dash_test_components/

CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to `dash` will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [UNRELEASED]
+
+## Dash and Dash Renderer
+### Changed
+- [#1611](https://github.com/plotly/dash/pull/1611) Package dash-renderer artifacts and dependencies with Dash, and source renderer resources from within Dash.
+
 ### Fixed
 - [#1640](https://github.com/plotly/dash/pull/1640) Fix [#1475](https://github.com/plotly/dash/issues/1475), missing `timing_information` after certain modifications to Flask behavior
 

MANIFEST.in

@@ -3,3 +3,5 @@ include LICENSE
 include requires-*.txt
 include dash/favicon.ico
 include dash/extract-meta.js
+include dash/deps/*.js
+include dash/deps/*.map