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 Sep 9, 2024
2 parents e046f38 + 06c5b35 commit dcaf918
Show file tree
Hide file tree
Showing 412 changed files with 8,077 additions and 5,879 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, 3, 0, "alpha", 2
current_version = 4, 3, 0, "beta", 1
commit = False
tag = False
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \"(?P<release>\S+)\"\,\ (?P<build>\d+)
Expand Down
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,15 @@ module.exports = {
'extension_data',
'extension_name',
'file_extension',
'file_size',
'hash_algorithm',
'help_links',
'hist_access_type',
'ids_only',
'implementation_version',
'installed_version',
'is_allowed',
'is_selected',
'jlab_core',
'jupyterlab_extensions',
'jupyterlab_mime_extensions',
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@v44.5.5
uses: tj-actions/changed-files@v45.0.0
with:
# only checks for modified files in this directory
files: jupyterlab/staging
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,9 @@ packages/lsp/src/_*
# generated reports
webpack-bundle-analyzer.html
examples/**/test-results/

# untitled (default name) files
Untitled*.ipynb
untitled*.md
untitled*.py
untitled*.txt
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ repos:
exclude: (.bumpversion.cfg|yarn.js)

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.28.6
rev: 0.29.1
hooks:
- id: check-github-workflows

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015-2022 Project Jupyter Contributors
Copyright (c) 2015-2024 Project Jupyter Contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
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.3.0-alpha.2",
"version": "4.3.0-beta.1",
"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.3.0-alpha.2",
"version": "4.3.0-beta.1",
"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.3.0-alpha.2",
"version": "4.3.0-beta.1",
"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.3.0-alpha.2",
"@jupyterlab/testing": "^4.3.0-beta.1",
"@types/jest": "^29.2.0",
"rimraf": "~5.0.5",
"typescript": "~5.1.6"
Expand Down
Loading

0 comments on commit dcaf918

Please sign in to comment.