From 3deabdbded7c073e899d65d99a6c6e9dbd5da6bb 2018-07-23 01:52:12 From: Matthias Bussonnier Date: 2018-07-23 01:52:12 Subject: [PATCH] Switch protocol to https Chrome start to mark things as insecure next week --- diff --git a/IPython/__init__.py b/IPython/__init__.py index 5e81082..0b78eca 100644 --- a/IPython/__init__.py +++ b/IPython/__init__.py @@ -2,7 +2,7 @@ """ IPython: tools for interactive and parallel computing in Python. -http://ipython.org +https://ipython.org """ #----------------------------------------------------------------------------- # Copyright (c) 2008-2011, IPython Development Team. diff --git a/IPython/core/release.py b/IPython/core/release.py index 0e37939..525639e 100644 --- a/IPython/core/release.py +++ b/IPython/core/release.py @@ -48,7 +48,7 @@ IPython provides a rich toolkit to help you make the most out of using Python interactively. Its main components are: * A powerful interactive Python shell -* A `Jupyter `_ kernel to work with Python code in Jupyter +* A `Jupyter `_ kernel to work with Python code in Jupyter notebooks and other interactive frontends. The enhanced interactive Python shells have the following main features: diff --git a/IPython/core/usage.py b/IPython/core/usage.py index e96579b..37024c4 100644 --- a/IPython/core/usage.py +++ b/IPython/core/usage.py @@ -60,7 +60,7 @@ Usage environment variable with this name and setting it to the desired path. For more information, see the manual available in HTML and PDF in your - installation, or online at http://ipython.org/documentation.html. + installation, or online at https://ipython.org/documentation.html. """ interactive_usage = """ diff --git a/README.rst b/README.rst index eeb3f88..eb21641 100644 --- a/README.rst +++ b/README.rst @@ -55,7 +55,7 @@ Or see the `development installation docs for the latest revision on read the docs. Documentation and installation instructions for older version of IPython can be -found on the `IPython website `_ +found on the `IPython website `_ @@ -87,7 +87,7 @@ manager. For more information see one of our blog posts: - http://blog.jupyter.org/2016/07/08/ipython-5-0-released/ + https://blog.jupyter.org/2016/07/08/ipython-5-0-released/ As well as the following Pull-Request for discussion: diff --git a/docs/source/index.rst b/docs/source/index.rst index 0fcb2fd..090fb88 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -22,7 +22,7 @@ interactively. Its main components are: :align: center -* A `Jupyter `_ kernel to work with Python code in Jupyter +* A `Jupyter `_ kernel to work with Python code in Jupyter notebooks and other interactive frontends. The enhanced interactive Python shells and kernel have the following main diff --git a/docs/source/install/install.rst b/docs/source/install/install.rst index d3acc9f..9888a8d 100644 --- a/docs/source/install/install.rst +++ b/docs/source/install/install.rst @@ -28,7 +28,7 @@ Overview This document describes in detail the steps required to install IPython. For a few quick ways to get started with package managers or full Python -distributions, see `the install page `_ of the +distributions, see `the install page `_ of the IPython website. Please let us know if you have problems installing IPython or any of its diff --git a/docs/source/interactive/index.rst b/docs/source/interactive/index.rst index 160a190..97332e1 100644 --- a/docs/source/interactive/index.rst +++ b/docs/source/interactive/index.rst @@ -27,5 +27,5 @@ done some work in the classic Python REPL. .. seealso:: - `A Qt Console for Jupyter `__ + `A Qt Console for Jupyter `__ `The Jupyter Notebook `__ diff --git a/docs/source/links.txt b/docs/source/links.txt index d77d61e..9379d1f 100644 --- a/docs/source/links.txt +++ b/docs/source/links.txt @@ -17,11 +17,11 @@ NOTE: Some of these were taken from the nipy links compendium. .. Main IPython links -.. _ipython: http://ipython.org -.. _`ipython manual`: http://ipython.org/documentation.html +.. _ipython: https://ipython.org +.. _`ipython manual`: https://ipython.org/documentation.html .. _ipython_github: http://github.com/ipython/ipython/ .. _ipython_github_repo: http://github.com/ipython/ipython/ -.. _ipython_downloads: http://ipython.org/download.html +.. _ipython_downloads: https://ipython.org/download.html .. _ipython_pypi: http://pypi.python.org/pypi/ipython .. _nbviewer: http://nbviewer.ipython.org diff --git a/docs/source/overview.rst b/docs/source/overview.rst index de36e6a..bf8654e 100644 --- a/docs/source/overview.rst +++ b/docs/source/overview.rst @@ -218,7 +218,7 @@ which will be something like ``--existing kernel-19732.json`` but with different numbers which correspond to the Process ID of the kernel. You can read more about using `jupyter qtconsole -`_, and +`_, and `jupyter notebook `_. There is also a :ref:`message spec ` which documents the protocol for communication between kernels diff --git a/docs/source/whatsnew/github-stats-2.0.rst b/docs/source/whatsnew/github-stats-2.0.rst index 826b471..5033994 100644 --- a/docs/source/whatsnew/github-stats-2.0.rst +++ b/docs/source/whatsnew/github-stats-2.0.rst @@ -1416,7 +1416,7 @@ Issues (434): * :ghissue:`4759`: Application._load_config_files log parameter default fails * :ghissue:`3153`: docs / file menu: explain how to exit the notebook * :ghissue:`4791`: Did updates to ipython_directive bork support for cython magic snippets? -* :ghissue:`4385`: "Part 4 - Markdown Cells.ipynb" nbviewer example seems not well referenced in current online documentation page http://ipython.org/ipython-doc/stable/interactive/notebook.htm +* :ghissue:`4385`: "Part 4 - Markdown Cells.ipynb" nbviewer example seems not well referenced in current online documentation page https://ipython.org/ipython-doc/stable/interactive/notebook.htm * :ghissue:`4655`: prefer marked to pandoc for markdown2html * :ghissue:`3441`: Fix focus related problems in the notebook * :ghissue:`3402`: Feature Request: Save As (latex, html,..etc) as a menu option in Notebook rather than explicit need to invoke nbconvert diff --git a/docs/source/whatsnew/version0.11.rst b/docs/source/whatsnew/version0.11.rst index abfdade..b032937 100644 --- a/docs/source/whatsnew/version0.11.rst +++ b/docs/source/whatsnew/version0.11.rst @@ -232,7 +232,7 @@ may also offer a slightly more featureful application (with menus and other GUI elements), but we remain committed to always shipping this easy to embed widget. -See the `Jupyter Qt Console site `_ for a detailed +See the `Jupyter Qt Console site `_ for a detailed description of the console's features and use. diff --git a/examples/IPython Kernel/Rich Output.ipynb b/examples/IPython Kernel/Rich Output.ipynb index 9793963..7b0caed 100644 --- a/examples/IPython Kernel/Rich Output.ipynb +++ b/examples/IPython Kernel/Rich Output.ipynb @@ -3058,7 +3058,7 @@ " \n", @@ -3075,7 +3075,7 @@ ], "source": [ "from IPython.display import IFrame\n", - "IFrame('http://jupyter.org', width='100%', height=350)" + "IFrame('https://jupyter.org', width='100%', height=350)" ] }, { @@ -3263,7 +3263,7 @@ "* When you open a notebook, rich output is only displayed if it doesn't contain security vulberabilities, ...\n", "* ... or if you have trusted a notebook, all rich output will run upon opening it.\n", "\n", - "A full description of the IPython security model can be found on [this page](http://ipython.org/ipython-doc/dev/notebook/security.html)." + "A full description of the IPython security model can be found on [this page](https://ipython.org/ipython-doc/dev/notebook/security.html)." ] }, { diff --git a/examples/Index.ipynb b/examples/Index.ipynb index 0e463d4..9ee21e2 100644 --- a/examples/Index.ipynb +++ b/examples/Index.ipynb @@ -18,7 +18,8 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "This directory contains IPython's notebook-based documentation. This augments our [Sphinx-based documentation](http://ipython.org/ipython-doc/stable/index.html) with notebooks that contain interactive tutorials and examples. Over time, more of our documentation will be pulled into this format." + "This directory contains IPython's notebook-based documentation. This + augments our [Sphinx-based documentation](https://ipython.org/ipython-doc/stable/index.html) with notebooks that contain interactive tutorials and examples. Over time, more of our documentation will be pulled into this format." ] }, { diff --git a/tools/tests/Confined Output.ipynb b/tools/tests/Confined Output.ipynb index 8ba354d..f767c19 100644 --- a/tools/tests/Confined Output.ipynb +++ b/tools/tests/Confined Output.ipynb @@ -183,7 +183,7 @@ " \n", @@ -199,7 +199,7 @@ } ], "source": [ - "IFrame(src=\"http://ipython.org\", width=900, height=400)" + "IFrame(src=\"https://ipython.org\", width=900, height=400)" ] }, { diff --git a/tools/tests/Markdown Pandoc Limitations.ipynb b/tools/tests/Markdown Pandoc Limitations.ipynb index ff232bb..671aefb 100644 --- a/tools/tests/Markdown Pandoc Limitations.ipynb +++ b/tools/tests/Markdown Pandoc Limitations.ipynb @@ -1993,7 +1993,7 @@ "\n", "var mdcell = new IPython.MarkdownCell();\n", "mdcell.create_element();\n", - "mdcell.set_text('\\n![Alternate Text](http://ipython.org/_static/IPy_header.png)\\n');\n", + "mdcell.set_text('\\n![Alternate Text](https://ipython.org/_static/IPy_header.png)\\n');\n", "mdcell.render();\n", "$(element).append(mdcell.element)\n", ".removeClass()\n", @@ -2022,10 +2022,10 @@ "text/html": [ "
NBConvert Latex Output
\\begin{figure}[htbp]\n",
        "\\centering\n",
