Skip to content

Commit 7afb2ed

Browse files
authored
Merge dash renderer with DashPy (#1611)
* Added dash-renderer artifacts * Import renderer resources from Dash * Added gulpfile to update renderer * Updated gulpfile * Added newlines * Another newline fix * Updating gulpfile for version updates * Update CHANGELOG * Flattening package structure and sourcing deps within Dash * Update package.json scripts * Updated manifest glob * Fixed typo * Added clean job * Updated build folder and deps * Added build artifacts to gitignore * Updating build process and pylintrc * Running tests with deps * Update CircleCI config install of renderer * Updating config.yml * Update lint-unit tests * Remove dashr metadata update job from circleci * Updated manifest * Remove unnecessary import * Build cleanup * Linting exceptions
1 parent e727dd7 commit 7afb2ed

File tree

115 files changed

+35058
-16217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+35058
-16217
lines changed

.circleci/config.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
command: |
6262
. venv/bin/activate
6363
set -eo pipefail
64+
cd dash/dash-renderer && renderer build && cd ../../
6465
pip install -e . --progress-bar off && pip list | grep dash
6566
npm install --production && npm run initialize
6667
npm run lint
@@ -121,7 +122,7 @@ jobs:
121122
name: ️️🏗️ build core
122123
command: |
123124
. venv/bin/activate && pip install --no-cache-dir --upgrade -e . --progress-bar off && mkdir packages
124-
cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
125+
cd dash/dash-renderer && renderer build && cd ../../ && python setup.py sdist && mv dist/* packages/
125126
git clone --depth 1 https://github.com/plotly/dash-core-components.git
126127
cd dash-core-components && npm ci && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd ..
127128
ls -la packages
@@ -223,7 +224,7 @@ jobs:
223224
name: ️️🏗️ build core
224225
command: |
225226
pip install --no-cache-dir --upgrade -e .[dev,testing] --progress-bar off
226-
cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
227+
cd dash/dash-renderer && renderer build && cd ../../ && python setup.py sdist && mv dist/* packages/
227228
git clone --depth 1 https://github.com/plotly/dash-core-components.git
228229
cd dash-core-components && npm ci && npm run build && python setup.py sdist && cd ..
229230
@@ -256,12 +257,7 @@ jobs:
256257
cd dash-html-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
257258
cd ../dash-core-components; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build)
258259
cd ../dash-table; npm ci && npm run build; rm -rf !(.|..|DESCRIPTION|LICENSE.txt|LICENSE|NAMESPACE|.Rbuildignore|R|man|inst|vignettes|build); cd ..
259-
260-
- run:
261-
name: 🔧 fix up dash metadata
262-
command: |
263-
sudo Rscript dashR/tests/circleci/fixup_metadata.R
264-
260+
265261
- run:
266262
name: 🎛 set environment variables
267263
command: |

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ coverage.xml
4242
# Distribution / packaging
4343
.Python
4444
build/
45+
dash/deps/
4546
develop-eggs/
4647
dist/
4748
downloads/
@@ -63,7 +64,6 @@ node_modules/
6364
.npm
6465
npm-debug*
6566

66-
dash_renderer/
6767
dash_generator_test_component_standard/
6868
dash_generator_test_component_nested/
6969
dash_test_components/

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ All notable changes to `dash` will be documented in this file.
33
This project adheres to [Semantic Versioning](https://semver.org/).
44

55
## [UNRELEASED]
6+
7+
## Dash and Dash Renderer
8+
### Changed
9+
- [#1611](https://github.com/plotly/dash/pull/1611) Package dash-renderer artifacts and dependencies with Dash, and source renderer resources from within Dash.
10+
611
### Fixed
712
- [#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
813

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ include LICENSE
33
include requires-*.txt
44
include dash/favicon.ico
55
include dash/extract-meta.js
6+
include dash/deps/*.js
7+
include dash/deps/*.map

0 commit comments

Comments
 (0)