Browse Source

branch integrity

Steven Silvester 3 years ago
parent
commit
ffde80e388

+ 2 - 2
.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,7 @@ about: Create a report to help us improve
 Welcome! Before creating a new issue:
 * Search for relevant issues
 * Follow the issue reporting guidelines:
-https://jupyterlab.readthedocs.io/en/stable/getting_started/issue.html
+https://jupyterlab.readthedocs.io/en/3.2.x/getting_started/issue.html
 -->
 
 ## Description
@@ -24,7 +24,7 @@ https://jupyterlab.readthedocs.io/en/stable/getting_started/issue.html
 4. See error '...'
 
 <!--Describe how you diagnosed the issue. See the guidelines at
- https://jupyterlab.readthedocs.io/en/stable/getting_started/issue.html -->
+ https://jupyterlab.readthedocs.io/en/3.2.x/getting_started/issue.html -->
 
 ## Expected behavior
 

+ 5 - 5
CHANGELOG.md

@@ -299,9 +299,9 @@ github_url: 'https://github.com/jupyterlab/jupyterlab/blob/3.1.x/CHANGELOG.md'
 - From JupyterLab 3.1, file documents and notebooks have collaborative
   editing using the [Yjs shared editing framework](https://github.com/yjs/yjs).
   Editors are not collaborative by default; to activate it, start JupyterLab
-  with the `--collaborative` flag. See full documentation on [collaboration](https://jupyterlab.readthedocs.io/en/stable/user/rtc.html).
+  with the `--collaborative` flag. See full documentation on [collaboration](https://jupyterlab.readthedocs.io/en/3.2.x/user/rtc.html).
 - The undo/redo history in the notebook is now document-wide (tracking changes across all cells); the future verisions will enable restoring the previous behaviour of per-cell undo/redo.
-- Table of Contents recieved multiple new features and settings described in the [user documentation](https://jupyterlab.readthedocs.io/en/stable/user/toc.html).
+- Table of Contents recieved multiple new features and settings described in the [user documentation](https://jupyterlab.readthedocs.io/en/3.2.x/user/toc.html).
 - The debugger recived many improvements, including basic support for evaluating code at a breakpoint, and for variable inspection.
 - The closing bracket is no longer automatically added by default; the old behaviour can be re-enabled from the menu bar (`Settings` -> `Auto Close Brackets`) or from the Advanced Settings Editor.
 - A new visual indicator was introduced to highlight cells in which the code changed in the editor since last execution:
@@ -922,21 +922,21 @@ extensions does not require rebuilding JupyterLab and does not require
 having NodeJS installed. The previous way of distributing extensions as
 npm packages requiring rebuilding JupyterLab is still available as well.
 See the
-[documentation](https://jupyterlab.readthedocs.io/en/stable/user/extensions.html#extensions)
+[documentation](https://jupyterlab.readthedocs.io/en/3.2.x/user/extensions.html#extensions)
 for more details.
 
 #### The JupyterLab interface supports multiple languages
 
 JupyterLab now provides the ability to set the display language of the
 user interface. See the
-[documentation](https://jupyterlab.readthedocs.io/en/stable/user/language.html)
+[documentation](https://jupyterlab.readthedocs.io/en/3.2.x/user/language.html)
 for more details.
 
 #### A new visual debugger
 
 JupyterLab now ships with a debugger front-end by default, available for
 kernels that support the new debugging protocol. See the
-[documentation](https://jupyterlab.readthedocs.io/en/stable/user/debugger.html)
+[documentation](https://jupyterlab.readthedocs.io/en/3.2.x/user/debugger.html)
 for more details.
 
 #### Improvements to Simple Interface mode and Mobile

+ 1 - 1
CONTRIBUTING.md

@@ -4,5 +4,5 @@ If you're reading this section, you're probably interested in contributing to
 JupyterLab. Welcome and thanks for your interest in contributing!
 
 Please take a look at Contributing to Jupyterlab on
-[Read the Docs](https://jupyterlab.readthedocs.io/en/stable/developer/contributing.html) or
+[Read the Docs](https://jupyterlab.readthedocs.io/en/3.2.x/developer/contributing.html) or
 [Repo docs](docs/source/developer/contributing.rst) (for the latest).

+ 7 - 7
README.md

@@ -36,7 +36,7 @@ via [PyPI](https://pypi.org/search/?q=jupyterlab&o=-created&c=Framework+%3A%3A+J
 conda, and other package managers. The _source_ extensions can be installed
 directly from npm (search for [jupyterlab-extension](https://www.npmjs.com/search?q=keywords:jupyterlab-extension)) but require additional build step.
 You can also find JupyterLab extensions exploring GitHub topic [jupyterlab-extension](https://github.com/topics/jupyterlab-extension).
-To learn more about extensions, see the [user documentation](https://jupyterlab.readthedocs.io/en/stable/user/extensions.html).
+To learn more about extensions, see the [user documentation](https://jupyterlab.readthedocs.io/en/3.2.x/user/extensions.html).
 
 The current JupyterLab releases are suitable for general
 usage, and the extension APIs will continue to
@@ -50,7 +50,7 @@ Read the current JupyterLab documentation on [ReadTheDocs](http://jupyterlab.rea
 
 ### Installation
 
-JupyterLab can be installed using [conda](https://docs.conda.io/en/latest/), [mamba](https://mamba.readthedocs.io/en/latest/) or [pip](https://docs.python.org/3.6/installing/index.html). For more detailed instructions, consult the [installation guide](http://jupyterlab.readthedocs.io/en/stable/getting_started/installation.html).
+JupyterLab can be installed using [conda](https://docs.conda.io/en/latest/), [mamba](https://mamba.readthedocs.io/en/latest/) or [pip](https://docs.python.org/3.6/installing/index.html). For more detailed instructions, consult the [installation guide](http://jupyterlab.readthedocs.io/en/3.2.x/getting_started/installation.html).
 
 Project installation instructions from the git sources are available in the [contributor documentation](CONTRIBUTING.md).
 
@@ -95,7 +95,7 @@ Start up JupyterLab using:
 jupyter lab
 ```
 
-JupyterLab will open automatically in the browser. See the [documentation](http://jupyterlab.readthedocs.io/en/stable/getting_started/starting.html) for additional details.
+JupyterLab will open automatically in the browser. See the [documentation](http://jupyterlab.readthedocs.io/en/3.2.x/getting_started/starting.html) for additional details.
 
 If you encounter an error like "Command 'jupyter' not found", please make sure `PATH` environment variable is set correctly. Alternatively, you can start up JupyterLab using `~/.local/bin/jupyter lab` without changing the `PATH` environment variable.
 
@@ -107,7 +107,7 @@ The latest versions of the following browsers are currently _known to work_:
 - Chrome
 - Safari
 
-See our [documentation](http://jupyterlab.readthedocs.io/en/stable/getting_started/installation.html) for additional details.
+See our [documentation](http://jupyterlab.readthedocs.io/en/3.2.x/getting_started/installation.html) for additional details.
 
 ---
 
@@ -117,7 +117,7 @@ We encourage you to ask questions on the [Discourse forum](https://discourse.jup
 
 ### Bug report
 
-To report a bug please read the [guidelines](https://jupyterlab.readthedocs.io/en/stable/getting_started/issue.html) and then open a [Github issue](https://github.com/jupyterlab/jupyterlab/issues/new?template=bug_report.md). To keep resolved issues self-contained, the [lock bot](https://github.com/apps/lock) will lock closed issues as resolved after a period of inactivity. If related discussion is still needed after an issue is locked, please open a new issue and reference the old issue.
+To report a bug please read the [guidelines](https://jupyterlab.readthedocs.io/en/3.2.x/getting_started/issue.html) and then open a [Github issue](https://github.com/jupyterlab/jupyterlab/issues/new?template=bug_report.md). To keep resolved issues self-contained, the [lock bot](https://github.com/apps/lock) will lock closed issues as resolved after a period of inactivity. If related discussion is still needed after an issue is locked, please open a new issue and reference the old issue.
 
 ### Feature request
 
@@ -129,11 +129,11 @@ We also welcome suggestions for new features as they help make the project more
 
 ### Extending JupyterLab
 
-To start developing an extension for JupyterLab, see the [developer documentation](https://jupyterlab.readthedocs.io/en/stable/extension/extension_dev.html) and the [API docs](https://jupyterlab.readthedocs.io/en/stable/api/).
+To start developing an extension for JupyterLab, see the [developer documentation](https://jupyterlab.readthedocs.io/en/3.2.x/extension/extension_dev.html) and the [API docs](https://jupyterlab.readthedocs.io/en/3.2.x/api/).
 
 ### Contributing
 
-To contribute code or documentation to JupyterLab itself, please read the [contributor documentation](https://jupyterlab.readthedocs.io/en/stable/developer/contributing.html).
+To contribute code or documentation to JupyterLab itself, please read the [contributor documentation](https://jupyterlab.readthedocs.io/en/3.2.x/developer/contributing.html).
 
 JupyterLab follows the Jupyter [Community Guides](https://jupyter.readthedocs.io/en/latest/community/content-community.html).
 

+ 2 - 2
buildutils/src/ensure-repo.ts

@@ -34,8 +34,8 @@ type Dict<T> = { [key: string]: T };
 // All other release branches should target a specific named version
 const URL_CONFIG = {
   source: 'master',
-  target: '3.1.x',
-  rtdVersion: 'stable'
+  target: '3.2.x',
+  rtdVersion: '3.2.x'
 };
 
 // Data to ignore.

+ 1 - 1
docs/source/conf.py

@@ -184,7 +184,7 @@ html_context = {
     "display_github": True,  # Integrate GitHub
     "github_user": "jupyterlab",  # Username
     "github_repo": "jupyterlab",  # Repo name
-    "github_version": "3.1.x",  # Version
+    "github_version": "3.2.x",  # Version
     "conf_py_path": "/docs/source/",  # Path in the checkout to the docs root
 }
 

+ 1 - 1
docs/source/extension/internationalization.rst

@@ -31,7 +31,7 @@ To internationalize your extension, the following tasks are required:
 
     Domain are normalized by replacing ``-`` with ``_`` characters.
 
-3. Wraps all translatable strings with one of the `gettext functions <https://jupyterlab.readthedocs.io/en/stable/api/modules/translation.html#translationbundle>`_.
+3. Wraps all translatable strings with one of the `gettext functions <https://jupyterlab.readthedocs.io/en/3.2.x/api/modules/translation.html#translationbundle>`_.
 
 Examples:
 

+ 1 - 1
docs/source/user/rtc.rst

@@ -36,7 +36,7 @@ represent the document's content, what we call ``DocumentModel``. If you
 modify a Notebook with both editors simultaneously, JupyterLab will prompt
 a warning message indicating that the document's content changed. For more
 information, you can read the section of
-`Documents <https://jupyterlab.readthedocs.io/en/stable/extension/documents.html#documents>`_.
+`Documents <https://jupyterlab.readthedocs.io/en/3.2.x/extension/documents.html#documents>`_.
 
 .. image:: images/sync_editors.png
    :align: center

+ 5 - 5
packages/extensionmanager/src/widget.tsx

@@ -250,7 +250,7 @@ function ListEntry(props: ListEntry.IProperties): React.ReactElement<any> {
               )}
               onClick={() =>
                 window.open(
-                  'https://jupyterlab.readthedocs.io/en/stable/user/extensions.html'
+                  'https://jupyterlab.readthedocs.io/en/3.2.x/user/extensions.html'
                 )
               }
             />
@@ -266,7 +266,7 @@ function ListEntry(props: ListEntry.IProperties): React.ReactElement<any> {
                 )}
                 onClick={() =>
                   window.open(
-                    'https://jupyterlab.readthedocs.io/en/stable/user/extensions.html'
+                    'https://jupyterlab.readthedocs.io/en/3.2.x/user/extensions.html'
                   )
                 }
               />
@@ -396,11 +396,11 @@ function getPrebuiltUninstallInstruction(
       </p>
       <p>
         <a
-          href="https://jupyterlab.readthedocs.io/en/stable/user/extensions.html"
+          href="https://jupyterlab.readthedocs.io/en/3.2.x/user/extensions.html"
           target="_blank"
           rel="noopener noreferrer"
         >
-          https://jupyterlab.readthedocs.io/en/stable/user/extensions.html
+          https://jupyterlab.readthedocs.io/en/3.2.x/user/extensions.html
         </a>
       </p>
     </div>
@@ -725,7 +725,7 @@ administrator to verify the listings configuration.`)}
           </div>
           <div>
             <a
-              href="https://jupyterlab.readthedocs.io/en/stable/user/extensions.html"
+              href="https://jupyterlab.readthedocs.io/en/3.2.x/user/extensions.html"
               target="_blank"
               rel="noopener noreferrer"
             >

+ 2 - 2
packages/help-extension/src/index.tsx

@@ -249,12 +249,12 @@ const resources: JupyterFrontEndPlugin<void> = {
     const resources = [
       {
         text: trans.__('JupyterLab Reference'),
-        url: 'https://jupyterlab.readthedocs.io/en/stable/'
+        url: 'https://jupyterlab.readthedocs.io/en/3.2.x/'
       },
       {
         text: trans.__('JupyterLab FAQ'),
         url:
-          'https://jupyterlab.readthedocs.io/en/stable/getting_started/faq.html'
+          'https://jupyterlab.readthedocs.io/en/3.2.x/getting_started/faq.html'
       },
       {
         text: trans.__('Jupyter Reference'),

+ 1 - 1
packages/ui-components/docs/source/intro.rst

@@ -1,4 +1,4 @@
-The `@jupyterlab/ui-components <https://jupyterlab.readthedocs.io/en/stable/api/modules/ui_components.html>`__
+The `@jupyterlab/ui-components <https://jupyterlab.readthedocs.io/en/3.2.x/api/modules/ui_components.html>`__
 package provides UI elements that are widely used in JupyterLab core,
 and that can be reused in your own extensions.