Skip to content

Commit a1d4578

Browse files
authored
Merge branch 'main' into fix-active-types-trait
2 parents 2a15ff9 + 54f5282 commit a1d4578

3 files changed

Lines changed: 10 additions & 12 deletions

File tree

SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
## Reporting a Vulnerability
44

5-
All IPython and Jupyter security are handled via security@ipython.org.
5+
All IPython and Jupyter security are handled via security@ipython.org.
66
You can find more information on the Jupyter website. https://jupyter.org/security
77

88
## Tidelift
99

10-
You can report security concerns for IPython via the [Tidelift platform](https://tidelift.com/security).
10+
You can report security concerns for IPython via the [Tidelift platform](https://tidelift.com/security).

docs/source/overview.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,19 +169,18 @@ Main features of the interactive shell
169169
intelligent enough to do more repetitions for commands that finish very
170170
quickly in order to get a better estimate of their running time.
171171

172-
.. sourcecode:: ipython
172+
.. sourcecode:: ipython
173173

174174
In [1]: %timeit 1+1
175175
7.88 ns ± 0.0494 ns per loop (mean ± std. dev. of 7 runs, 100000000 loops each)
176176

177177
In [2]: %timeit [math.sin(x) for x in range(5000)]
178178
608 µs ± 5.57 µs per loop (mean ± std. dev. of 7 runs, 1000 loops each)
179179

180-
..
180+
..
181181
182182
To get the timing information for more than one expression, use the
183183
:samp:`%%timeit` cell magic command.
184-
185184

186185
* Doctest support. The special :samp:`%doctest_mode` command toggles a mode
187186
to use doctest-compatible prompts, so you can use IPython sessions as

pyproject.toml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ doc = [
6060
"exceptiongroup",
6161
"intersphinx_registry",
6262
"ipykernel",
63-
"ipython[test]",
64-
"matplotlib",
65-
"setuptools>=18.5",
63+
"ipython[test,matplotlib]",
64+
"setuptools>=61.2",
6665
"sphinx_toml==0.0.4",
6766
"sphinx-rtd-theme",
6867
"sphinx>=1.3",
@@ -78,16 +77,16 @@ test_extra = [
7877
"ipython[test]",
7978
"curio",
8079
"jupyter_ai",
81-
"matplotlib!=3.2.0",
80+
"ipython[matplotlib]",
8281
"nbformat",
8382
"nbclient",
8483
"ipykernel",
85-
"numpy>=1.23",
86-
"pandas",
84+
"numpy>=1.25",
85+
"pandas>2.0",
8786
"trio",
8887
]
8988
matplotlib = [
90-
"matplotlib"
89+
"matplotlib>3.7"
9190
]
9291
all = [
9392
"ipython[doc,matplotlib,test,test_extra]",

0 commit comments

Comments
 (0)