-       "\\includegraphics{http://ipython.org/_static/IPy_header.png}\n",
+       "\\includegraphics{https://ipython.org/_static/IPy_header.png}\n",
        "\\caption{Alternate Text}\n",
        "\\end{figure}
NBViewer Output
\n", - "\"Alternate

Alternate Text

\n", + "\"Alternate

Alternate Text

\n", "
" ], "text/plain": [ @@ -2051,7 +2051,7 @@ ], "source": [ "compare_render(r\"\"\"\n", - "![Alternate Text](http://ipython.org/_static/IPy_header.png)\n", + "![Alternate Text](https://ipython.org/_static/IPy_header.png)\n", "\"\"\")" ] }, @@ -2075,7 +2075,7 @@ "\n", "var mdcell = new IPython.MarkdownCell();\n", "mdcell.create_element();\n", - "mdcell.set_text('\\n\\n');\n", + "mdcell.set_text('\\n\\n');\n", "mdcell.render();\n", "$(element).append(mdcell.element)\n", ".removeClass()\n", @@ -2102,7 +2102,7 @@ { "data": { "text/html": [ - "
NBConvert Latex Output
NBViewer Output

" + "
NBConvert Latex Output
NBViewer Output

" ], "text/plain": [ "" @@ -2127,7 +2127,7 @@ ], "source": [ "compare_render(r\"\"\"\n", - "\n", + "\n", "\"\"\")" ] },