Skip to content

Commit

Permalink
Merge branch 'dev' into master-2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcjohnson committed May 11, 2022
2 parents b8cfc29 + 45e35aa commit 86f4cfb
Show file tree
Hide file tree
Showing 154 changed files with 42,749 additions and 21,037 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
set -eo pipefail
pip install -e .[ci,dev,testing,celery,diskcache] --progress-bar off
pip list | grep dash
npm i
npm ci
npm run build.sequential
python setup.py sdist
mkdir dash-package && cp dist/*.tar.gz dash-package/dash-package.tar.gz
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
. venv/bin/activate
set -eo pipefail
pip install -e . --progress-bar off && pip list | grep dash
npm install npm run initialize
npm ci npm run initialize
npm run build.sequential
npm run lint
- run:
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
name: ️️🏗️ Install package
command: |
. venv/bin/activate
npm install
npm ci
pip install dash-package/dash-package.tar.gz[ci,dev,testing,celery,diskcache] --progress-bar off
pip list | grep dash
- run:
Expand Down Expand Up @@ -294,7 +294,7 @@ jobs:
. venv/bin/activate && rm -rf components/dash-core-components/dash_core_components
cd components/dash-core-components
TESTFILES=$(circleci tests glob "tests/integration/**/test_*.py" | circleci tests split --split-by=timings)
pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-core-components" ${TESTFILES}
pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml --junitprefix="components.dash-core-components" ${TESTFILES} --reruns 3
- store_artifacts:
path: ~/dash/components/dash-core-components/test-reports
- store_test_results:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ npm-debug*
dash_generator_test_component_standard/
dash_generator_test_component_nested/
dash_test_components/
dash_generator_test_component_typescript/
inst/
man/
R/
Expand Down
2,737 changes: 1,438 additions & 1,299 deletions @plotly/dash-component-plugins/package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions @plotly/dash-component-plugins/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@plotly/dash-component-plugins",
"version": "1.2.2",
"version": "1.2.3",
"description": "Plugins for Dash Components",
"repository": {
"type": "git",
Expand All @@ -17,13 +17,13 @@
"author": "Marc-André Rivet",
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.16.0",
"@babel/preset-env": "^7.16.4",
"@babel/preset-react": "^7.16.0",
"babel-loader": "^8.2.3",
"@babel/core": "^7.17.9",
"@babel/preset-env": "^7.16.11",
"@babel/preset-react": "^7.16.7",
"babel-loader": "^8.2.4",
"react": "^16.8.6",
"webpack": "^4.44.2",
"webpack-cli": "^4.9.1"
"webpack-cli": "^4.9.2"
},
"files": [
"dist/index.js"
Expand Down
Loading

0 comments on commit 86f4cfb

Please sign in to comment.