Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove "Beta" #4920

Merged
merged 5 commits into from
Jul 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

Expand Down
8 changes: 6 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,18 @@
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.
Expand Down
4 changes: 2 additions & 2 deletions docs/source/developer/extension_dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions docs/source/developer/xkcd_extension_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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*,
Expand Down
10 changes: 4 additions & 6 deletions docs/source/getting_started/faq.rst
Original file line number Diff line number Diff line change
@@ -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/>`__

Expand Down
31 changes: 8 additions & 23 deletions docs/source/getting_started/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
3 changes: 1 addition & 2 deletions docs/source/user/extensions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 13 additions & 2 deletions jupyterlab/_version.py
Original file line number Diff line number Diff line change
@@ -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))
2 changes: 1 addition & 1 deletion jupyterlab/extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions packages/faq-extension/faq.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions packages/help-extension/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
Expand Down
5 changes: 1 addition & 4 deletions packages/help-extension/style/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
margin-right: 0px;
}

.jp-About-release,
.jp-About-version {
display: block;
}
Expand All @@ -69,16 +68,14 @@
justify-content: flex-start;
align-items: flex-start;
padding-top: 12px;
margin-bottom: -15px;
}

.jp-About-externalLinks .jp-Button-flat {
color: #f37726;
}

.jp-About-copyright {
position: relative;
bottom: -44px;
padding-top: 25px;
}

.jp-About-header {
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
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'])
Expand Down