Merge branch 'dev' into master-1.21.0

Author: alexcjohnson

.circleci/config.yml

@@ -13,12 +13,12 @@ jobs:
 
   artifacts:
     docker:
-      - image: circleci/python:3.7.9-stretch-node-browsers
+      - image: circleci/python:3.9.2-buster-node-browsers
         auth:
           username: dashautomation
           password: $DASH_PAT_DOCKERHUB
         environment:
-          PYVERSION: python37
+          PYVERSION: python39
     steps:
       - checkout
       - run: echo $PYVERSION > ver.txt
@@ -30,16 +30,16 @@ jobs:
           path: ~/dash/packages
           destination: /tmp/packages
 
-  lint-unit-37: &lint-unit
+  lint-unit-39: &lint-unit
     working_directory: ~/dash
     docker:
-      - image: circleci/python:3.7.9-stretch-node-browsers
+      - image: circleci/python:3.9.2-buster-node-browsers
         auth:
           username: dashautomation
           password: $DASH_PAT_DOCKERHUB
         environment:
-          PYLINTRC: .pylintrc37
-          PYVERSION: python37
+          PYLINTRC: .pylintrc39
+          PYVERSION: python39
 
     steps:
       - checkout
@@ -61,6 +61,7 @@ jobs:
           command: |
             . venv/bin/activate
             set -eo pipefail
+            cd dash/dash-renderer && renderer build && cd ../../
             pip install -e . --progress-bar off && pip list | grep dash
             npm install --production && npm run initialize
             npm run lint
@@ -73,7 +74,7 @@ jobs:
   lint-unit-36:
     <<: *lint-unit
     docker:
-      - image: circleci/python:3.6.12-stretch-node-browsers
+      - image: circleci/python:3.6.13-stretch-node-browsers
         auth:
           username: dashautomation
           password: $DASH_PAT_DOCKERHUB
@@ -92,15 +93,15 @@ jobs:
           PYLINTRC: .pylintrc
           PYVERSION: python27
 
-  build-core-37: &build-core
+  build-core-39: &build-core
     working_directory: ~/dash
     docker:
-      - image: circleci/python:3.7.9-stretch-node-browsers
+      - image: circleci/python:3.9.2-buster-node-browsers
         auth:
           username: dashautomation
           password: $DASH_PAT_DOCKERHUB
         environment:
-          PYVERSION: python37
+          PYVERSION: python39
     steps:
       - checkout
       - run: echo $PYVERSION > ver.txt
@@ -121,7 +122,7 @@ jobs:
           name: ️️🏗️ build core
           command: |
             . venv/bin/activate && pip install --no-cache-dir --upgrade -e . --progress-bar off && mkdir packages
