Skip to content

Commit 66aea83

Browse files
authored
Merge pull request #764 from blink1073/filter-warnings-3
2 parents 1c7d9b2 + 4a30b0e commit 66aea83

24 files changed

+205
-135
lines changed

.github/workflows/downstream.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,45 @@ concurrency:
1010
cancel-in-progress: true
1111

1212
jobs:
13-
tests:
13+
ipykernel:
1414
runs-on: ubuntu-latest
15-
timeout-minutes: 20
16-
strategy:
17-
matrix:
18-
python-version: ["3.9"]
19-
fail-fast: false
15+
timeout-minutes: 10
2016
steps:
21-
- name: Checkout
22-
uses: actions/checkout@v2
23-
24-
- name: Base Setup
25-
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
26-
27-
- name: Test IPykernel
28-
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
17+
- uses: actions/checkout@v2
18+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
19+
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
2920
with:
3021
package_name: ipykernel
3122
package_spec: "pyqt5 ipykernel[test]"
3223

33-
- name: Test NBClient
34-
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
24+
nbclient:
25+
runs-on: ubuntu-latest
26+
timeout-minutes: 10
27+
steps:
28+
- uses: actions/checkout@v2
29+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
30+
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
3531
with:
3632
package_name: nbclient
3733
env_values: IPYKERNEL_CELL_NAME=\<IPY-INPUT\>
3834

39-
# Note: Currently fails
40-
# - name: Test QtConsole
41-
# uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
42-
# with:
43-
# package_name: qtconsole
44-
45-
- name: Test nbconvert
46-
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
35+
nbconvert:
36+
runs-on: ubuntu-latest
37+
timeout-minutes: 10
38+
steps:
39+
- uses: actions/checkout@v2
40+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
41+
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
4742
with:
4843
package_name: nbconvert
4944

50-
- name: Test jupyter_server
51-
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
45+
jupyter_server:
46+
runs-on: ubuntu-latest
47+
timeout-minutes: 10
48+
steps:
49+
- uses: actions/checkout@v2
50+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
51+
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
5252
with:
5353
package_name: jupyter_server
5454

.github/workflows/main.yml

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
- name: Install miniumum versions
123123
uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1
124124
- name: Run the unit tests
125-
run: pytest -vv jupyter_client || pytest -vv jupyter_client --lf
125+
run: pytest -vv -W default jupyter_client || pytest -vv -W default jupyter_client --lf
126126

