Explorar o código

[WIP] remove "Beta" (#4920)

* Remove mention of “Beta”

Fixes #4898

* Update gitter link in setup.py.

* Normalize python version information, and provide sys.version_info-like named tuple.

* Remove the mention of the beta release series in the help | about dialog.

* Fix the overflow in the help about dialog.
Jason Grout %!s(int64=6) %!d(string=hai) anos
pai
achega
2e5b00c256

+ 4 - 5
README.md

@@ -14,21 +14,20 @@
 [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/18a9793b58ba86660b5ab964e1aeaf7324d667c8?urlpath=lab%2Ftree%2Fdemo%2FLorenz.ipynb)
 
 An extensible environment for interactive and reproducible computing, based on the
-Jupyter Notebook and Architecture. [Currently in beta.](https://blog.jupyter.org/jupyterlab-is-ready-for-users-5a6f039b8906)
+Jupyter Notebook and Architecture. [Currently ready for users.](https://blog.jupyter.org/jupyterlab-is-ready-for-users-5a6f039b8906)
 
 [JupyterLab](http://jupyterlab.readthedocs.io/en/stable/) is the next-generation user interface for [Project Jupyter](https://jupyter.org). It offers
 all the familiar building blocks of the classic Jupyter Notebook (notebook,
 terminal, text editor, file browser, rich outputs, etc.) in a flexible and
 powerful user interface.
-Eventually, JupyterLab will replace the classic Jupyter Notebook after
-JupyterLab reaches 1.0.
+Eventually, JupyterLab will replace the classic Jupyter Notebook.
 
 JupyterLab can be extended using extensions that are [npm](https://www.npmjs.com/) packages
 and use our public APIs. You can search for the GitHub topic [jupyterlab-extension](https://github.com/topics/jupyterlab-extension) to find extensions. To learn more about extensions, see our [user documentation](https://jupyterlab.readthedocs.io/en/latest/user/extensions.html).
 
-The beta releases are suitable for general
+The current JupyterLab releases are suitable for general
 usage. For JupyterLab extension developers, the extension APIs will continue to
-evolve until the 1.0 release.
+evolve.
 
 Read the latest version of our documentation on [ReadTheDocs](http://jupyterlab.readthedocs.io/en/latest/).
 

+ 6 - 2
docs/source/conf.py

@@ -60,14 +60,18 @@ project = 'JupyterLab'
 copyright = '2018, Project Jupyter'
 author = 'Project Jupyter'
 
+
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.0 Beta'
+import json
+with open('../../dev_mode/package.json', 'r') as f:
+    version = json.load(f)['version']
+
 # The full version, including alpha/beta/rc tags.
-release = '1.0 Beta'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

+ 2 - 2
docs/source/developer/extension_dev.rst

@@ -5,8 +5,8 @@ Extension Developer Guide
 
 .. warning::
 
-   The extension developer API is not stable and will evolve in JupyterLab beta
-   releases. The extension developer API will be stable in JupyterLab 1.0.
+   The extension developer API is not stable and will evolve in JupyterLab
+   releases in the near future.
 
 JupyterLab can be extended in four ways via:
 

+ 2 - 2
docs/source/developer/xkcd_extension_tutorial.rst

@@ -5,8 +5,8 @@ Let's Make an xkcd JupyterLab Extension
 
 .. warning::
 
-   The extension developer API is not stable and will evolve in JupyterLab beta
-   releases. The extension developer API will be stable in JupyterLab 1.0.
+   The extension developer API is not stable and will evolve in JupyterLab
+   releases in the near future.
 
 JupyterLab extensions add features to the user experience. This page
 describes how to create one type of extension, an *application plugin*,

+ 4 - 6
docs/source/getting_started/faq.rst

@@ -1,17 +1,15 @@
 Frequently Asked Questions (FAQ)
 ================================
 
-Below are some frequently asked questions regarding the beta release
-series. Click on a question to be directed to relevant information in
-our documentation or our GitHub repo.
+Below are some frequently asked questions. Click on a question to be directed to
+relevant information in our documentation or our GitHub repo.
 
 General
 -------
 
 -  :ref:`What is JupyterLab? <overview>`
--  :ref:`How stable is JupyterLab? <stability>`
--  :ref:`What will happen to the classic Jupyter Notebook? <classic>`
--  :ref:`How long will JupyterLab be in beta? <beta>`
+-  :ref:`Is JupyterLab ready to use? <releases>`
+-  :ref:`What will happen to the classic Jupyter Notebook? <releases>`
 -  `Where is the official online documentation for
    JupyterLab? <https://jupyterlab.readthedocs.io/en/stable/>`__
 

+ 8 - 23
docs/source/getting_started/overview.rst

@@ -47,31 +47,16 @@ JupyterLab is served from the same `server
 `notebook document format <http://nbformat.readthedocs.io/en/latest/>`__ as the
 classic Jupyter Notebook.
 
-.. _stability:
+.. _releases:
 
-Stability of JupyterLab
-~~~~~~~~~~~~~~~~~~~~~~~
+JupyterLab Releases
+~~~~~~~~~~~~~~~~~~~
 
-The current beta release of JupyterLab is stable for daily use.
-Likewise, all future releases in the beta series will be stable for daily use.
+The current release of JupyterLab is suitable for general daily use.
 
-.. _classic:
-
-Classic Jupyter Notebook
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-JupyterLab 1.0 will eventually replace the classic Jupyter Notebook.
-Throughout this transition, the same notebook document format will be supported by both the classic Notebook and JupyterLab.
-
-.. _beta:
-
-Beta Series and Beyond
-~~~~~~~~~~~~~~~~~~~~~~
-The developer API will evolve in beta releases and will stabilize in JupyterLab 1.0.
+The extension developer API is evolving, and we also are currently iterating on UI/UX improvements.
 We appreciate feedback on our `GitHub issues page <https://github.com/jupyterlab/jupyterlab/issues>`__
-as we evolve towards a stable extension development API for JupyterLab 1.0.
+as we evolve towards a stable extension development API.
 
-We plan to release JupyterLab 1.0 later in 2018.
-The beta releases leading up to 1.0 will focus on
-stabilizing the extension development API, UI/UX improvements,
-and additional core features.
+JupyterLab will eventually replace the classic Jupyter Notebook.
+Throughout this transition, the same notebook document format will be supported by both the classic Notebook and JupyterLab.

+ 1 - 2
docs/source/user/extensions.rst

@@ -23,8 +23,7 @@ information about developing extensions, see the :ref:`developer documentation
 .. note::
 
    If you are a JupyterLab extension developer, please note that the extension
-   developer API is not stable and will evolve in JupyterLab beta releases. The
-   extension developer API will be stable in JupyterLab 1.0.
+   developer API is not stable and will evolve in the near future.
 
 
 In order to install JupyterLab extensions, you need to have `Node.js

+ 13 - 2
jupyterlab/_version.py

@@ -1,2 +1,13 @@
-version_info = (0, 33, 0, 'rc1')
-__version__ = ".".join(map(str, version_info))
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+from collections import namedtuple
+
+VersionInfo = namedtuple('VersionInfo', ['major', 'minor', 'micro', 'releaselevel', 'serial'])
+
+version_info = VersionInfo(0, 33, 0, 'candidate', 1)
+
+_specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}
+
+__version__ = '{}.{}.{}{}'.format(version_info.major, version_info.minor, version_info.micro,
+'' if version_info.releaselevel=='final' else _specifier_[version_info.releaselevel]+str(version_info.serial))

+ 1 - 1
jupyterlab/extension.py

@@ -56,7 +56,7 @@ def load_jupyter_server_extension(nbapp):
     )
 
     # Print messages.
-    logger.info('JupyterLab beta preview extension loaded from %s' % HERE)
+    logger.info('JupyterLab extension loaded from %s' % HERE)
     logger.info('JupyterLab application directory is %s' % app_dir)
 
     config.app_name = 'JupyterLab Beta'

+ 2 - 2
packages/faq-extension/faq.md

@@ -1,13 +1,13 @@
 # Frequently Asked Questions (FAQ)
 
-Below are some frequently asked questions regarding the beta release series.
+Below are some frequently asked questions.
 Click on a question to be directed to relevant information in our documentation or our GitHub repo.
 
 ## General
 
 * [What is JupyterLab?](https://jupyterlab.readthedocs.io/en/stable/getting_started/overview.html)
 * [How stable is JupyterLab?](https://jupyterlab.readthedocs.io/en/stable/getting_started/overview.html)
-* [What will happen to the classic Jupyter Notebook?](https://jupyterlab.readthedocs.io/en/stable/getting_started/overview.html#beta)
+* [What will happen to the classic Jupyter Notebook?](https://jupyterlab.readthedocs.io/en/stable/getting_started/overview.html#releases)
 * [Where is the documentation for JupyterLab?](https://jupyterlab.readthedocs.io/en/stable/)
 
 ## Development

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

@@ -270,11 +270,9 @@ function activate(
       // Create the header of the about dialog
       let headerLogo = <div className="jp-About-header-logo" />;
       let headerWordmark = <div className="jp-About-header-wordmark" />;
-      let release = 'Beta Release Series';
       let versionNumber = `Version ${info.version}`;
       let versionInfo = (
         <span className="jp-About-version-info">
-          <span className="jp-About-release">{release}</span>
           <span className="jp-About-version">{versionNumber}</span>
         </span>
       );

+ 1 - 4
packages/help-extension/style/index.css

@@ -54,7 +54,6 @@
   margin-right: 0px;
 }
 
-.jp-About-release,
 .jp-About-version {
   display: block;
 }
@@ -69,7 +68,6 @@
   justify-content: flex-start;
   align-items: flex-start;
   padding-top: 12px;
-  margin-bottom: -15px;
 }
 
 .jp-About-externalLinks .jp-Button-flat {
@@ -77,8 +75,7 @@
 }
 
 .jp-About-copyright {
-  position: relative;
-  bottom: -44px;
+  padding-top: 25px;
 }
 
 .jp-About-header {

+ 2 - 2
setup.py

@@ -22,9 +22,9 @@ from setuptools.command.develop import develop
 NAME = 'jupyterlab'
 DESCRIPTION = 'The JupyterLab notebook server extension.'
 LONG_DESCRIPTION = """
-This is a beta release of JupyterLab.
+An extensible, comprehensive Jupyter web application.
 Development happens on https://github.com/jupyter/jupyterlab, with chat on
-https://gitter.im/jupyter/jupyterlab.
+https://gitter.im/jupyterlab/jupyterlab.
 """
 
 ensure_python(['2.7', '>=3.3'])