-            cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
+            cd dash/dash-renderer && renderer build && cd ../../ && python setup.py sdist && mv dist/* packages/
             git clone --depth 1 https://github.com/plotly/dash-core-components.git
             cd dash-core-components && npm ci && npm run build && python setup.py sdist && mv dist/* ../packages/  && cd ..
             ls -la packages
@@ -133,7 +134,7 @@ jobs:
   build-core-36:
     <<: *build-core
     docker:
-      - image: circleci/python:3.6.12-stretch-node-browsers
+      - image: circleci/python:3.6.13-stretch-node-browsers
         auth:
           username: dashautomation
           password: $DASH_PAT_DOCKERHUB
@@ -150,15 +151,15 @@ jobs:
         environment:
           PYVERSION: python27
 
-  build-misc-37: &build-misc
+  build-misc-39: &build-misc
     working_directory: ~/dash
     docker:
-      - image: circleci/python:3.7.9-stretch-node-browsers
+      - image: circleci/python:3.9.2-buster-node-browsers
         auth:
           username: dashautomation
           password: $DASH_PAT_DOCKERHUB
         environment:
-          PYVERSION: python37
+          PYVERSION: python39
 
     steps:
       - checkout
@@ -192,7 +193,7 @@ jobs:
   build-misc-36:
     <<: *build-misc
     docker:
-      - image: circleci/python:3.6.12-stretch-node-browsers
+      - image: circleci/python:3.6.13-stretch-node-browsers
         auth:
           username: dashautomation
           password: $DASH_PAT_DOCKERHUB
@@ -209,144 +210,35 @@ jobs:
         environment:
           PYVERSION: python27
 
-  build-windows-37:
+  build-windows-39:
     working_directory: ~/dash
     executor:
       name: win/default
       shell: bash.exe
     environment:
-      PYVERSION: python37
+      PYVERSION: python39
     steps:
       - checkout
       - run: echo $PYVERSION > ver.txt
       - run:
           name: ️️🏗️ build core
           command: |
             pip install --no-cache-dir --upgrade -e .[dev,testing] --progress-bar off
-            cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
+            cd dash/dash-renderer && renderer build && cd ../../ && python setup.py sdist && mv dist/* packages/
             git clone --depth 1 https://github.com/plotly/dash-core-components.git
             cd dash-core-components && npm ci && npm run build && python setup.py sdist && cd ..
 
-  build-dashr:
-    working_directory: ~/dashr
-    docker:
-      - image: plotly/dashr:ci
-        auth:
-          username: dashautomation
-          password: $DASH_PAT_DOCKERHUB
-        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
-            npm ci
-            pip install --no-cache-dir --upgrade -e .[dev,testing] --progress-bar off
-            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 dashR/tests/circleci/fixup_metadata.R
-
-      - 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; enabled for stricter CRAN checks, disable if noisy
-            # 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: |
-              # unfortunately testthat does not and will not support returning a status
-              # code other than success, even when tests fail -- this is a workaround
-              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
-            npm run setup-tests.R
-            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
+  test-39: &test
     working_directory: ~/dash
     docker:
-      - image: circleci/python:3.7.9-stretch-node-browsers
+      - image: circleci/python:3.9.2-buster-node-browsers
         auth:
           username: dashautomation
           password: $DASH_PAT_DOCKERHUB
         environment:
           PERCY_PARALLEL_TOTAL: -1
           PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: True
-          PYVERSION: python37
+          PYVERSION: python39
     parallelism: 3
     steps:
       - checkout
@@ -384,7 +276,7 @@ jobs:
   test-36:
     <<: *test
     docker:
-      - image: circleci/python:3.6.12-stretch-node-browsers
+      - image: circleci/python:3.6.13-stretch-node-browsers
         auth:
           username: dashautomation
           password: $DASH_PAT_DOCKERHUB
@@ -405,21 +297,19 @@ jobs:
 
 workflows:
   version: 2
-  python3.7:
+  python3.9:
     jobs:
-      - lint-unit-37
-      - build-core-37
-      - build-windows-37
-      - build-misc-37
-      - build-dashr
-      - test-37:
+      - lint-unit-39
+      - build-core-39
+      - build-windows-39
+      - build-misc-39
+      - test-39:
           requires:
-            - build-core-37
-            - build-misc-37
+            - build-core-39
+            - build-misc-39
       - percy-finalize:
           requires:
-            - build-dashr
-            - test-37
+            - test-39
       - artifacts:
           requires:
             - percy-finalize

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: plotly
-custom: https://plot.ly/products/consulting-and-oem/
+custom: https://plotly.com/products/consulting-and-oem/

.gitignore

@@ -42,6 +42,7 @@ coverage.xml
 # Distribution / packaging
 .Python
 build/
+dash/deps/
 develop-eggs/
 dist/
 downloads/

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1 @@
+npm run lint

.huskyrc

@@ -87,6 +87,7 @@ disable=invalid-name,
         buffer-builtin,
         cmp-builtin,
         coerce-builtin,
+        consider-using-with,
         execfile-builtin,
         file-builtin,
         long-builtin,