Skip to content

Merge dash renderer with DashPy #1611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Jun 1, 2021
Merged

Merge dash renderer with DashPy #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a37b7d2
Added dash-renderer artifacts
HammadTheOne Apr 29, 2021
e7af1f5
Import renderer resources from Dash
HammadTheOne Apr 29, 2021
448b678
Added gulpfile to update renderer
HammadTheOne Apr 30, 2021
e447cbf
Updated gulpfile
HammadTheOne Apr 30, 2021
3b51822
Added newlines
HammadTheOne Apr 30, 2021
907c9e3
Another newline fix
HammadTheOne Apr 30, 2021
7f742ea
Updating gulpfile for version updates
HammadTheOne Apr 30, 2021
5c01200
Merge branch 'dev' into merge-dash-renderer
HammadTheOne Apr 30, 2021
c1296d7
Update CHANGELOG
HammadTheOne Apr 30, 2021
ea20450
Merge branch 'merge-dash-renderer' of https://github.com/plotly/dash …
HammadTheOne Apr 30, 2021
1872382
Merge branch 'dev' into merge-dash-renderer
HammadTheOne Apr 30, 2021
9f8e0aa
Flattening package structure and sourcing deps within Dash
HammadTheOne May 8, 2021
b59c3ee
Update package.json scripts
HammadTheOne May 8, 2021
2537d33
Fix conflicts
HammadTheOne May 8, 2021
ce82111
Merge branch 'dev' into merge-dash-renderer
HammadTheOne May 8, 2021
9900303
Updated manifest glob
HammadTheOne May 10, 2021
6dc2803
Fixed typo
HammadTheOne May 10, 2021
317d7e8
Added clean job
HammadTheOne May 10, 2021
6032a08
Updated build folder and deps
HammadTheOne May 10, 2021
afaf8d4
Added build artifacts to gitignore
HammadTheOne May 11, 2021
240e8f6
Updating build process and pylintrc
HammadTheOne May 12, 2021
3c15edf
Running tests with deps
HammadTheOne May 12, 2021
b578983
Update CircleCI config install of renderer
HammadTheOne May 12, 2021
d20dbf1
Updating config.yml
HammadTheOne May 12, 2021
a06e9cc
Update lint-unit tests
HammadTheOne May 12, 2021
6bb9b47
Merge branch 'dev' into merge-dash-renderer
HammadTheOne May 19, 2021
8a7363c
Remove dashr metadata update job from circleci
HammadTheOne May 25, 2021
afc363c
Updated manifest
HammadTheOne May 27, 2021
2aefb7f
Remove unnecessary import
HammadTheOne May 27, 2021
12752bd
Build cleanup
HammadTheOne May 27, 2021
44449a0
Linting exceptions
HammadTheOne May 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ..

Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ coverage.xml
# Distribution / packaging
.Python
build/
dash/deps/
develop-eggs/
dist/
downloads/
Expand All @@ -63,7 +64,6 @@ node_modules/
.npm
npm-debug*

dash_renderer/
dash_generator_test_component_standard/
dash_generator_test_component_nested/
dash_test_components/
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading