Skip to content

Commit 3c96ba2

Browse files
ianthomas23blink1073Carreaudavidbrocharts-t-e-v-e-n-k
authored
Backports and extra changes to fix CI on 6.x branch (#1390)
Co-authored-by: Steven Silvester <steven.silvester@ieee.org> Co-authored-by: M Bussonnier <bussonniermatthias@gmail.com> Co-authored-by: David Brochart <david.brochart@gmail.com> Co-authored-by: Steve Kowalik <steven@wedontsleep.org> Co-authored-by: Min RK <benjaminrk@gmail.com>
1 parent 5d2fe53 commit 3c96ba2

25 files changed

+183
-183
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,28 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [ubuntu-latest, windows-latest, macos-latest]
25-
python-version: ["3.8", "3.12"]
25+
python-version: ["3.9", "3.13"]
2626
include:
27-
- os: windows-latest
28-
python-version: "3.9"
2927
- os: ubuntu-latest
3028
python-version: "pypy-3.9"
3129
- os: macos-latest
3230
python-version: "3.10"
3331
- os: ubuntu-latest
3432
python-version: "3.11"
33+
- os: ubuntu-latest
34+
python-version: "3.12"
3535
steps:
3636
- name: Checkout
3737
uses: actions/checkout@v4
3838

39-
- name: Base Setup
40-
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
39+
- uses: actions/setup-python@v5
40+
with:
41+
python-version: ${{ matrix.python-version }}
42+
43+
- name: Install hatch
44+
run: |
45+
python --version
46+
python -m pip install hatch
4147
4248
- name: Run the tests
4349
timeout-minutes: 15
@@ -98,7 +104,7 @@ jobs:
98104
token: ${{ secrets.GITHUB_TOKEN }}
99105

100106
test_docs:
101-
runs-on: windows-latest
107+
runs-on: ubuntu-latest
102108
steps:
103109
- uses: actions/checkout@v4
104110
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
@@ -150,6 +156,7 @@ jobs:
150156
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
151157
with:
152158
dependency_type: minimum
159+
python_version: "3.9"
153160

154161
- name: List installed packages
155162
run: |
@@ -198,22 +205,3 @@ jobs:
198205
- uses: actions/checkout@v4
199206
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
200207
- uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1
201-
202-
tests_check: # This job does nothing and is only used for the branch protection
203-
if: always()
204-
needs:
205-
- coverage
206-
- test_docs
207-
- test_without_debugpy
208-
- test_miniumum_versions
209-
- test_lint
210-
- test_prereleases
211-
- check_release
212-
- link_check
213-
- test_sdist
214-
runs-on: ubuntu-latest
215-
steps:
216-
- name: Decide whether the needed jobs succeeded or failed
217-
uses: re-actors/alls-green@release/v1
218-
with:
219-
jobs: ${{ toJSON(needs) }}

‎.github/workflows/downstream.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
- name: Install System Packages
132132
run: |
133133
sudo apt-get update
134-
sudo apt-get install -y --no-install-recommends libegl1-mesa
134+
sudo apt-get install -y --no-install-recommends libgl1 libglx-mesa0
135135
- name: Install spyder-kernels dependencies
136136
shell: bash -l {0}
137137
run: |

‎docs/api/ipykernel.comm.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ Submodules
77

88
.. automodule:: ipykernel.comm.comm
99
:members:
10-
:undoc-members:
1110
:show-inheritance:
11+
:undoc-members:
1212

1313

1414
.. automodule:: ipykernel.comm.manager
1515
:members:
16-
:undoc-members:
1716
:show-inheritance:
17+
:undoc-members:
1818

1919
Module contents
2020
---------------
2121

2222
.. automodule:: ipykernel.comm
2323
:members:
24-
:undoc-members:
2524
:show-inheritance:
25+
:undoc-members:

‎docs/api/ipykernel.inprocess.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,49 @@ Submodules
77

88
.. automodule:: ipykernel.inprocess.blocking
99
:members:
10-
:undoc-members:
1110
:show-inheritance:
11+
:undoc-members:
1212

1313

1414
.. automodule:: ipykernel.inprocess.channels
1515
:members:
16-
:undoc-members:
1716
:show-inheritance:
17+
:undoc-members:
1818

1919

2020
.. automodule:: ipykernel.inprocess.client
2121
:members:
22-
:undoc-members:
2322
:show-inheritance:
23+
:undoc-members:
2424

2525

2626
.. automodule:: ipykernel.inprocess.constants
2727
:members:
28-
:undoc-members:
2928
:show-inheritance:
29+
:undoc-members:
3030

3131

3232
.. automodule:: ipykernel.inprocess.ipkernel
3333
:members:
34-
:undoc-members:
3534
:show-inheritance:
35+
:undoc-members:
3636

3737

3838
.. automodule:: ipykernel.inprocess.manager
3939
:members:
40-
:undoc-members:
4140
:show-inheritance:
41+
:undoc-members:
4242

4343

4444
.. automodule:: ipykernel.inprocess.socket
4545
:members:
46-
:undoc-members:
4746
:show-inheritance:
47+
:undoc-members:
4848

4949
Module contents
5050
---------------
5151

5252
.. automodule:: ipykernel.inprocess
5353
:members:
54-
:undoc-members:
5554
:show-inheritance:
55+
:undoc-members:

‎docs/api/ipykernel.rst‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,115 +16,115 @@ Submodules
1616

1717
.. automodule:: ipykernel.compiler
1818
:members:
19-
:undoc-members:
2019
:show-inheritance:
20+
:undoc-members:
2121

2222

2323
.. automodule:: ipykernel.connect
2424
:members:
25-
:undoc-members:
2625
:show-inheritance:
26+
:undoc-members:
2727

2828

2929
.. automodule:: ipykernel.control
3030
:members:
31-
:undoc-members:
3231
:show-inheritance:
32+
:undoc-members:
3333

3434

3535
.. automodule:: ipykernel.debugger
3636
:members:
37-
:undoc-members:
3837
:show-inheritance:
38+
:undoc-members:
3939

4040

4141
.. automodule:: ipykernel.displayhook
4242
:members:
43-
:undoc-members:
4443
:show-inheritance:
44+
:undoc-members:
4545

4646

4747
.. automodule:: ipykernel.embed
4848
:members:
49-
:undoc-members:
5049
:show-inheritance:
50+
:undoc-members:
5151

5252

5353
.. automodule:: ipykernel.eventloops
5454
:members:
55-
:undoc-members:
5655
:show-inheritance:
56+
:undoc-members:
5757

5858

5959
.. automodule:: ipykernel.heartbeat
6060
:members:
61-
:undoc-members:
6261
:show-inheritance:
62+
:undoc-members:
6363

6464

6565
.. automodule:: ipykernel.iostream
6666
:members:
67-
:undoc-members:
6867
:show-inheritance:
68+
:undoc-members:
6969

7070

7171
.. automodule:: ipykernel.ipkernel
7272
:members:
73-
:undoc-members:
7473
:show-inheritance:
74+
:undoc-members:
7575

7676

7777
.. automodule:: ipykernel.jsonutil
7878
:members:
79-
:undoc-members:
8079
:show-inheritance:
80+
:undoc-members:
8181

8282

8383
.. automodule:: ipykernel.kernelapp
8484
:members:
85-
:undoc-members:
8685
:show-inheritance:
86+
:undoc-members:
8787

8888

8989
.. automodule:: ipykernel.kernelbase
9090
:members:
91-
:undoc-members:
9291
:show-inheritance:
92+
:undoc-members:
9393

9494

9595
.. automodule:: ipykernel.kernelspec
9696
:members:
97-
:undoc-members:
9897
:show-inheritance:
98+
:undoc-members:
9999

100100

101101
.. automodule:: ipykernel.log
102102
:members:
103-
:undoc-members:
104103
:show-inheritance:
104+
:undoc-members:
105105

106106

107107
.. automodule:: ipykernel.parentpoller
108108
:members:
109-
:undoc-members:
110109
:show-inheritance:
110+
:undoc-members:
111111

112112

113113
.. automodule:: ipykernel.trio_runner
114114
:members:
115-
:undoc-members:
116115
:show-inheritance:
116+
:undoc-members:
117117

118118

119119
.. automodule:: ipykernel.zmqshell
120120
:members:
121-
:undoc-members:
122121
:show-inheritance:
122+
:undoc-members:
123123

124124
Module contents
125125
---------------
126126

127127
.. automodule:: ipykernel
128128
:members:
129-
:undoc-members:
130129
:show-inheritance:
130+
:undoc-members:

‎docs/conf.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
import os
1414
import shutil
1515
from pathlib import Path
16-
from typing import Any, Dict, List
16+
from typing import Any
17+
18+
from intersphinx_registry import get_intersphinx_mapping
1719

1820
# If extensions (or modules to document with autodoc) are in another directory,
1921
# add these directories to sys.path here. If the directory is relative to the
@@ -70,7 +72,7 @@
7072
# built documents.
7173
#
7274

73-
version_ns: Dict[str, Any] = {}
75+
version_ns: dict[str, Any] = {}
7476
here = Path(__file__).parent.resolve()
7577
version_py = Path(here) / os.pardir / "ipykernel" / "_version.py"
7678
with open(version_py) as f:
@@ -159,7 +161,7 @@
159161
# Add any paths that contain custom static files (such as style sheets) here,
160162
# relative to this directory. They are copied after the builtin static files,
161163
# so a file named "default.css" will overwrite the builtin "default.css".
162-
html_static_path: List[str] = []
164+
html_static_path: list[str] = []
163165

164166
# Add any extra paths that contain custom files (such as robots.txt or
165167
# .htaccess) here, relative to this directory. These files are copied
@@ -226,7 +228,7 @@
226228

227229
# -- Options for LaTeX output ---------------------------------------------
228230

229-
latex_elements: Dict[str, object] = {}
231+
latex_elements: dict[str, object] = {}
230232

231233
# Grouping the document tree into LaTeX files. List of tuples
232234
# (source start file, target name, title,
@@ -303,11 +305,9 @@
303305

304306

305307
# Example configuration for intersphinx: refer to the Python standard library.
306-
intersphinx_mapping = {
307-
"python": ("https://docs.python.org/3/", None),
308-
"ipython": ("https://ipython.readthedocs.io/en/latest", None),
309-
"jupyter": ("https://jupyter.readthedocs.io/en/latest", None),
310-
}
308+
309+
310+
intersphinx_mapping = get_intersphinx_mapping(packages={"ipython", "python", "jupyter"})
311311

312312

313313
def setup(app):

‎ipykernel/_version.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
store the current version info of the server.
33
"""
44
import re
5-
from typing import List
65

76
# Version string must appear intact for hatch versioning
87
__version__ = "6.29.5"
@@ -11,7 +10,7 @@
1110
pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"
1211
match = re.match(pattern, __version__)
1312
assert match is not None
14-
parts: List[object] = [int(match[part]) for part in ["major", "minor", "patch"]]
13+
parts: list[object] = [int(match[part]) for part in ["major", "minor", "patch"]]
1514
if match["rest"]:
1615
parts.append(match["rest"])
1716
version_info = tuple(parts)

‎ipykernel/debugger.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def _reset_tcp_pos(self):
128128

129129
def _put_message(self, raw_msg):
130130
self.log.debug("QUEUE - _put_message:")
131-
msg = t.cast(t.Dict[str, t.Any], jsonapi.loads(raw_msg))
131+
msg = t.cast(dict[str, t.Any], jsonapi.loads(raw_msg))
132132
if msg["type"] == "event":
133133
self.log.debug("QUEUE - received event:")
134134
self.log.debug(msg)

‎ipykernel/embed.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ def embed_kernel(module=None, local_ns=None, **kwargs):
4949
if module is None:
5050
module = caller_module
5151
if local_ns is None:
52-
local_ns = caller_locals
52+
local_ns = dict(**caller_locals)
5353

5454
app.kernel.user_module = module
55+
assert isinstance(local_ns, dict)
5556
app.kernel.user_ns = local_ns
5657
app.shell.set_completer_frame() # type:ignore[union-attr]
5758
app.start()

‎ipykernel/heartbeat.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def run(self):
103103

104104
while True:
105105
try:
106-
zmq.device(zmq.QUEUE, self.socket, self.socket)
106+
zmq.device(zmq.QUEUE, self.socket, self.socket) # type:ignore[attr-defined]
107107
except zmq.ZMQError as e:
108108
if e.errno == errno.EINTR:
109109
# signal interrupt, resume heartbeat

0 commit comments

Comments
 (0)