Skip to content

Commit

Permalink
Merge branch 'master' into no-polling-if-disconnected-from-hub
Browse files Browse the repository at this point in the history
  • Loading branch information
vkaidalov-rft committed Aug 10, 2021
2 parents 7444026 + 7fee5a2 commit 61e7a45
Show file tree
Hide file tree
Showing 1,000 changed files with 41,330 additions and 15,159 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3, 1, 0, 'alpha', 5
current_version = 4, 0, 0, 'alpha', 1
commit = False
tag = False
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \'(?P<release>\S+)\'\,\ (?P<build>\d+)
Expand Down
44 changes: 44 additions & 0 deletions .dockerignore
@@ -0,0 +1,44 @@
.git
.dockerignore
Dockerfile

# project files
coverage/

dev_mode/listings
dev_mode/schemas
dev_mode/static
dev_mode/themes
dev_mode/workspaces
dev_mode/stats.json

# Skip docs
docs/
**/docs/source/_build

# Skip examples
examples/

junit.xml

jupyterlab/geckodriver
jupyterlab/static
jupyterlab/schemas
jupyterlab/themes
jupyterlab/style.js
jupyterlab/tests/**/static
jupyterlab/tests/**/labextension

# Remove after next release
jupyterlab/imports.css

packages/nbconvert-css/style/
packages/services/examples/node/config.json
packages/services/examples/browser/tmp
packages/theme-*/static

tests/**/coverage
tests/**/.cache-loader

**/node_modules
ui-tests/
1 change: 1 addition & 0 deletions .eslintignore
Expand Up @@ -30,6 +30,7 @@ jupyterlab/staging/index.js
tsconfigdoc.json
examples/federated/core_package/index.js
examples/federated/labextensions
ui-tests/test-output

# jetbrains IDE stuff
.idea/
Expand Down
15 changes: 14 additions & 1 deletion .eslintrc.js
Expand Up @@ -6,6 +6,9 @@ module.exports = {
node: true,
'jest/globals': true
},
globals: {
JSX: 'readonly'
},
root: true,
extends: [
'eslint:recommended',
Expand Down Expand Up @@ -57,7 +60,17 @@ module.exports = {
'no-case-declarations': 'warn',
'no-useless-escape': 'off',
'prefer-const': 'off',
'react/prop-types': 'warn'
'react/prop-types': 'warn',
'sort-imports': [
'error',
{
ignoreCase: true,
ignoreDeclarationSort: true,
ignoreMemberSort: false,
memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'],
allowSeparatedGroups: false
}
]
},
settings: {
react: {
Expand Down
58 changes: 0 additions & 58 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

34 changes: 0 additions & 34 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

3 changes: 3 additions & 0 deletions .github/codeql/codeql-config.yml
Expand Up @@ -12,3 +12,6 @@ paths-ignore:
- examples/federated/core_package/index.js
- jupyterlab/staging/index.js
- dev_mode/index.js
# TODO: remove when fixed upstream
# see https://github.com/jupyterlab/jupyterlab/issues/10522 for more info
- packages/services/src/kernel/messages.ts
26 changes: 22 additions & 4 deletions .github/labeler.yml
@@ -1,6 +1,10 @@
Design System CSS:
- '**/*.css'
- '*.css'

documentation:
- docs/**/*
- docs/*

tag:CSS:
- '**/*.css'
Expand All @@ -10,17 +14,15 @@ tag:CSS:
- design/**/*
- design/*

tag:Documentation:
- docs/**/*
- docs/*

tag:Examples:
- examples/**/*
- examples/*

tag:Testing:
- tests/**/*
- tests/*
- ui-tests/**/*
- ui-tests/*

######################
# Package Labels #
Expand Down Expand Up @@ -96,6 +98,12 @@ pkg:docmanager:
- packages/docmanager-extension/**/*
- packages/docmanager-extension/*

pkg:docprovider:
- packages/docprovider/**/*
- packages/docprovider/*
- packages/docprovider-extension/**/*
- packages/docprovider-extension/*

pkg:docregistry:
- packages/docregistry/**/*
- packages/docregistry/*
Expand Down Expand Up @@ -238,6 +246,10 @@ pkg:settingregistry:
- packages/settingregistry/**/*
- packages/settingregistry/*

pkg:shared-models:
- packages/shared-models/**/*
- packages/shared-models/*

pkg:shortcuts:
- packages/shortcuts-extension/**/*
- packages/shortcuts-extension/*
Expand All @@ -264,6 +276,12 @@ pkg:themes:
- packages/theme-light-extension/**/*
- packages/theme-light-extension/*

pkg:toc:
- packages/toc/**/*
- packages/toc/*
- packages/toc-extension/**/*
- packages/toc-extension/*

pkg:tooltip:
- packages/tooltip/**/*
- packages/tooltip/*
Expand Down
10 changes: 8 additions & 2 deletions .github/answered.yml → .github/workflows/answered.yml
Expand Up @@ -7,14 +7,20 @@ on:
schedule:
- cron: '30 1 * * *'

permissions:
issues: write

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
with:
days-before-pr-stale: -1
days-before-pr-close: -1
skip-stale-issue-message: true
days-before-stale: 30
days-before-close: 7
days-before-issue-stale: 30
days-before-issue-close: 7
stale-issue-label: 'status:Closing as Answered'
stale-issue-message: '.'
only-issue-labels: 'status:Answered'
15 changes: 15 additions & 0 deletions .github/workflows/auto_author_assign.yml
@@ -0,0 +1,15 @@
# https://github.com/marketplace/actions/auto-author-assign
name: 'Auto Author Assign'

on:
pull_request_target:
types: [opened, reopened]

permissions:
pull-requests: write

jobs:
assign-author:
runs-on: ubuntu-latest
steps:
- uses: toshimaru/auto-author-assign@v1.3.4
68 changes: 68 additions & 0 deletions .github/workflows/check-release.yml
@@ -0,0 +1,68 @@
name: Check Release

on:
push:
branches: [master]
pull_request:
branches: [master]
release:
types: [published]

jobs:

check_release:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '14.x'

- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.9

# Cache yarn
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache yarn
uses: actions/cache@v2
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Get pip cache dir
id: pip-cache
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: Cache pip
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-pip-
- name: Check Release
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
env:
RH_VERSION_SPEC: build
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Assets
uses: actions/upload-artifact@v2
with:
name: dist-files
path: |
.jupyter_releaser_checkout/dist/*.*
23 changes: 10 additions & 13 deletions .github/workflows/labeler.yml
@@ -1,19 +1,16 @@
name: Pull Request Labeler
# This workflow is supposed to run every 5 minutes
# https://github.com/marketplace/actions/labeler
name: "Pull Request Labeler"
on:
schedule:
- cron: '*/20 * * * *'
- pull_request_target

permissions:
pull-requests:
write
pull-requests: write

jobs:
triage:
name: Update PR Labels
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- if: github.repository == 'jupyterlab/jupyterlab'
uses: paulfantom/periodic-labeler@dffbc90404f371f76444a69221c2f7ad079e2319
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ github.repository }}
LABEL_MAPPINGS_FILE: .github/labeler.yml
- uses: actions/labeler@main
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"

0 comments on commit 61e7a45

Please sign in to comment.