Merge branch 'main' into snyk-upgrade-1ce142f7d4bb78c873c821341d7e47f8

.github/workflows/images.yml

@@ -90,7 +90,7 @@ jobs:
       - uses: docker/login-action@v2
         with:
           registry: docker.io
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - uses: docker/login-action@v2
         with:

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
       - run: >
           gh release create --target ${{
           github.event.pull_request.merge_commit_sha }} {--title=CML\
-          ,}$(basename ${{ github.head_ref }}) --generate-notes --draft
+          ,}"$(basename "$GITHUB_HEAD_REF")" --generate-notes --draft
         env:
           GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
   package:

.github/workflows/test-deploy.yml

@@ -65,10 +65,10 @@ jobs:
           TEST_GITLAB_REPO: https://gitlab.com/iterative.ai/cml_qa_tests_dummy
           TEST_GITLAB_SHA: f8b8b49a253243830ef59a7f090eb887157b2b67
           TEST_GITLAB_ISSUE: 1
-          TEST_BBCLOUD_TOKEN: ${{ secrets.TEST_BBCLOUD_TOKEN }}
-          TEST_BBCLOUD_REPO: https://bitbucket.org/iterative-ai/cml-qa-tests-dummy
-          TEST_BBCLOUD_SHA: b511535a89f76d3d311b1c15e3e712b15c0b94e3
-          TEST_BBCLOUD_ISSUE: 1
+          TEST_BITBUCKET_TOKEN: ${{ secrets.TEST_BITBUCKET_TOKEN }}
+          TEST_BITBUCKET_REPO: https://bitbucket.org/iterative-ai/cml-qa-tests-dummy
+          TEST_BITBUCKET_SHA: b511535a89f76d3d311b1c15e3e712b15c0b94e3
+          TEST_BITBUCKET_ISSUE: 1
   test-os:
     needs: authorize
     name: test-${{ matrix.system }}

.github/workflows/trigger-external.yml

@@ -9,12 +9,12 @@ on:
   release:
     types: [published]
   pull_request_target:
-    branches: [master]
+    branches: [main]
   push:
-    branches: [master]
+    branches: [main]
 jobs:
   push:
-    if: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
+    if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -26,7 +26,7 @@ jobs:
             --header "Authorization: token ${{ secrets.TEST_GITHUB_TOKEN }}" \
             --header "Accept: application/vnd.github.v3+json" \
             --url "https://api.github.com/repos/iterative/${{ matrix.repos }}/dispatches" \
-            --data '{"event_type":"push", "client_payload": {"branch":"master"}}'
+            --data '{"event_type":"push", "client_payload": {"branch":"main"}}'
   pr:
     if: ${{ github.event_name == 'pull_request_target' }}
     runs-on: ubuntu-latest

.gitignore

@@ -1,14 +1,130 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
 node_modules/
-.terraform/
-.cml/
-.DS_Store
-
-main.tf
-terraform.*
-!terraform.js
-!terraform.test.js
-crash.log
-/build
-/coverage
-
-.idea/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*

Dockerfile

@@ -111,7 +111,7 @@ RUN add-apt-repository universe --yes \
  && apt-get clean \
  && rm --recursive --force /var/lib/apt/lists/* \
  && npm config set user 0 \
- && npm install --global canvas@2 vega@5 vega-cli@5 vega-lite@5
+ && npm install --global canvas@2 vega@5 vega-cli@5 vega-lite@5.14.1
 
 # CONFIGURE RUNNER PATH
 ENV CML_RUNNER_PATH=/home/runner

README.md

@@ -109,7 +109,7 @@ jobs:
 ## Usage
 
 We helpfully provide CML and other useful libraries pre-installed on our
-[custom Docker images](https://github.com/iterative/cml/blob/master/Dockerfile).
+[custom Docker images](https://github.com/iterative/cml/blob/mains/Dockerfile).
 In the above example, uncommenting the field
 `container: ghcr.io/iterative/cml:0-dvc2-base1`) will make the runner pull the
 CML Docker image. The image already has NodeJS, Python 3, DVC and CML set up on
@@ -215,7 +215,7 @@ git push origin experiment
 ```
 
 5. In GitHub, open up a pull request to compare the `experiment` branch to
-   `master`.
+   `main`.
 
 ![](https://static.iterative.ai/img/cml/make_pr.png)
 
@@ -272,18 +272,18 @@ jobs:
           # Report metrics
           echo "## Metrics" >> report.md
           git fetch --prune
-          dvc metrics diff master --show-md >> report.md
+          dvc metrics diff main --show-md >> report.md
 
           # Publish confusion matrix diff
           echo "## Plots" >> report.md
           echo "### Class confusions" >> report.md
-          dvc plots diff --target classes.csv --template confusion -x actual -y predicted --show-vega master > vega.json
+          dvc plots diff --target classes.csv --template confusion -x actual -y predicted --show-vega main > vega.json
           vl2png vega.json -s 1.5 > confusion_plot.png
           echo "![](./confusion_plot.png)" >> report.md
 
           # Publish regularization function diff
           echo "### Effects of regularization" >> report.md
-          dvc plots diff --target estimators.csv -x Regularization --show-vega master > vega.json
+          dvc plots diff --target estimators.csv -x Regularization --show-vega main > vega.json
           vl2png vega.json -s 1.5 > plot.png
           echo "![](./plot.png)" >> report.md
 
@@ -642,6 +642,9 @@ These are some example projects using CML.
 
 :key: needs a [PAT](#environment-variables).
 
-
 # :warning: Maintenance :warning:
-- ~2023-07 Nvidia has dropped container CUDA images with [10.x](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=10)/[cudnn7](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=cudnn7) and [11.2.1](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=11.2.1), CML images will be updated accrodingly
+
+- ~2023-07 Nvidia has dropped container CUDA images with
+  [10.x](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=10)/[cudnn7](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=cudnn7)
+  and [11.2.1](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=11.2.1),
+  CML images will be updated accrodingly