127127
test_prereleases:
128128
name: Test Prereleases
@@ -150,36 +150,14 @@ jobs:
150150
timeout-minutes: 10
151151
steps:
152152
- uses: actions/checkout@v2
153-
- name: Base Setup
154-
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
155-
- name: Build SDist
156-
run: |
157-
pip install build
158-
python -m build --sdist
159-
- uses: actions/upload-artifact@v2
160-
with:
161-
name: "sdist"
162-
path: dist/*.tar.gz
153+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
154+
- uses: jupyterlab/maintainer-tools/.github/actions/make-sdist@v1
163155

164156
test_sdist:
165157
runs-on: ubuntu-latest
166158
needs: [make_sdist]
167159
name: Install from SDist and Test
168160
timeout-minutes: 20
169161
steps:
170-
- name: Base Setup
171-
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
172-
- name: Download sdist
173-
uses: actions/download-artifact@v2
174-
- name: Install From SDist
175-
run: |
176-
set -ex
177-
cd sdist
178-
mkdir test
179-
tar --strip-components=1 -zxvf *.tar.gz -C ./test
180-
cd test
181-
pip install .[test]
182-
- name: Run Test
183-
run: |
184-
cd sdist/test
185-
pytest -vv || pytest -vv --lf
162+
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
163+
- uses: jupyterlab/maintainer-tools/.github/actions/test-sdist@v1

.mailmap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ David Hirschfeld <[email protected]> dhirschfeld <david.hirschfeld
2626
David P. Sanders <[email protected]> David P. Sanders <[email protected]>
2727
David Warde-Farley <[email protected]> David Warde-Farley <>
2828
Doug Blank <[email protected]> Doug Blank <[email protected]>
29-
Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]>
29+
Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]>
3030
3131
3232

.pre-commit-config.yaml

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,61 @@
1+
ci:
2+
skip: [check-jsonschema]
3+
14
repos:
5+
- repo: https://github.com/pre-commit/pre-commit-hooks
6+
rev: v4.1.0
7+
hooks:
8+
- id: end-of-file-fixer
9+
- id: check-case-conflict
10+
- id: check-executables-have-shebangs
11+
- id: requirements-txt-fixer
12+
- id: check-added-large-files
13+
- id: check-case-conflict
14+
- id: check-toml
15+
- id: check-yaml
16+
- id: debug-statements
17+
- id: forbid-new-submodules
18+
- id: check-builtin-literals
19+
- id: trailing-whitespace
20+
221
- repo: https://github.com/asottile/reorder_python_imports
3-
rev: v2.7.1
22+
rev: v3.0.1
423
hooks:
524
- id: reorder-python-imports
25+
626
- repo: https://github.com/psf/black
7-
rev: 22.1.0
27+
rev: 22.3.0
828
hooks:
929
- id: black
1030
args: ["--line-length", "100"]
31+
1132
- repo: https://github.com/pre-commit/mirrors-prettier
12-
rev: v2.5.1
33+
rev: v2.6.1
1334
hooks:
1435
- id: prettier
15-
- repo: https://gitlab.com/pycqa/flake8
16-
rev: "3.9.2"
36+
37+
- repo: https://github.com/pycqa/flake8
38+
rev: 4.0.1
1739
hooks:
1840
- id: flake8
19-
- repo: https://github.com/pre-commit/pre-commit-hooks
20-
rev: v4.1.0
41+
additional_dependencies:
42+
[
43+
"flake8-bugbear==20.1.4",
44+
"flake8-logging-format==0.6.0",
45+
"flake8-implicit-str-concat==0.2.0",
46+
]
47+
48+
- repo: https://github.com/PyCQA/doc8
49+
rev: 0.11.0
2150
hooks:
22-
- id: end-of-file-fixer
23-
- id: check-case-conflict
24-
- id: check-executables-have-shebangs
25-
- id: requirements-txt-fixer
51+
- id: doc8
52+
args: [--max-line-length=100]
53+
54+
- repo: https://github.com/sirosen/check-jsonschema
55+
rev: 0.14.2
56+
hooks:
57+
- id: check-jsonschema
58+
name: "Check GitHub Workflows"
59+
files: ^\.github/workflows/
60+
types: [yaml]
61+
args: ["--schemafile", "https://json.schemastore.org/github-workflow"]

docs/kernels.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ The user location takes priority over the system locations, and the case of the
121121
names is ignored, so selecting kernels works the same way whether or not the
122122
filesystem is case sensitive.
123123
Since kernelspecs show up in URLs and other places,
124-
a kernelspec is required to have a simple name, only containing ASCII letters, ASCII numbers, and the simple separators: ``-`` hyphen, ``.`` period, ``_`` underscore.
124+
a kernelspec is required to have a simple name, only containing ASCII letters,
125+
ASCII numbers, and the simple separators: ``-`` hyphen, ``.`` period, ``_``
126+
underscore.
125127

126128
Other locations may also be searched if the :envvar:`JUPYTER_PATH` environment
127129
variable is set.
@@ -143,7 +145,8 @@ JSON serialised dictionary containing the following keys and values:
143145
When loading notebooks, if no matching kernelspec key (may differ across machines)
144146
is found, a kernel with a matching `language` will be used.
145147
This allows a notebook written on any Python or Julia kernel to be properly associated
146-
with the user's Python or Julia kernel, even if they aren't listed under the same name as the author's.
148+
with the user's Python or Julia kernel, even if they aren't listed under the
149+
same name as the author's.
147150
- **interrupt_mode** (optional): May be either ``signal`` or ``message`` and
148151
specifies how a client is supposed to interrupt cell execution on this kernel,
149152
either by sending an interrupt ``signal`` via the operating system's

0 commit comments

Comments
 (0)