Skip to content

Commit

Permalink
Merge branch 'main' into jupyterlabgh-15661-mermaid-1080
Browse files Browse the repository at this point in the history
  • Loading branch information
bollwyvl authored Feb 5, 2024
2 parents aa3e628 + 82051a9 commit 8c6712d
Show file tree
Hide file tree
Showing 141 changed files with 3,949 additions and 3,564 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4, 1, 0, "candidate", 1
current_version = 4, 1, 0, "final", 0
commit = False
tag = False
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \"(?P<release>\S+)\"\,\ (?P<build>\d+)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_author_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
assign-author:
runs-on: ubuntu-latest
steps:
- uses: toshimaru/auto-author-assign@v2.0.1
- uses: toshimaru/auto-author-assign@v2.1.0
4 changes: 2 additions & 2 deletions .github/workflows/galata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Set up browser cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
${{ github.workspace }}/pw-browsers
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Set up browser cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
${{ github.workspace }}/pw-browsers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reject-staging-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: Get modified files in the staging directory
id: modified-files-in-staging
uses: tj-actions/changed-files@v41.0.1
uses: tj-actions/changed-files@v42.0.2
with:
# only checks for modified files in this directory
files: jupyterlab/staging
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repos:

# Check ruff version is aligned with the one in pyproject.toml
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.11
rev: v0.1.15
hooks:
- id: ruff
args: ["--fix"]
Expand Down
397 changes: 395 additions & 2 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyterlab/builder",
"version": "4.1.0-rc.1",
"version": "4.1.0",
"description": "JupyterLab - Extension Builder",
"homepage": "https://github.com/jupyterlab/jupyterlab",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion buildutils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyterlab/buildutils",
"version": "4.1.0-rc.1",
"version": "4.1.0",
"description": "JupyterLab - Build Utilities",
"homepage": "https://github.com/jupyterlab/jupyterlab",
"bugs": {
Expand Down
4 changes: 2 additions & 2 deletions buildutils/template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyterlab/template",
"version": "4.1.0-rc.1",
"version": "4.1.0",
"description": "JupyterLab - Package Template",
"homepage": "https://github.com/jupyterlab/jupyterlab",
"bugs": {
Expand Down Expand Up @@ -37,7 +37,7 @@
"watch": "tsc -b --watch"
},
"devDependencies": {
"@jupyterlab/testing": "^4.1.0-rc.1",
"@jupyterlab/testing": "^4.1.0",
"@types/jest": "^29.2.0",
"rimraf": "~5.0.5",
"typescript": "~5.1.6"
Expand Down
Loading

0 comments on commit 8c6712d

Please sign in to comment.