Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
28af8f7
Assorted fixes required for CRAN submission (#1186)
rpkyle May 4, 2020
756b8c2
Include transpiled source files in published package
Marc-Andre-Rivet May 4, 2020
83af21f
changelog for prevent_initial_call
alexcjohnson May 4, 2020
3011383
:sparkles: initial R build test
May 5, 2020
d1a1c19
re-enable tests
May 9, 2020
4f7ccc5
fix conflict
May 9, 2020
9c7a111
add # integration test for dopsa
May 9, 2020
98d61aa
activate dopsa test
rpkyle May 13, 2020
63d666e
May 13, 2020
04e6cab
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 13, 2020
e64def6
Merge branch 'dev' into add-rbuild-test
rpkyle May 15, 2020
6841709
when: on_fail + percy_finalize require build-dashr
May 19, 2020
672b31d
Merge branch 'dev' into add-rbuild-test
rpkyle May 19, 2020
22b1cc0
:necktie: try 20 lines similarity threshold
May 19, 2020
feeedc0
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 19, 2020
df0e7fd
Merge branch 'dev' into add-rbuild-test
rpkyle May 21, 2020
0510ed6
:hocho: :arrow_double_down: doubled dots
May 21, 2020
db6e975
try current branch
May 21, 2020
74083ce
:hocho: -b dev
May 21, 2020
fa1c467
:ice_cream: add R flavour
May 21, 2020
0c24262
use 20 lines threshold in .pylintrc37
May 21, 2020
f852144
:necktie: :feet: relocate lintrc
May 21, 2020
502fa4a
try to :recycle: existing dash repo clone
May 21, 2020
59457ba
restore previous config
May 21, 2020
b4117d6
try to fix package.json
May 21, 2020
f80fe9f
removing setup-tests-r for now
May 21, 2020
36d043e
add Percy debug statement
May 22, 2020
d9a54dc
use PERCY_PARALLEL_TOTAL: -1 for R build
May 22, 2020
b94d731
:hocho: debug statements
May 22, 2020
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
111 changes: 110 additions & 1 deletion .circleci/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37

steps:
Expand DownExpand Up@@ -81,7 +82,6 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37
steps:
- checkout
Expand DownExpand Up@@ -213,6 +213,113 @@ jobs:
paths:
- packages/*.tar.gz

build-dashr:
working_directory: ~/dashr
docker:
- image: plotly/dashr:ci
environment:
PERCY_PARALLEL_TOTAL: -1
PYVERSION: python37
_R_CHECK_FORCE_SUGGESTS_: FALSE

steps:
- checkout

- run:
name: ️️🏭 clone and npm build core for R
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git -b ${CIRCLE_BRANCH} dash-main
Comment thread
alexcjohnson marked this conversation as resolved.
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
git clone --depth 1 https://github.com/plotly/dashR.git -b dev dashR
git clone --depth 1 https://github.com/plotly/dash-html-components.git
git clone --depth 1 https://github.com/plotly/dash-core-components.git
git clone --depth 1 https://github.com/plotly/dash-table.git
shopt -s extglob
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 -e 'dash_desc <- read.dcf("dashR/DESCRIPTION"); dt_version <- read.dcf("dash-table/DESCRIPTION")[,"Version"]; dcc_version <- read.dcf("dash-core-components/DESCRIPTION")[,"Version"]; dhc_version <- read.dcf("dash-html-components/DESCRIPTION")[,"Version"]; imports <- dash_desc[,"Imports"][[1]]; imports <- gsub("((?<=dashHtmlComponents )(\\\\(.*?\\\\)))", paste0("(= ", dhc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashCoreComponents )(\\\\(.*?\\\\)))", paste0("(= ", dcc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashTable )(\\\\(.*?\\\\)))", paste0("(= ", dt_version, ")"), imports, perl = TRUE); dash_desc[,"Imports"][[1]] <- imports; dhc_hash <- system("cd dash-html-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dcc_hash <- system("cd dash-core-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dt_hash <- system("cd dash-table; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); remotes <- dash_desc[,"Remotes"][[1]]; remotes <- gsub("((?<=plotly\\\\/dash-html-components@)([a-zA-Z0-9]+))", dhc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-core-components@)([a-zA-Z0-9]+))", dcc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-table@)([a-zA-Z0-9]+))", dt_hash, remotes, perl=TRUE); dash_desc[,"Remotes"][[1]] <- remotes; write.dcf(dash_desc, "dashR/DESCRIPTION")'

- run:
name: 🎛 set environment variables
command: |
Rscript --vanilla \
-e 'dash_dsc <- read.dcf("dashR/DESCRIPTION")' \
-e 'cat(sprintf("export DASH_TARBALL=%s_%s.tar.gz\n", dash_dsc[,"Package"], dash_dsc[,"Version"]))' \
-e 'cat(sprintf("export DASH_CHECK_DIR=%s.Rcheck\n", dash_dsc[,"Package"]))' \
-e 'dhc_dsc <- read.dcf("dash-html-components/DESCRIPTION")' \
-e 'cat(sprintf("export DHC_TARBALL=%s_%s.tar.gz\n", dhc_dsc[,"Package"], dhc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DHC_CHECK_DIR=%s.Rcheck\n", dhc_dsc[,"Package"]))' \
-e 'dcc_dsc <- read.dcf("dash-core-components/DESCRIPTION")' \
-e 'cat(sprintf("export DCC_TARBALL=%s_%s.tar.gz\n", dcc_dsc[,"Package"], dcc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DCC_CHECK_DIR=%s.Rcheck\n", dcc_dsc[,"Package"]))' \
-e 'dt_dsc <- read.dcf("dash-table/DESCRIPTION")' \
-e 'cat(sprintf("export DT_TARBALL=%s_%s.tar.gz\n", dt_dsc[,"Package"], dt_dsc[,"Version"]))' \
-e 'cat(sprintf("export DT_CHECK_DIR=%s.Rcheck\n", dt_dsc[,"Package"]))' \
>> ${BASH_ENV}

- run:
name: ️️📋 run CRAN package checks
command: |
R CMD build dash-core-components
R CMD build dash-html-components
R CMD build dash-table
R CMD build dashR
sudo R CMD INSTALL dash-core-components
sudo R CMD INSTALL dash-html-components
sudo R CMD INSTALL dash-table
sudo R CMD INSTALL dashR
R CMD check "${DHC_TARBALL}" --as-cran --no-manual
R CMD check "${DCC_TARBALL}" --as-cran --no-manual
R CMD check "${DT_TARBALL}" --as-cran --no-manual
R CMD check "${DASH_TARBALL}" --as-cran --no-manual

- run:
name: 🕵 detect failures
command: |
Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
# warnings are errors; enable for stricter checks once CRAN submission finished
# if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DT_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DASH_CHECK_DIR}/00check.log"; then exit 1; fi

- run:
name: 🔎 run unit tests
command: |
sudo Rscript -e 'res=devtools::test("dashR/tests/", reporter=default_reporter());df=as.data.frame(res);if(sum(df$failed) > 0 || any(df$error)) {q(status=1)}'

- run:
name: ⚙️ Integration tests
command: |
python -m venv venv
. venv/bin/activate
cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
export PATH=$PATH:/home/circleci/.local/bin/
pytest --nopercyfinalize --junitxml=test-reports/dashr.xml dashR/tests/integration/dopsa/
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
when: on_fail


test-37: &test
working_directory: ~/dash
docker:
Expand DownExpand Up@@ -279,12 +386,14 @@ workflows:
- build-core-37
- build-windows-37
- build-misc-37
- build-dashr
- test-37:
requires:
- build-core-37
- build-misc-37
- percy-finalize:
requires:
- build-dashr
- test-37
- artifacts:
requires:
Expand Down
4 changes: 2 additions & 2 deletions .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,7 +270,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10
min-similarity-lines=20
Comment thread
alexcjohnson marked this conversation as resolved.


[SPELLING]
Expand DownExpand Up@@ -466,4 +466,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
5 changes: 2 additions & 3 deletions .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,8 +365,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10

min-similarity-lines=20

[SPELLING]

Expand DownExpand Up@@ -565,4 +564,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception".
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
3 changes: 0 additions & 3 deletions dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,9 +221,6 @@ def generate_class_string(name, props, project_shortname, prefix):

default_argtext += ", ".join("{}=NULL".format(p) for p in prop_keys)

if wildcards == ", ...":
default_argtext += ", ..."

# pylint: disable=C0301
default_paramtext += ", ".join(
"{0}={0}".format(p) if p != "children" else "{}=children".format(p)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
28af8f7
Assorted fixes required for CRAN submission (#1186)
rpkyle May 4, 2020
756b8c2
Include transpiled source files in published package
Marc-Andre-Rivet May 4, 2020
83af21f
changelog for prevent_initial_call
alexcjohnson May 4, 2020
3011383
:sparkles: initial R build test
May 5, 2020
d1a1c19
re-enable tests
May 9, 2020
4f7ccc5
fix conflict
May 9, 2020
9c7a111
add # integration test for dopsa
May 9, 2020
98d61aa
activate dopsa test
rpkyle May 13, 2020
63d666e
May 13, 2020
04e6cab
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 13, 2020
e64def6
Merge branch 'dev' into add-rbuild-test
rpkyle May 15, 2020
6841709
when: on_fail + percy_finalize require build-dashr
May 19, 2020
672b31d
Merge branch 'dev' into add-rbuild-test
rpkyle May 19, 2020
22b1cc0
:necktie: try 20 lines similarity threshold
May 19, 2020
feeedc0
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 19, 2020
df0e7fd
Merge branch 'dev' into add-rbuild-test
rpkyle May 21, 2020
0510ed6
:hocho: :arrow_double_down: doubled dots
May 21, 2020
db6e975
try current branch
May 21, 2020
74083ce
:hocho: -b dev
May 21, 2020
fa1c467
:ice_cream: add R flavour
May 21, 2020
0c24262
use 20 lines threshold in .pylintrc37
May 21, 2020
f852144
:necktie: :feet: relocate lintrc
May 21, 2020
502fa4a
try to :recycle: existing dash repo clone
May 21, 2020
59457ba
restore previous config
May 21, 2020
b4117d6
try to fix package.json
May 21, 2020
f80fe9f
removing setup-tests-r for now
May 21, 2020
36d043e
add Percy debug statement
May 22, 2020
d9a54dc
use PERCY_PARALLEL_TOTAL: -1 for R build
May 22, 2020
b94d731
:hocho: debug statements
May 22, 2020
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
111 changes: 110 additions & 1 deletion .circleci/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37

steps:
Expand DownExpand Up@@ -81,7 +82,6 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37
steps:
- checkout
Expand DownExpand Up@@ -213,6 +213,113 @@ jobs:
paths:
- packages/*.tar.gz

build-dashr:
working_directory: ~/dashr
docker:
- image: plotly/dashr:ci
environment:
PERCY_PARALLEL_TOTAL: -1
PYVERSION: python37
_R_CHECK_FORCE_SUGGESTS_: FALSE

steps:
- checkout

- run:
name: ️️🏭 clone and npm build core for R
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git -b ${CIRCLE_BRANCH} dash-main
Comment thread
alexcjohnson marked this conversation as resolved.
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
git clone --depth 1 https://github.com/plotly/dashR.git -b dev dashR
git clone --depth 1 https://github.com/plotly/dash-html-components.git
git clone --depth 1 https://github.com/plotly/dash-core-components.git
git clone --depth 1 https://github.com/plotly/dash-table.git
shopt -s extglob
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 -e 'dash_desc <- read.dcf("dashR/DESCRIPTION"); dt_version <- read.dcf("dash-table/DESCRIPTION")[,"Version"]; dcc_version <- read.dcf("dash-core-components/DESCRIPTION")[,"Version"]; dhc_version <- read.dcf("dash-html-components/DESCRIPTION")[,"Version"]; imports <- dash_desc[,"Imports"][[1]]; imports <- gsub("((?<=dashHtmlComponents )(\\\\(.*?\\\\)))", paste0("(= ", dhc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashCoreComponents )(\\\\(.*?\\\\)))", paste0("(= ", dcc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashTable )(\\\\(.*?\\\\)))", paste0("(= ", dt_version, ")"), imports, perl = TRUE); dash_desc[,"Imports"][[1]] <- imports; dhc_hash <- system("cd dash-html-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dcc_hash <- system("cd dash-core-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dt_hash <- system("cd dash-table; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); remotes <- dash_desc[,"Remotes"][[1]]; remotes <- gsub("((?<=plotly\\\\/dash-html-components@)([a-zA-Z0-9]+))", dhc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-core-components@)([a-zA-Z0-9]+))", dcc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-table@)([a-zA-Z0-9]+))", dt_hash, remotes, perl=TRUE); dash_desc[,"Remotes"][[1]] <- remotes; write.dcf(dash_desc, "dashR/DESCRIPTION")'

- run:
name: 🎛 set environment variables
command: |
Rscript --vanilla \
-e 'dash_dsc <- read.dcf("dashR/DESCRIPTION")' \
-e 'cat(sprintf("export DASH_TARBALL=%s_%s.tar.gz\n", dash_dsc[,"Package"], dash_dsc[,"Version"]))' \
-e 'cat(sprintf("export DASH_CHECK_DIR=%s.Rcheck\n", dash_dsc[,"Package"]))' \
-e 'dhc_dsc <- read.dcf("dash-html-components/DESCRIPTION")' \
-e 'cat(sprintf("export DHC_TARBALL=%s_%s.tar.gz\n", dhc_dsc[,"Package"], dhc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DHC_CHECK_DIR=%s.Rcheck\n", dhc_dsc[,"Package"]))' \
-e 'dcc_dsc <- read.dcf("dash-core-components/DESCRIPTION")' \
-e 'cat(sprintf("export DCC_TARBALL=%s_%s.tar.gz\n", dcc_dsc[,"Package"], dcc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DCC_CHECK_DIR=%s.Rcheck\n", dcc_dsc[,"Package"]))' \
-e 'dt_dsc <- read.dcf("dash-table/DESCRIPTION")' \
-e 'cat(sprintf("export DT_TARBALL=%s_%s.tar.gz\n", dt_dsc[,"Package"], dt_dsc[,"Version"]))' \
-e 'cat(sprintf("export DT_CHECK_DIR=%s.Rcheck\n", dt_dsc[,"Package"]))' \
>> ${BASH_ENV}

- run:
name: ️️📋 run CRAN package checks
command: |
R CMD build dash-core-components
R CMD build dash-html-components
R CMD build dash-table
R CMD build dashR
sudo R CMD INSTALL dash-core-components
sudo R CMD INSTALL dash-html-components
sudo R CMD INSTALL dash-table
sudo R CMD INSTALL dashR
R CMD check "${DHC_TARBALL}" --as-cran --no-manual
R CMD check "${DCC_TARBALL}" --as-cran --no-manual
R CMD check "${DT_TARBALL}" --as-cran --no-manual
R CMD check "${DASH_TARBALL}" --as-cran --no-manual

- run:
name: 🕵 detect failures
command: |
Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
# warnings are errors; enable for stricter checks once CRAN submission finished
# if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DT_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DASH_CHECK_DIR}/00check.log"; then exit 1; fi

- run:
name: 🔎 run unit tests
command: |
sudo Rscript -e 'res=devtools::test("dashR/tests/", reporter=default_reporter());df=as.data.frame(res);if(sum(df$failed) > 0 || any(df$error)) {q(status=1)}'

- run:
name: ⚙️ Integration tests
command: |
python -m venv venv
. venv/bin/activate
cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
export PATH=$PATH:/home/circleci/.local/bin/
pytest --nopercyfinalize --junitxml=test-reports/dashr.xml dashR/tests/integration/dopsa/
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
when: on_fail


test-37: &test
working_directory: ~/dash
docker:
Expand DownExpand Up@@ -279,12 +386,14 @@ workflows:
- build-core-37
- build-windows-37
- build-misc-37
- build-dashr
- test-37:
requires:
- build-core-37
- build-misc-37
- percy-finalize:
requires:
- build-dashr
- test-37
- artifacts:
requires:
Expand Down
4 changes: 2 additions & 2 deletions .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,7 +270,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10
min-similarity-lines=20
Comment thread
alexcjohnson marked this conversation as resolved.


[SPELLING]
Expand DownExpand Up@@ -466,4 +466,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
5 changes: 2 additions & 3 deletions .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,8 +365,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10

min-similarity-lines=20

[SPELLING]

Expand DownExpand Up@@ -565,4 +564,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception".
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
3 changes: 0 additions & 3 deletions dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,9 +221,6 @@ def generate_class_string(name, props, project_shortname, prefix):

default_argtext += ", ".join("{}=NULL".format(p) for p in prop_keys)

if wildcards == ", ...":
default_argtext += ", ..."

# pylint: disable=C0301
default_paramtext += ", ".join(
"{0}={0}".format(p) if p != "children" else "{}=children".format(p)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
28af8f7
Assorted fixes required for CRAN submission (#1186)
rpkyle May 4, 2020
756b8c2
Include transpiled source files in published package
Marc-Andre-Rivet May 4, 2020
83af21f
changelog for prevent_initial_call
alexcjohnson May 4, 2020
3011383
:sparkles: initial R build test
May 5, 2020
d1a1c19
re-enable tests
May 9, 2020
4f7ccc5
fix conflict
May 9, 2020
9c7a111
add # integration test for dopsa
May 9, 2020
98d61aa
activate dopsa test
rpkyle May 13, 2020
63d666e
May 13, 2020
04e6cab
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 13, 2020
e64def6
Merge branch 'dev' into add-rbuild-test
rpkyle May 15, 2020
6841709
when: on_fail + percy_finalize require build-dashr
May 19, 2020
672b31d
Merge branch 'dev' into add-rbuild-test
rpkyle May 19, 2020
22b1cc0
:necktie: try 20 lines similarity threshold
May 19, 2020
feeedc0
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 19, 2020
df0e7fd
Merge branch 'dev' into add-rbuild-test
rpkyle May 21, 2020
0510ed6
:hocho: :arrow_double_down: doubled dots
May 21, 2020
db6e975
try current branch
May 21, 2020
74083ce
:hocho: -b dev
May 21, 2020
fa1c467
:ice_cream: add R flavour
May 21, 2020
0c24262
use 20 lines threshold in .pylintrc37
May 21, 2020
f852144
:necktie: :feet: relocate lintrc
May 21, 2020
502fa4a
try to :recycle: existing dash repo clone
May 21, 2020
59457ba
restore previous config
May 21, 2020
b4117d6
try to fix package.json
May 21, 2020
f80fe9f
removing setup-tests-r for now
May 21, 2020
36d043e
add Percy debug statement
May 22, 2020
d9a54dc
use PERCY_PARALLEL_TOTAL: -1 for R build
May 22, 2020
b94d731
:hocho: debug statements
May 22, 2020
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
111 changes: 110 additions & 1 deletion .circleci/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37

steps:
Expand DownExpand Up@@ -81,7 +82,6 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37
steps:
- checkout
Expand DownExpand Up@@ -213,6 +213,113 @@ jobs:
paths:
- packages/*.tar.gz

build-dashr:
working_directory: ~/dashr
docker:
- image: plotly/dashr:ci
environment:
PERCY_PARALLEL_TOTAL: -1
PYVERSION: python37
_R_CHECK_FORCE_SUGGESTS_: FALSE

steps:
- checkout

- run:
name: ️️🏭 clone and npm build core for R
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git -b ${CIRCLE_BRANCH} dash-main
Comment thread
alexcjohnson marked this conversation as resolved.
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
git clone --depth 1 https://github.com/plotly/dashR.git -b dev dashR
git clone --depth 1 https://github.com/plotly/dash-html-components.git
git clone --depth 1 https://github.com/plotly/dash-core-components.git
git clone --depth 1 https://github.com/plotly/dash-table.git
shopt -s extglob
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 -e 'dash_desc <- read.dcf("dashR/DESCRIPTION"); dt_version <- read.dcf("dash-table/DESCRIPTION")[,"Version"]; dcc_version <- read.dcf("dash-core-components/DESCRIPTION")[,"Version"]; dhc_version <- read.dcf("dash-html-components/DESCRIPTION")[,"Version"]; imports <- dash_desc[,"Imports"][[1]]; imports <- gsub("((?<=dashHtmlComponents )(\\\\(.*?\\\\)))", paste0("(= ", dhc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashCoreComponents )(\\\\(.*?\\\\)))", paste0("(= ", dcc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashTable )(\\\\(.*?\\\\)))", paste0("(= ", dt_version, ")"), imports, perl = TRUE); dash_desc[,"Imports"][[1]] <- imports; dhc_hash <- system("cd dash-html-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dcc_hash <- system("cd dash-core-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dt_hash <- system("cd dash-table; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); remotes <- dash_desc[,"Remotes"][[1]]; remotes <- gsub("((?<=plotly\\\\/dash-html-components@)([a-zA-Z0-9]+))", dhc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-core-components@)([a-zA-Z0-9]+))", dcc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-table@)([a-zA-Z0-9]+))", dt_hash, remotes, perl=TRUE); dash_desc[,"Remotes"][[1]] <- remotes; write.dcf(dash_desc, "dashR/DESCRIPTION")'

- run:
name: 🎛 set environment variables
command: |
Rscript --vanilla \
-e 'dash_dsc <- read.dcf("dashR/DESCRIPTION")' \
-e 'cat(sprintf("export DASH_TARBALL=%s_%s.tar.gz\n", dash_dsc[,"Package"], dash_dsc[,"Version"]))' \
-e 'cat(sprintf("export DASH_CHECK_DIR=%s.Rcheck\n", dash_dsc[,"Package"]))' \
-e 'dhc_dsc <- read.dcf("dash-html-components/DESCRIPTION")' \
-e 'cat(sprintf("export DHC_TARBALL=%s_%s.tar.gz\n", dhc_dsc[,"Package"], dhc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DHC_CHECK_DIR=%s.Rcheck\n", dhc_dsc[,"Package"]))' \
-e 'dcc_dsc <- read.dcf("dash-core-components/DESCRIPTION")' \
-e 'cat(sprintf("export DCC_TARBALL=%s_%s.tar.gz\n", dcc_dsc[,"Package"], dcc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DCC_CHECK_DIR=%s.Rcheck\n", dcc_dsc[,"Package"]))' \
-e 'dt_dsc <- read.dcf("dash-table/DESCRIPTION")' \
-e 'cat(sprintf("export DT_TARBALL=%s_%s.tar.gz\n", dt_dsc[,"Package"], dt_dsc[,"Version"]))' \
-e 'cat(sprintf("export DT_CHECK_DIR=%s.Rcheck\n", dt_dsc[,"Package"]))' \
>> ${BASH_ENV}

- run:
name: ️️📋 run CRAN package checks
command: |
R CMD build dash-core-components
R CMD build dash-html-components
R CMD build dash-table
R CMD build dashR
sudo R CMD INSTALL dash-core-components
sudo R CMD INSTALL dash-html-components
sudo R CMD INSTALL dash-table
sudo R CMD INSTALL dashR
R CMD check "${DHC_TARBALL}" --as-cran --no-manual
R CMD check "${DCC_TARBALL}" --as-cran --no-manual
R CMD check "${DT_TARBALL}" --as-cran --no-manual
R CMD check "${DASH_TARBALL}" --as-cran --no-manual

- run:
name: 🕵 detect failures
command: |
Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
# warnings are errors; enable for stricter checks once CRAN submission finished
# if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DT_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DASH_CHECK_DIR}/00check.log"; then exit 1; fi

- run:
name: 🔎 run unit tests
command: |
sudo Rscript -e 'res=devtools::test("dashR/tests/", reporter=default_reporter());df=as.data.frame(res);if(sum(df$failed) > 0 || any(df$error)) {q(status=1)}'

- run:
name: ⚙️ Integration tests
command: |
python -m venv venv
. venv/bin/activate
cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
export PATH=$PATH:/home/circleci/.local/bin/
pytest --nopercyfinalize --junitxml=test-reports/dashr.xml dashR/tests/integration/dopsa/
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
when: on_fail


test-37: &test
working_directory: ~/dash
docker:
Expand DownExpand Up@@ -279,12 +386,14 @@ workflows:
- build-core-37
- build-windows-37
- build-misc-37
- build-dashr
- test-37:
requires:
- build-core-37
- build-misc-37
- percy-finalize:
requires:
- build-dashr
- test-37
- artifacts:
requires:
Expand Down
4 changes: 2 additions & 2 deletions .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,7 +270,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10
min-similarity-lines=20
Comment thread
alexcjohnson marked this conversation as resolved.


[SPELLING]
Expand DownExpand Up@@ -466,4 +466,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
5 changes: 2 additions & 3 deletions .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,8 +365,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10

min-similarity-lines=20

[SPELLING]

Expand DownExpand Up@@ -565,4 +564,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception".
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
3 changes: 0 additions & 3 deletions dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,9 +221,6 @@ def generate_class_string(name, props, project_shortname, prefix):

default_argtext += ", ".join("{}=NULL".format(p) for p in prop_keys)

if wildcards == ", ...":
default_argtext += ", ..."

# pylint: disable=C0301
default_paramtext += ", ".join(
"{0}={0}".format(p) if p != "children" else "{}=children".format(p)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
28af8f7
Assorted fixes required for CRAN submission (#1186)
rpkyle May 4, 2020
756b8c2
Include transpiled source files in published package
Marc-Andre-Rivet May 4, 2020
83af21f
changelog for prevent_initial_call
alexcjohnson May 4, 2020
3011383
:sparkles: initial R build test
May 5, 2020
d1a1c19
re-enable tests
May 9, 2020
4f7ccc5
fix conflict
May 9, 2020
9c7a111
add # integration test for dopsa
May 9, 2020
98d61aa
activate dopsa test
rpkyle May 13, 2020
63d666e
May 13, 2020
04e6cab
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 13, 2020
e64def6
Merge branch 'dev' into add-rbuild-test
rpkyle May 15, 2020
6841709
when: on_fail + percy_finalize require build-dashr
May 19, 2020
672b31d
Merge branch 'dev' into add-rbuild-test
rpkyle May 19, 2020
22b1cc0
:necktie: try 20 lines similarity threshold
May 19, 2020
feeedc0
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 19, 2020
df0e7fd
Merge branch 'dev' into add-rbuild-test
rpkyle May 21, 2020
0510ed6
:hocho: :arrow_double_down: doubled dots
May 21, 2020
db6e975
try current branch
May 21, 2020
74083ce
:hocho: -b dev
May 21, 2020
fa1c467
:ice_cream: add R flavour
May 21, 2020
0c24262
use 20 lines threshold in .pylintrc37
May 21, 2020
f852144
:necktie: :feet: relocate lintrc
May 21, 2020
502fa4a
try to :recycle: existing dash repo clone
May 21, 2020
59457ba
restore previous config
May 21, 2020
b4117d6
try to fix package.json
May 21, 2020
f80fe9f
removing setup-tests-r for now
May 21, 2020
36d043e
add Percy debug statement
May 22, 2020
d9a54dc
use PERCY_PARALLEL_TOTAL: -1 for R build
May 22, 2020
b94d731
:hocho: debug statements
May 22, 2020
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
111 changes: 110 additions & 1 deletion .circleci/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37

steps:
Expand DownExpand Up@@ -81,7 +82,6 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37
steps:
- checkout
Expand DownExpand Up@@ -213,6 +213,113 @@ jobs:
paths:
- packages/*.tar.gz

build-dashr:
working_directory: ~/dashr
docker:
- image: plotly/dashr:ci
environment:
PERCY_PARALLEL_TOTAL: -1
PYVERSION: python37
_R_CHECK_FORCE_SUGGESTS_: FALSE

steps:
- checkout

- run:
name: ️️🏭 clone and npm build core for R
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git -b ${CIRCLE_BRANCH} dash-main
Comment thread
alexcjohnson marked this conversation as resolved.
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
git clone --depth 1 https://github.com/plotly/dashR.git -b dev dashR
git clone --depth 1 https://github.com/plotly/dash-html-components.git
git clone --depth 1 https://github.com/plotly/dash-core-components.git
git clone --depth 1 https://github.com/plotly/dash-table.git
shopt -s extglob
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 -e 'dash_desc <- read.dcf("dashR/DESCRIPTION"); dt_version <- read.dcf("dash-table/DESCRIPTION")[,"Version"]; dcc_version <- read.dcf("dash-core-components/DESCRIPTION")[,"Version"]; dhc_version <- read.dcf("dash-html-components/DESCRIPTION")[,"Version"]; imports <- dash_desc[,"Imports"][[1]]; imports <- gsub("((?<=dashHtmlComponents )(\\\\(.*?\\\\)))", paste0("(= ", dhc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashCoreComponents )(\\\\(.*?\\\\)))", paste0("(= ", dcc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashTable )(\\\\(.*?\\\\)))", paste0("(= ", dt_version, ")"), imports, perl = TRUE); dash_desc[,"Imports"][[1]] <- imports; dhc_hash <- system("cd dash-html-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dcc_hash <- system("cd dash-core-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dt_hash <- system("cd dash-table; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); remotes <- dash_desc[,"Remotes"][[1]]; remotes <- gsub("((?<=plotly\\\\/dash-html-components@)([a-zA-Z0-9]+))", dhc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-core-components@)([a-zA-Z0-9]+))", dcc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-table@)([a-zA-Z0-9]+))", dt_hash, remotes, perl=TRUE); dash_desc[,"Remotes"][[1]] <- remotes; write.dcf(dash_desc, "dashR/DESCRIPTION")'

- run:
name: 🎛 set environment variables
command: |
Rscript --vanilla \
-e 'dash_dsc <- read.dcf("dashR/DESCRIPTION")' \
-e 'cat(sprintf("export DASH_TARBALL=%s_%s.tar.gz\n", dash_dsc[,"Package"], dash_dsc[,"Version"]))' \
-e 'cat(sprintf("export DASH_CHECK_DIR=%s.Rcheck\n", dash_dsc[,"Package"]))' \
-e 'dhc_dsc <- read.dcf("dash-html-components/DESCRIPTION")' \
-e 'cat(sprintf("export DHC_TARBALL=%s_%s.tar.gz\n", dhc_dsc[,"Package"], dhc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DHC_CHECK_DIR=%s.Rcheck\n", dhc_dsc[,"Package"]))' \
-e 'dcc_dsc <- read.dcf("dash-core-components/DESCRIPTION")' \
-e 'cat(sprintf("export DCC_TARBALL=%s_%s.tar.gz\n", dcc_dsc[,"Package"], dcc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DCC_CHECK_DIR=%s.Rcheck\n", dcc_dsc[,"Package"]))' \
-e 'dt_dsc <- read.dcf("dash-table/DESCRIPTION")' \
-e 'cat(sprintf("export DT_TARBALL=%s_%s.tar.gz\n", dt_dsc[,"Package"], dt_dsc[,"Version"]))' \
-e 'cat(sprintf("export DT_CHECK_DIR=%s.Rcheck\n", dt_dsc[,"Package"]))' \
>> ${BASH_ENV}

- run:
name: ️️📋 run CRAN package checks
command: |
R CMD build dash-core-components
R CMD build dash-html-components
R CMD build dash-table
R CMD build dashR
sudo R CMD INSTALL dash-core-components
sudo R CMD INSTALL dash-html-components
sudo R CMD INSTALL dash-table
sudo R CMD INSTALL dashR
R CMD check "${DHC_TARBALL}" --as-cran --no-manual
R CMD check "${DCC_TARBALL}" --as-cran --no-manual
R CMD check "${DT_TARBALL}" --as-cran --no-manual
R CMD check "${DASH_TARBALL}" --as-cran --no-manual

- run:
name: 🕵 detect failures
command: |
Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
# warnings are errors; enable for stricter checks once CRAN submission finished
# if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DT_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DASH_CHECK_DIR}/00check.log"; then exit 1; fi

- run:
name: 🔎 run unit tests
command: |
sudo Rscript -e 'res=devtools::test("dashR/tests/", reporter=default_reporter());df=as.data.frame(res);if(sum(df$failed) > 0 || any(df$error)) {q(status=1)}'

- run:
name: ⚙️ Integration tests
command: |
python -m venv venv
. venv/bin/activate
cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
export PATH=$PATH:/home/circleci/.local/bin/
pytest --nopercyfinalize --junitxml=test-reports/dashr.xml dashR/tests/integration/dopsa/
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
when: on_fail


test-37: &test
working_directory: ~/dash
docker:
Expand DownExpand Up@@ -279,12 +386,14 @@ workflows:
- build-core-37
- build-windows-37
- build-misc-37
- build-dashr
- test-37:
requires:
- build-core-37
- build-misc-37
- percy-finalize:
requires:
- build-dashr
- test-37
- artifacts:
requires:
Expand Down
4 changes: 2 additions & 2 deletions .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,7 +270,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10
min-similarity-lines=20
Comment thread
alexcjohnson marked this conversation as resolved.


[SPELLING]
Expand DownExpand Up@@ -466,4 +466,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
5 changes: 2 additions & 3 deletions .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,8 +365,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10

min-similarity-lines=20

[SPELLING]

Expand DownExpand Up@@ -565,4 +564,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception".
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
3 changes: 0 additions & 3 deletions dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,9 +221,6 @@ def generate_class_string(name, props, project_shortname, prefix):

default_argtext += ", ".join("{}=NULL".format(p) for p in prop_keys)

if wildcards == ", ...":
default_argtext += ", ..."

# pylint: disable=C0301
default_paramtext += ", ".join(
"{0}={0}".format(p) if p != "children" else "{}=children".format(p)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
28af8f7
Assorted fixes required for CRAN submission (#1186)
rpkyle May 4, 2020
756b8c2
Include transpiled source files in published package
Marc-Andre-Rivet May 4, 2020
83af21f
changelog for prevent_initial_call
alexcjohnson May 4, 2020
3011383
:sparkles: initial R build test
May 5, 2020
d1a1c19
re-enable tests
May 9, 2020
4f7ccc5
fix conflict
May 9, 2020
9c7a111
add # integration test for dopsa
May 9, 2020
98d61aa
activate dopsa test
rpkyle May 13, 2020
63d666e
May 13, 2020
04e6cab
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 13, 2020
e64def6
Merge branch 'dev' into add-rbuild-test
rpkyle May 15, 2020
6841709
when: on_fail + percy_finalize require build-dashr
May 19, 2020
672b31d
Merge branch 'dev' into add-rbuild-test
rpkyle May 19, 2020
22b1cc0
:necktie: try 20 lines similarity threshold
May 19, 2020
feeedc0
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 19, 2020
df0e7fd
Merge branch 'dev' into add-rbuild-test
rpkyle May 21, 2020
0510ed6
:hocho: :arrow_double_down: doubled dots
May 21, 2020
db6e975
try current branch
May 21, 2020
74083ce
:hocho: -b dev
May 21, 2020
fa1c467
:ice_cream: add R flavour
May 21, 2020
0c24262
use 20 lines threshold in .pylintrc37
May 21, 2020
f852144
:necktie: :feet: relocate lintrc
May 21, 2020
502fa4a
try to :recycle: existing dash repo clone
May 21, 2020
59457ba
restore previous config
May 21, 2020
b4117d6
try to fix package.json
May 21, 2020
f80fe9f
removing setup-tests-r for now
May 21, 2020
36d043e
add Percy debug statement
May 22, 2020
d9a54dc
use PERCY_PARALLEL_TOTAL: -1 for R build
May 22, 2020
b94d731
:hocho: debug statements
May 22, 2020
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
111 changes: 110 additions & 1 deletion .circleci/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37

steps:
Expand DownExpand Up@@ -81,7 +82,6 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37
steps:
- checkout
Expand DownExpand Up@@ -213,6 +213,113 @@ jobs:
paths:
- packages/*.tar.gz

build-dashr:
working_directory: ~/dashr
docker:
- image: plotly/dashr:ci
environment:
PERCY_PARALLEL_TOTAL: -1
PYVERSION: python37
_R_CHECK_FORCE_SUGGESTS_: FALSE

steps:
- checkout

- run:
name: ️️🏭 clone and npm build core for R
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git -b ${CIRCLE_BRANCH} dash-main
Comment thread
alexcjohnson marked this conversation as resolved.
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
git clone --depth 1 https://github.com/plotly/dashR.git -b dev dashR
git clone --depth 1 https://github.com/plotly/dash-html-components.git
git clone --depth 1 https://github.com/plotly/dash-core-components.git
git clone --depth 1 https://github.com/plotly/dash-table.git
shopt -s extglob
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 -e 'dash_desc <- read.dcf("dashR/DESCRIPTION"); dt_version <- read.dcf("dash-table/DESCRIPTION")[,"Version"]; dcc_version <- read.dcf("dash-core-components/DESCRIPTION")[,"Version"]; dhc_version <- read.dcf("dash-html-components/DESCRIPTION")[,"Version"]; imports <- dash_desc[,"Imports"][[1]]; imports <- gsub("((?<=dashHtmlComponents )(\\\\(.*?\\\\)))", paste0("(= ", dhc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashCoreComponents )(\\\\(.*?\\\\)))", paste0("(= ", dcc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashTable )(\\\\(.*?\\\\)))", paste0("(= ", dt_version, ")"), imports, perl = TRUE); dash_desc[,"Imports"][[1]] <- imports; dhc_hash <- system("cd dash-html-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dcc_hash <- system("cd dash-core-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dt_hash <- system("cd dash-table; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); remotes <- dash_desc[,"Remotes"][[1]]; remotes <- gsub("((?<=plotly\\\\/dash-html-components@)([a-zA-Z0-9]+))", dhc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-core-components@)([a-zA-Z0-9]+))", dcc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-table@)([a-zA-Z0-9]+))", dt_hash, remotes, perl=TRUE); dash_desc[,"Remotes"][[1]] <- remotes; write.dcf(dash_desc, "dashR/DESCRIPTION")'

- run:
name: 🎛 set environment variables
command: |
Rscript --vanilla \
-e 'dash_dsc <- read.dcf("dashR/DESCRIPTION")' \
-e 'cat(sprintf("export DASH_TARBALL=%s_%s.tar.gz\n", dash_dsc[,"Package"], dash_dsc[,"Version"]))' \
-e 'cat(sprintf("export DASH_CHECK_DIR=%s.Rcheck\n", dash_dsc[,"Package"]))' \
-e 'dhc_dsc <- read.dcf("dash-html-components/DESCRIPTION")' \
-e 'cat(sprintf("export DHC_TARBALL=%s_%s.tar.gz\n", dhc_dsc[,"Package"], dhc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DHC_CHECK_DIR=%s.Rcheck\n", dhc_dsc[,"Package"]))' \
-e 'dcc_dsc <- read.dcf("dash-core-components/DESCRIPTION")' \
-e 'cat(sprintf("export DCC_TARBALL=%s_%s.tar.gz\n", dcc_dsc[,"Package"], dcc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DCC_CHECK_DIR=%s.Rcheck\n", dcc_dsc[,"Package"]))' \
-e 'dt_dsc <- read.dcf("dash-table/DESCRIPTION")' \
-e 'cat(sprintf("export DT_TARBALL=%s_%s.tar.gz\n", dt_dsc[,"Package"], dt_dsc[,"Version"]))' \
-e 'cat(sprintf("export DT_CHECK_DIR=%s.Rcheck\n", dt_dsc[,"Package"]))' \
>> ${BASH_ENV}

- run:
name: ️️📋 run CRAN package checks
command: |
R CMD build dash-core-components
R CMD build dash-html-components
R CMD build dash-table
R CMD build dashR
sudo R CMD INSTALL dash-core-components
sudo R CMD INSTALL dash-html-components
sudo R CMD INSTALL dash-table
sudo R CMD INSTALL dashR
R CMD check "${DHC_TARBALL}" --as-cran --no-manual
R CMD check "${DCC_TARBALL}" --as-cran --no-manual
R CMD check "${DT_TARBALL}" --as-cran --no-manual
R CMD check "${DASH_TARBALL}" --as-cran --no-manual

- run:
name: 🕵 detect failures
command: |
Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
# warnings are errors; enable for stricter checks once CRAN submission finished
# if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DT_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DASH_CHECK_DIR}/00check.log"; then exit 1; fi

- run:
name: 🔎 run unit tests
command: |
sudo Rscript -e 'res=devtools::test("dashR/tests/", reporter=default_reporter());df=as.data.frame(res);if(sum(df$failed) > 0 || any(df$error)) {q(status=1)}'

- run:
name: ⚙️ Integration tests
command: |
python -m venv venv
. venv/bin/activate
cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
export PATH=$PATH:/home/circleci/.local/bin/
pytest --nopercyfinalize --junitxml=test-reports/dashr.xml dashR/tests/integration/dopsa/
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
when: on_fail


test-37: &test
working_directory: ~/dash
docker:
Expand DownExpand Up@@ -279,12 +386,14 @@ workflows:
- build-core-37
- build-windows-37
- build-misc-37
- build-dashr
- test-37:
requires:
- build-core-37
- build-misc-37
- percy-finalize:
requires:
- build-dashr
- test-37
- artifacts:
requires:
Expand Down
4 changes: 2 additions & 2 deletions .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,7 +270,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10
min-similarity-lines=20
Comment thread
alexcjohnson marked this conversation as resolved.


[SPELLING]
Expand DownExpand Up@@ -466,4 +466,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
5 changes: 2 additions & 3 deletions .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,8 +365,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10

min-similarity-lines=20

[SPELLING]

Expand DownExpand Up@@ -565,4 +564,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception".
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
3 changes: 0 additions & 3 deletions dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,9 +221,6 @@ def generate_class_string(name, props, project_shortname, prefix):

default_argtext += ", ".join("{}=NULL".format(p) for p in prop_keys)

if wildcards == ", ...":
default_argtext += ", ..."

# pylint: disable=C0301
default_paramtext += ", ".join(
"{0}={0}".format(p) if p != "children" else "{}=children".format(p)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
28af8f7
Assorted fixes required for CRAN submission (#1186)
rpkyle May 4, 2020
756b8c2
Include transpiled source files in published package
Marc-Andre-Rivet May 4, 2020
83af21f
changelog for prevent_initial_call
alexcjohnson May 4, 2020
3011383
:sparkles: initial R build test
May 5, 2020
d1a1c19
re-enable tests
May 9, 2020
4f7ccc5
fix conflict
May 9, 2020
9c7a111
add # integration test for dopsa
May 9, 2020
98d61aa
activate dopsa test
rpkyle May 13, 2020
63d666e
May 13, 2020
04e6cab
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 13, 2020
e64def6
Merge branch 'dev' into add-rbuild-test
rpkyle May 15, 2020
6841709
when: on_fail + percy_finalize require build-dashr
May 19, 2020
672b31d
Merge branch 'dev' into add-rbuild-test
rpkyle May 19, 2020
22b1cc0
:necktie: try 20 lines similarity threshold
May 19, 2020
feeedc0
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 19, 2020
df0e7fd
Merge branch 'dev' into add-rbuild-test
rpkyle May 21, 2020
0510ed6
:hocho: :arrow_double_down: doubled dots
May 21, 2020
db6e975
try current branch
May 21, 2020
74083ce
:hocho: -b dev
May 21, 2020
fa1c467
:ice_cream: add R flavour
May 21, 2020
0c24262
use 20 lines threshold in .pylintrc37
May 21, 2020
f852144
:necktie: :feet: relocate lintrc
May 21, 2020
502fa4a
try to :recycle: existing dash repo clone
May 21, 2020
59457ba
restore previous config
May 21, 2020
b4117d6
try to fix package.json
May 21, 2020
f80fe9f
removing setup-tests-r for now
May 21, 2020
36d043e
add Percy debug statement
May 22, 2020
d9a54dc
use PERCY_PARALLEL_TOTAL: -1 for R build
May 22, 2020
b94d731
:hocho: debug statements
May 22, 2020
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
111 changes: 110 additions & 1 deletion .circleci/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37

steps:
Expand DownExpand Up@@ -81,7 +82,6 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37
steps:
- checkout
Expand DownExpand Up@@ -213,6 +213,113 @@ jobs:
paths:
- packages/*.tar.gz

build-dashr:
working_directory: ~/dashr
docker:
- image: plotly/dashr:ci
environment:
PERCY_PARALLEL_TOTAL: -1
PYVERSION: python37
_R_CHECK_FORCE_SUGGESTS_: FALSE

steps:
- checkout

- run:
name: ️️🏭 clone and npm build core for R
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git -b ${CIRCLE_BRANCH} dash-main
Comment thread
alexcjohnson marked this conversation as resolved.
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
git clone --depth 1 https://github.com/plotly/dashR.git -b dev dashR
git clone --depth 1 https://github.com/plotly/dash-html-components.git
git clone --depth 1 https://github.com/plotly/dash-core-components.git
git clone --depth 1 https://github.com/plotly/dash-table.git
shopt -s extglob
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 -e 'dash_desc <- read.dcf("dashR/DESCRIPTION"); dt_version <- read.dcf("dash-table/DESCRIPTION")[,"Version"]; dcc_version <- read.dcf("dash-core-components/DESCRIPTION")[,"Version"]; dhc_version <- read.dcf("dash-html-components/DESCRIPTION")[,"Version"]; imports <- dash_desc[,"Imports"][[1]]; imports <- gsub("((?<=dashHtmlComponents )(\\\\(.*?\\\\)))", paste0("(= ", dhc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashCoreComponents )(\\\\(.*?\\\\)))", paste0("(= ", dcc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashTable )(\\\\(.*?\\\\)))", paste0("(= ", dt_version, ")"), imports, perl = TRUE); dash_desc[,"Imports"][[1]] <- imports; dhc_hash <- system("cd dash-html-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dcc_hash <- system("cd dash-core-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dt_hash <- system("cd dash-table; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); remotes <- dash_desc[,"Remotes"][[1]]; remotes <- gsub("((?<=plotly\\\\/dash-html-components@)([a-zA-Z0-9]+))", dhc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-core-components@)([a-zA-Z0-9]+))", dcc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-table@)([a-zA-Z0-9]+))", dt_hash, remotes, perl=TRUE); dash_desc[,"Remotes"][[1]] <- remotes; write.dcf(dash_desc, "dashR/DESCRIPTION")'

- run:
name: 🎛 set environment variables
command: |
Rscript --vanilla \
-e 'dash_dsc <- read.dcf("dashR/DESCRIPTION")' \
-e 'cat(sprintf("export DASH_TARBALL=%s_%s.tar.gz\n", dash_dsc[,"Package"], dash_dsc[,"Version"]))' \
-e 'cat(sprintf("export DASH_CHECK_DIR=%s.Rcheck\n", dash_dsc[,"Package"]))' \
-e 'dhc_dsc <- read.dcf("dash-html-components/DESCRIPTION")' \
-e 'cat(sprintf("export DHC_TARBALL=%s_%s.tar.gz\n", dhc_dsc[,"Package"], dhc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DHC_CHECK_DIR=%s.Rcheck\n", dhc_dsc[,"Package"]))' \
-e 'dcc_dsc <- read.dcf("dash-core-components/DESCRIPTION")' \
-e 'cat(sprintf("export DCC_TARBALL=%s_%s.tar.gz\n", dcc_dsc[,"Package"], dcc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DCC_CHECK_DIR=%s.Rcheck\n", dcc_dsc[,"Package"]))' \
-e 'dt_dsc <- read.dcf("dash-table/DESCRIPTION")' \
-e 'cat(sprintf("export DT_TARBALL=%s_%s.tar.gz\n", dt_dsc[,"Package"], dt_dsc[,"Version"]))' \
-e 'cat(sprintf("export DT_CHECK_DIR=%s.Rcheck\n", dt_dsc[,"Package"]))' \
>> ${BASH_ENV}

- run:
name: ️️📋 run CRAN package checks
command: |
R CMD build dash-core-components
R CMD build dash-html-components
R CMD build dash-table
R CMD build dashR
sudo R CMD INSTALL dash-core-components
sudo R CMD INSTALL dash-html-components
sudo R CMD INSTALL dash-table
sudo R CMD INSTALL dashR
R CMD check "${DHC_TARBALL}" --as-cran --no-manual
R CMD check "${DCC_TARBALL}" --as-cran --no-manual
R CMD check "${DT_TARBALL}" --as-cran --no-manual
R CMD check "${DASH_TARBALL}" --as-cran --no-manual

- run:
name: 🕵 detect failures
command: |
Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
# warnings are errors; enable for stricter checks once CRAN submission finished
# if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DT_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DASH_CHECK_DIR}/00check.log"; then exit 1; fi

- run:
name: 🔎 run unit tests
command: |
sudo Rscript -e 'res=devtools::test("dashR/tests/", reporter=default_reporter());df=as.data.frame(res);if(sum(df$failed) > 0 || any(df$error)) {q(status=1)}'

- run:
name: ⚙️ Integration tests
command: |
python -m venv venv
. venv/bin/activate
cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
export PATH=$PATH:/home/circleci/.local/bin/
pytest --nopercyfinalize --junitxml=test-reports/dashr.xml dashR/tests/integration/dopsa/
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
when: on_fail


test-37: &test
working_directory: ~/dash
docker:
Expand DownExpand Up@@ -279,12 +386,14 @@ workflows:
- build-core-37
- build-windows-37
- build-misc-37
- build-dashr
- test-37:
requires:
- build-core-37
- build-misc-37
- percy-finalize:
requires:
- build-dashr
- test-37
- artifacts:
requires:
Expand Down
4 changes: 2 additions & 2 deletions .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,7 +270,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10
min-similarity-lines=20
Comment thread
alexcjohnson marked this conversation as resolved.


[SPELLING]
Expand DownExpand Up@@ -466,4 +466,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
5 changes: 2 additions & 3 deletions .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,8 +365,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10

min-similarity-lines=20

[SPELLING]

Expand DownExpand Up@@ -565,4 +564,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception".
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
3 changes: 0 additions & 3 deletions dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,9 +221,6 @@ def generate_class_string(name, props, project_shortname, prefix):

default_argtext += ", ".join("{}=NULL".format(p) for p in prop_keys)

if wildcards == ", ...":
default_argtext += ", ..."

# pylint: disable=C0301
default_paramtext += ", ".join(
"{0}={0}".format(p) if p != "children" else "{}=children".format(p)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
28af8f7
Assorted fixes required for CRAN submission (#1186)
rpkyle May 4, 2020
756b8c2
Include transpiled source files in published package
Marc-Andre-Rivet May 4, 2020
83af21f
changelog for prevent_initial_call
alexcjohnson May 4, 2020
3011383
:sparkles: initial R build test
May 5, 2020
d1a1c19
re-enable tests
May 9, 2020
4f7ccc5
fix conflict
May 9, 2020
9c7a111
add # integration test for dopsa
May 9, 2020
98d61aa
activate dopsa test
rpkyle May 13, 2020
63d666e
May 13, 2020
04e6cab
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 13, 2020
e64def6
Merge branch 'dev' into add-rbuild-test
rpkyle May 15, 2020
6841709
when: on_fail + percy_finalize require build-dashr
May 19, 2020
672b31d
Merge branch 'dev' into add-rbuild-test
rpkyle May 19, 2020
22b1cc0
:necktie: try 20 lines similarity threshold
May 19, 2020
feeedc0
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 19, 2020
df0e7fd
Merge branch 'dev' into add-rbuild-test
rpkyle May 21, 2020
0510ed6
:hocho: :arrow_double_down: doubled dots
May 21, 2020
db6e975
try current branch
May 21, 2020
74083ce
:hocho: -b dev
May 21, 2020
fa1c467
:ice_cream: add R flavour
May 21, 2020
0c24262
use 20 lines threshold in .pylintrc37
May 21, 2020
f852144
:necktie: :feet: relocate lintrc
May 21, 2020
502fa4a
try to :recycle: existing dash repo clone
May 21, 2020
59457ba
restore previous config
May 21, 2020
b4117d6
try to fix package.json
May 21, 2020
f80fe9f
removing setup-tests-r for now
May 21, 2020
36d043e
add Percy debug statement
May 22, 2020
d9a54dc
use PERCY_PARALLEL_TOTAL: -1 for R build
May 22, 2020
b94d731
:hocho: debug statements
May 22, 2020
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
111 changes: 110 additions & 1 deletion .circleci/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37

steps:
Expand DownExpand Up@@ -81,7 +82,6 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37
steps:
- checkout
Expand DownExpand Up@@ -213,6 +213,113 @@ jobs:
paths:
- packages/*.tar.gz

build-dashr:
working_directory: ~/dashr
docker:
- image: plotly/dashr:ci
environment:
PERCY_PARALLEL_TOTAL: -1
PYVERSION: python37
_R_CHECK_FORCE_SUGGESTS_: FALSE

steps:
- checkout

- run:
name: ️️🏭 clone and npm build core for R
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git -b ${CIRCLE_BRANCH} dash-main
Comment thread
alexcjohnson marked this conversation as resolved.
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
git clone --depth 1 https://github.com/plotly/dashR.git -b dev dashR
git clone --depth 1 https://github.com/plotly/dash-html-components.git
git clone --depth 1 https://github.com/plotly/dash-core-components.git
git clone --depth 1 https://github.com/plotly/dash-table.git
shopt -s extglob
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 -e 'dash_desc <- read.dcf("dashR/DESCRIPTION"); dt_version <- read.dcf("dash-table/DESCRIPTION")[,"Version"]; dcc_version <- read.dcf("dash-core-components/DESCRIPTION")[,"Version"]; dhc_version <- read.dcf("dash-html-components/DESCRIPTION")[,"Version"]; imports <- dash_desc[,"Imports"][[1]]; imports <- gsub("((?<=dashHtmlComponents )(\\\\(.*?\\\\)))", paste0("(= ", dhc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashCoreComponents )(\\\\(.*?\\\\)))", paste0("(= ", dcc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashTable )(\\\\(.*?\\\\)))", paste0("(= ", dt_version, ")"), imports, perl = TRUE); dash_desc[,"Imports"][[1]] <- imports; dhc_hash <- system("cd dash-html-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dcc_hash <- system("cd dash-core-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dt_hash <- system("cd dash-table; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); remotes <- dash_desc[,"Remotes"][[1]]; remotes <- gsub("((?<=plotly\\\\/dash-html-components@)([a-zA-Z0-9]+))", dhc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-core-components@)([a-zA-Z0-9]+))", dcc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-table@)([a-zA-Z0-9]+))", dt_hash, remotes, perl=TRUE); dash_desc[,"Remotes"][[1]] <- remotes; write.dcf(dash_desc, "dashR/DESCRIPTION")'

- run:
name: 🎛 set environment variables
command: |
Rscript --vanilla \
-e 'dash_dsc <- read.dcf("dashR/DESCRIPTION")' \
-e 'cat(sprintf("export DASH_TARBALL=%s_%s.tar.gz\n", dash_dsc[,"Package"], dash_dsc[,"Version"]))' \
-e 'cat(sprintf("export DASH_CHECK_DIR=%s.Rcheck\n", dash_dsc[,"Package"]))' \
-e 'dhc_dsc <- read.dcf("dash-html-components/DESCRIPTION")' \
-e 'cat(sprintf("export DHC_TARBALL=%s_%s.tar.gz\n", dhc_dsc[,"Package"], dhc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DHC_CHECK_DIR=%s.Rcheck\n", dhc_dsc[,"Package"]))' \
-e 'dcc_dsc <- read.dcf("dash-core-components/DESCRIPTION")' \
-e 'cat(sprintf("export DCC_TARBALL=%s_%s.tar.gz\n", dcc_dsc[,"Package"], dcc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DCC_CHECK_DIR=%s.Rcheck\n", dcc_dsc[,"Package"]))' \
-e 'dt_dsc <- read.dcf("dash-table/DESCRIPTION")' \
-e 'cat(sprintf("export DT_TARBALL=%s_%s.tar.gz\n", dt_dsc[,"Package"], dt_dsc[,"Version"]))' \
-e 'cat(sprintf("export DT_CHECK_DIR=%s.Rcheck\n", dt_dsc[,"Package"]))' \
>> ${BASH_ENV}

- run:
name: ️️📋 run CRAN package checks
command: |
R CMD build dash-core-components
R CMD build dash-html-components
R CMD build dash-table
R CMD build dashR
sudo R CMD INSTALL dash-core-components
sudo R CMD INSTALL dash-html-components
sudo R CMD INSTALL dash-table
sudo R CMD INSTALL dashR
R CMD check "${DHC_TARBALL}" --as-cran --no-manual
R CMD check "${DCC_TARBALL}" --as-cran --no-manual
R CMD check "${DT_TARBALL}" --as-cran --no-manual
R CMD check "${DASH_TARBALL}" --as-cran --no-manual

- run:
name: 🕵 detect failures
command: |
Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
# warnings are errors; enable for stricter checks once CRAN submission finished
# if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DT_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DASH_CHECK_DIR}/00check.log"; then exit 1; fi

- run:
name: 🔎 run unit tests
command: |
sudo Rscript -e 'res=devtools::test("dashR/tests/", reporter=default_reporter());df=as.data.frame(res);if(sum(df$failed) > 0 || any(df$error)) {q(status=1)}'

- run:
name: ⚙️ Integration tests
command: |
python -m venv venv
. venv/bin/activate
cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
export PATH=$PATH:/home/circleci/.local/bin/
pytest --nopercyfinalize --junitxml=test-reports/dashr.xml dashR/tests/integration/dopsa/
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
when: on_fail


test-37: &test
working_directory: ~/dash
docker:
Expand DownExpand Up@@ -279,12 +386,14 @@ workflows:
- build-core-37
- build-windows-37
- build-misc-37
- build-dashr
- test-37:
requires:
- build-core-37
- build-misc-37
- percy-finalize:
requires:
- build-dashr
- test-37
- artifacts:
requires:
Expand Down
4 changes: 2 additions & 2 deletions .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,7 +270,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10
min-similarity-lines=20
Comment thread
alexcjohnson marked this conversation as resolved.


[SPELLING]
Expand DownExpand Up@@ -466,4 +466,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
5 changes: 2 additions & 3 deletions .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,8 +365,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10

min-similarity-lines=20

[SPELLING]

Expand DownExpand Up@@ -565,4 +564,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception".
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
3 changes: 0 additions & 3 deletions dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,9 +221,6 @@ def generate_class_string(name, props, project_shortname, prefix):

default_argtext += ", ".join("{}=NULL".format(p) for p in prop_keys)

if wildcards == ", ...":
default_argtext += ", ..."

# pylint: disable=C0301
default_paramtext += ", ".join(
"{0}={0}".format(p) if p != "children" else "{}=children".format(p)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
28af8f7
Assorted fixes required for CRAN submission (#1186)
rpkyle May 4, 2020
756b8c2
Include transpiled source files in published package
Marc-Andre-Rivet May 4, 2020
83af21f
changelog for prevent_initial_call
alexcjohnson May 4, 2020
3011383
:sparkles: initial R build test
May 5, 2020
d1a1c19
re-enable tests
May 9, 2020
4f7ccc5
fix conflict
May 9, 2020
9c7a111
add # integration test for dopsa
May 9, 2020
98d61aa
activate dopsa test
rpkyle May 13, 2020
63d666e
May 13, 2020
04e6cab
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 13, 2020
e64def6
Merge branch 'dev' into add-rbuild-test
rpkyle May 15, 2020
6841709
when: on_fail + percy_finalize require build-dashr
May 19, 2020
672b31d
Merge branch 'dev' into add-rbuild-test
rpkyle May 19, 2020
22b1cc0
:necktie: try 20 lines similarity threshold
May 19, 2020
feeedc0
Merge branch 'add-rbuild-test' of github.com:plotly/dash into add-rbu…
May 19, 2020
df0e7fd
Merge branch 'dev' into add-rbuild-test
rpkyle May 21, 2020
0510ed6
:hocho: :arrow_double_down: doubled dots
May 21, 2020
db6e975
try current branch
May 21, 2020
74083ce
:hocho: -b dev
May 21, 2020
fa1c467
:ice_cream: add R flavour
May 21, 2020
0c24262
use 20 lines threshold in .pylintrc37
May 21, 2020
f852144
:necktie: :feet: relocate lintrc
May 21, 2020
502fa4a
try to :recycle: existing dash repo clone
May 21, 2020
59457ba
restore previous config
May 21, 2020
b4117d6
try to fix package.json
May 21, 2020
f80fe9f
removing setup-tests-r for now
May 21, 2020
36d043e
add Percy debug statement
May 22, 2020
d9a54dc
use PERCY_PARALLEL_TOTAL: -1 for R build
May 22, 2020
b94d731
:hocho: debug statements
May 22, 2020
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
111 changes: 110 additions & 1 deletion .circleci/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37

steps:
Expand DownExpand Up@@ -81,7 +82,6 @@ jobs:
docker:
- image: circleci/python:3.7-stretch-node-browsers
environment:
PYLINTRC: .pylintrc37
PYVERSION: python37
steps:
- checkout
Expand DownExpand Up@@ -213,6 +213,113 @@ jobs:
paths:
- packages/*.tar.gz

build-dashr:
working_directory: ~/dashr
docker:
- image: plotly/dashr:ci
environment:
PERCY_PARALLEL_TOTAL: -1
PYVERSION: python37
_R_CHECK_FORCE_SUGGESTS_: FALSE

steps:
- checkout

- run:
name: ️️🏭 clone and npm build core for R
command: |
python -m venv venv
. venv/bin/activate
git clone --depth 1 https://github.com/plotly/dash.git -b ${CIRCLE_BRANCH} dash-main
Comment thread
alexcjohnson marked this conversation as resolved.
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ..
git clone --depth 1 https://github.com/plotly/dashR.git -b dev dashR
git clone --depth 1 https://github.com/plotly/dash-html-components.git
git clone --depth 1 https://github.com/plotly/dash-core-components.git
git clone --depth 1 https://github.com/plotly/dash-table.git
shopt -s extglob
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 -e 'dash_desc <- read.dcf("dashR/DESCRIPTION"); dt_version <- read.dcf("dash-table/DESCRIPTION")[,"Version"]; dcc_version <- read.dcf("dash-core-components/DESCRIPTION")[,"Version"]; dhc_version <- read.dcf("dash-html-components/DESCRIPTION")[,"Version"]; imports <- dash_desc[,"Imports"][[1]]; imports <- gsub("((?<=dashHtmlComponents )(\\\\(.*?\\\\)))", paste0("(= ", dhc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashCoreComponents )(\\\\(.*?\\\\)))", paste0("(= ", dcc_version, ")"), imports, perl = TRUE); imports <- gsub("((?<=dashTable )(\\\\(.*?\\\\)))", paste0("(= ", dt_version, ")"), imports, perl = TRUE); dash_desc[,"Imports"][[1]] <- imports; dhc_hash <- system("cd dash-html-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dcc_hash <- system("cd dash-core-components; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); dt_hash <- system("cd dash-table; git rev-parse HEAD | tr -d '\''\n'\''", intern=TRUE); remotes <- dash_desc[,"Remotes"][[1]]; remotes <- gsub("((?<=plotly\\\\/dash-html-components@)([a-zA-Z0-9]+))", dhc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-core-components@)([a-zA-Z0-9]+))", dcc_hash, remotes, perl=TRUE); remotes <- gsub("((?<=plotly\\\\/dash-table@)([a-zA-Z0-9]+))", dt_hash, remotes, perl=TRUE); dash_desc[,"Remotes"][[1]] <- remotes; write.dcf(dash_desc, "dashR/DESCRIPTION")'

- run:
name: 🎛 set environment variables
command: |
Rscript --vanilla \
-e 'dash_dsc <- read.dcf("dashR/DESCRIPTION")' \
-e 'cat(sprintf("export DASH_TARBALL=%s_%s.tar.gz\n", dash_dsc[,"Package"], dash_dsc[,"Version"]))' \
-e 'cat(sprintf("export DASH_CHECK_DIR=%s.Rcheck\n", dash_dsc[,"Package"]))' \
-e 'dhc_dsc <- read.dcf("dash-html-components/DESCRIPTION")' \
-e 'cat(sprintf("export DHC_TARBALL=%s_%s.tar.gz\n", dhc_dsc[,"Package"], dhc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DHC_CHECK_DIR=%s.Rcheck\n", dhc_dsc[,"Package"]))' \
-e 'dcc_dsc <- read.dcf("dash-core-components/DESCRIPTION")' \
-e 'cat(sprintf("export DCC_TARBALL=%s_%s.tar.gz\n", dcc_dsc[,"Package"], dcc_dsc[,"Version"]))' \
-e 'cat(sprintf("export DCC_CHECK_DIR=%s.Rcheck\n", dcc_dsc[,"Package"]))' \
-e 'dt_dsc <- read.dcf("dash-table/DESCRIPTION")' \
-e 'cat(sprintf("export DT_TARBALL=%s_%s.tar.gz\n", dt_dsc[,"Package"], dt_dsc[,"Version"]))' \
-e 'cat(sprintf("export DT_CHECK_DIR=%s.Rcheck\n", dt_dsc[,"Package"]))' \
>> ${BASH_ENV}

- run:
name: ️️📋 run CRAN package checks
command: |
R CMD build dash-core-components
R CMD build dash-html-components
R CMD build dash-table
R CMD build dashR
sudo R CMD INSTALL dash-core-components
sudo R CMD INSTALL dash-html-components
sudo R CMD INSTALL dash-table
sudo R CMD INSTALL dashR
R CMD check "${DHC_TARBALL}" --as-cran --no-manual
R CMD check "${DCC_TARBALL}" --as-cran --no-manual
R CMD check "${DT_TARBALL}" --as-cran --no-manual
R CMD check "${DASH_TARBALL}" --as-cran --no-manual

- run:
name: 🕵 detect failures
command: |
Rscript -e "message(devtools::check_failures(path = '${DHC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DCC_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DT_CHECK_DIR}'))"
Rscript -e "message(devtools::check_failures(path = '${DASH_CHECK_DIR}'))"
# warnings are errors; enable for stricter checks once CRAN submission finished
# if grep -q -R "WARNING" "${DHC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DCC_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DT_CHECK_DIR}/00check.log"; then exit 1; fi
# if grep -q -R "WARNING" "${DASH_CHECK_DIR}/00check.log"; then exit 1; fi

- run:
name: 🔎 run unit tests
command: |
sudo Rscript -e 'res=devtools::test("dashR/tests/", reporter=default_reporter());df=as.data.frame(res);if(sum(df$failed) > 0 || any(df$error)) {q(status=1)}'

- run:
name: ⚙️ Integration tests
command: |
python -m venv venv
. venv/bin/activate
cd dash-main/\@plotly/dash-generator-test-component-nested && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
cd dash-main/\@plotly/dash-generator-test-component-standard && npm ci && npm run build && sudo R CMD INSTALL . && cd ../../..
export PATH=$PATH:/home/circleci/.local/bin/
pytest --nopercyfinalize --junitxml=test-reports/dashr.xml dashR/tests/integration/dopsa/
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts

- run:
name: 🦔 percy finalize
command: npx percy finalize --all
when: on_fail


test-37: &test
working_directory: ~/dash
docker:
Expand DownExpand Up@@ -279,12 +386,14 @@ workflows:
- build-core-37
- build-windows-37
- build-misc-37
- build-dashr
- test-37:
requires:
- build-core-37
- build-misc-37
- percy-finalize:
requires:
- build-dashr
- test-37
- artifacts:
requires:
Expand Down
4 changes: 2 additions & 2 deletions .pylintrc
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,7 +270,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10
min-similarity-lines=20
Comment thread
alexcjohnson marked this conversation as resolved.


[SPELLING]
Expand DownExpand Up@@ -466,4 +466,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
5 changes: 2 additions & 3 deletions .pylintrc37
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,8 +365,7 @@ ignore-docstrings=yes
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=10

min-similarity-lines=20

[SPELLING]

Expand DownExpand Up@@ -565,4 +564,4 @@ known-third-party=enchant

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception".
overgeneral-exceptions=Exception
overgeneral-exceptions=Exception
3 changes: 0 additions & 3 deletions dash/development/_r_components_generation.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,9 +221,6 @@ def generate_class_string(name, props, project_shortname, prefix):

default_argtext += ", ".join("{}=NULL".format(p) for p in prop_keys)

if wildcards == ", ...":
default_argtext += ", ..."

# pylint: disable=C0301
default_paramtext += ", ".join(
"{0}={0}".format(p) if p != "children" else "{}=children".format(p)
Expand Down