Skip to content

Commit 05425f6

Browse files
committed
Merge branch 'jupyter-master'
2 parents 4af1eda + 459b972 commit 05425f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2885
-1859
lines changed

.github/answered.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This action automatically schedules issues to be closed that have been
2+
# labeled as answered if there is no activity on them for 30 days. This takes
3+
# care of the common usecase of an issue being answered to the best of our
4+
# ability and no other follow-up from the submitter.
5+
name: 'Close answered issues'
6+
on:
7+
schedule:
8+
- cron: '30 1 * * *'
9+
10+
jobs:
11+
stale:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/stale@v3
15+
with:
16+
skip-stale-issue-message: true
17+
days-before-stale: 30
18+
days-before-close: 7
19+
stale-issue-label: 'status:Closing as Answered'
20+
only-issue-labels: 'status:Answered'
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Check Release
2+
on:
3+
push:
4+
branches: ["master"]
5+
pull_request:
6+
branches: ["*"]
7+
8+
permissions:
9+
contents:
10+
write
11+
12+
jobs:
13+
check_release:
14+
runs-on: ubuntu-latest
15+
strategy:
16+
matrix:
17+
group: [check_release, link_check]
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
- name: Install Python
22+
uses: actions/setup-python@v2
23+
with:
24+
python-version: 3.9
25+
architecture: "x64"
26+
- name: Install node
27+
uses: actions/setup-node@v2
28+
with:
29+
node-version: '14.x'
30+
- name: Get pip cache dir
31+
id: pip-cache
32+
run: |
33+
echo "::set-output name=dir::$(pip cache dir)"
34+
- name: Cache pip
35+
uses: actions/cache@v1
36+
with:
37+
path: ${{ steps.pip-cache.outputs.dir }}
38+
key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}
39+
restore-keys: |
40+
${{ runner.os }}-pip-
41+
${{ runner.os }}-pip-
42+
- name: Cache checked links
43+
if: ${{ matrix.group == 'link_check' }}
44+
uses: actions/cache@v2
45+
with:
46+
path: ~/.cache/pytest-link-check
47+
key: ${{ runner.os }}-linkcheck-${{ hashFiles('**/*.md', '**/*.rst') }}-md-links
48+
restore-keys: |
49+
${{ runner.os }}-linkcheck-
50+
- name: Upgrade packaging dependencies
51+
run: |
52+
pip install --upgrade pip setuptools wheel --user
53+
- name: Install Dependencies
54+
run: |
55+
pip install -e .
56+
- name: Check Release
57+
if: ${{ matrix.group == 'check_release' }}
58+
env:
59+
TWINE_PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }}
60+
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
61+
with:
62+
token: ${{ secrets.GITHUB_TOKEN }}
63+
- name: Check Links
64+
if: ${{ matrix.group == 'link_check' }}
65+
uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1

.github/workflows/lock.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: 'Lock Closed Threads'
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
7+
permissions:
8+
issues:
9+
write
10+
pull-requests:
11+
write
12+
13+
jobs:
14+
lock:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: dessant/lock-threads@v2
18+
with:
19+
github-token: ${{ github.token }}
20+
issue-lock-inactive-days: '180'
21+
issue-lock-labels: 'status:resolved-locked'
22+
pr-lock-inactive-days: '180'
23+
pr-lock-labels: 'status:resolved-locked'

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,8 @@ geckodriver.log
5151
*.code-workspace
5252
.history
5353
.vscode
54+
55+
# copied changelog
56+
docs/source/changelog.md
57+
58+
.jupyter_releaser_checkout

CHANGELOG.md

Lines changed: 1534 additions & 0 deletions
Large diffs are not rendered by default.

CONTRIBUTING.rst

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,7 @@ Verification
6666

6767
While running the notebook, select one of your notebook files (the file will have the extension ``.ipynb``).
6868
In the top tab you will click on "Help" and then click on "About". In the pop window you will see information about the version of Jupyter that you are running. You will see "The version of the notebook server is:".
69-
If you are working in development mode, you will see that your version of Jupyter notebook will include the word "dev".
70-
71-
.. image:: ./docs/source/_static/images/jupyter-verification.png
72-
:width: 40pt
73-
74-
If it does not include the word "dev", you are currently not working in development mode and should follow the steps below to uninstall and reinstall Jupyter.
69+
If you are working in development mode, you will see that your version of Jupyter notebook will include the word "dev". If it does not include the word "dev", you are currently not working in development mode and should follow the steps below to uninstall and reinstall Jupyter.
7570

7671
Troubleshooting the Installation
7772
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

MANIFEST.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
include LICENSE
22
include CONTRIBUTING.rst
33
include README.md
4+
include CHANGELOG.md
45
include package.json
56
include bower.json
67
include .bowerrc
8+
include pyproject.toml
9+
include setup.py
710
include setupbase.py
811
include Dockerfile
12+
include *.js
913
graft tools
14+
graft notebook/tests
1015

1116
# Translations
1217
graft notebook/i18n

README.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Jupyter Notebook
2+
3+
[![Google Group](https://img.shields.io/badge/-Google%20Group-lightgrey.svg)](https://groups.google.com/forum/#!forum/jupyter)
4+
[![Build Status](https://travis-ci.org/jupyter/notebook.svg?branch=master)](https://travis-ci.org/jupyter/notebook)
5+
[![Documentation Status](https://readthedocs.org/projects/jupyter-notebook/badge/?version=latest)](https://jupyter-notebook.readthedocs.io/en/latest/?badge=latest)
6+
[![codecov](https://codecov.io/gh/jupyter/notebook/branch/master/graph/badge.svg)](https://codecov.io/gh/jupyter/notebook)
7+
8+
The Jupyter notebook is a web-based notebook environment for interactive
9+
computing.
10+
11+
![Jupyter notebook example](docs/resources/running_code_med.png "Jupyter notebook example")
12+
13+
### Notice
14+
Please note that this repository is currently maintained by a skeleton crew of maintainers from the Jupyter community. We encourage users to transition to JupyterLab, where more immediate support can occur. Our approach moving forward will be:
15+
16+
1. To maintain the security of the Jupyter Notebook. That means security-related issues and pull requests are our highest priority.
17+
2. To address JupyterLab [feature parity issues](https://github.com/jupyterlab/jupyterlab/issues?q=is%3Aopen+is%3Aissue+label%3A%22tag%3AFeature+Parity%22). As part of this effort, we are also working on a better [notebook-only experience](https://github.com/jupyterlab/jupyterlab/issues/8450) in JupyterLab for users who prefer the UI of the classic Jupyter Notebook.
18+
3. To be responsive to the hard work of community members who have opened pull requests. We are triaging these PRs. We cannot support or maintain new features at this time, but we welcome security and other sustainability fixes.
19+
20+
If you have an open pull request with a new feature or if you were planning to open one, please consider shipping it as a [notebook extension](https://jupyter-notebook.readthedocs.io/en/stable/extending/) instead.
21+
22+
##### Alternatives to contributing to `notebook`
23+
Additionally, please consider whether your contribution would be appropriate for either the underlying server for Jupyter front-ends, [jupyter_server](https://github.com/jupyter/jupyter_server) or in the [JupyterLab front-end](https://github.com/jupyterlab/jupyterlab).
24+
25+
### Jupyter notebook, the language-agnostic evolution of IPython notebook
26+
Jupyter notebook is a language-agnostic HTML notebook application for
27+
Project Jupyter. In 2015, Jupyter notebook was released as a part of
28+
The Big Split™ of the IPython codebase. IPython 3 was the last major monolithic
29+
release containing both language-agnostic code, such as the *IPython notebook*,
30+
and language specific code, such as the *IPython kernel for Python*. As
31+
computing spans across many languages, Project Jupyter will continue to develop the
32+
language-agnostic **Jupyter notebook** in this repo and with the help of the
33+
community develop language specific kernels which are found in their own
34+
discrete repos.
35+
[[The Big Split™ announcement](https://blog.jupyter.org/the-big-split-9d7b88a031a7)]
36+
[[Jupyter Ascending blog post](https://blog.jupyter.org/jupyter-ascending-1bf5b362d97e)]
37+
38+
## Installation
39+
You can find the installation documentation for the
40+
[Jupyter platform, on ReadTheDocs](https://jupyter.readthedocs.io/en/latest/install.html).
41+
The documentation for advanced usage of Jupyter notebook can be found
42+
[here](https://jupyter-notebook.readthedocs.io/en/latest/).
43+
44+
For a local installation, make sure you have
45+
[pip installed](https://pip.readthedocs.io/en/stable/installing/) and run:
46+
47+
$ pip install notebook
48+
49+
## Usage - Running Jupyter notebook
50+
51+
### Running in a local installation
52+
53+
Launch with:
54+
55+
$ jupyter notebook
56+
57+
### Running in a remote installation
58+
59+
You need some configuration before starting Jupyter notebook remotely. See [Running a notebook server](https://jupyter-notebook.readthedocs.io/en/stable/public_server.html).
60+
61+
## Development Installation
62+
63+
See [`CONTRIBUTING.rst`](CONTRIBUTING.rst) for how to set up a local development installation.
64+
65+
## Contributing
66+
67+
If you are interested in contributing to the project, see [`CONTRIBUTING.rst`](CONTRIBUTING.rst).
68+
69+
## Resources
70+
- [Project Jupyter website](https://jupyter.org)
71+
- [Online Demo at jupyter.org/try](https://jupyter.org/try)
72+
- [Documentation for Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/latest/) [[PDF](https://media.readthedocs.org/pdf/jupyter-notebook/latest/jupyter-notebook.pdf)]
73+
- [Korean Version of Installation](https://github.com/ChungJooHo/Jupyter_Kor_doc/)
74+
- [Documentation for Project Jupyter](https://jupyter.readthedocs.io/en/latest/index.html) [[PDF](https://media.readthedocs.org/pdf/jupyter/latest/jupyter.pdf)]
75+
- [Issues](https://github.com/jupyter/notebook/issues)
76+
- [Technical support - Jupyter Google Group](https://groups.google.com/forum/#!forum/jupyter)

RELEASE.md

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,79 @@
11
# Making a Release of Notebook
22

3-
## Start from a fresh git checkout and conda environment
3+
## Using `jupyter_releaser`
44

5-
### Set the release branch
5+
The recommended way to make a release is to use [`jupyter_releaser`](https://github.com/jupyter-server/jupyter_releaser#checklist-for-adoption).
6+
7+
## Manual Release Process
8+
9+
### Start from a fresh git checkout and conda environment
10+
11+
#### Set the release branch
612

713
```bash
814
export release_branch=master
915
```
1016

11-
### Create the git checkout
17+
#### Create the git checkout
1218

1319
```bash
1420
git clone [email protected]:jupyter/notebook.git
1521
cd notebook
1622
git checkout ${release_banch}
1723
```
1824

19-
### Create and activate the conda environment
25+
#### Create and activate the conda environment
2026

2127
```bash
2228
conda create -n notebook-release -c conda-forge jupyter
2329
conda activate notebook-release
2430
```
2531

26-
## Perform a local dev install
32+
### Perform a local dev install
2733

2834
```bash
2935
pip install -ve .
3036
```
3137

32-
## Install release dependencies
38+
### Install release dependencies
3339

3440
```bash
35-
conda install -c conda-forge nodejs babel twine
41+
conda install -c conda-forge nodejs babel
3642
npm install -g po2json
43+
pip install jupyter_releaser # used for build dependencies (build, twine, tbump)
3744
```
3845

39-
## Update the version
46+
### Update the version
4047

4148
```bash
42-
vim notebook/_version.py
49+
tbump --only-patch <new_version> # set the new version
4350
python setup.py jsversion
4451
git commit -am "Release $(python setup.py --version)"
4552
git tag $(python setup.py --version)
4653
```
4754

48-
## Create the artifacts
55+
### Create the artifacts
4956

5057
```bash
5158
rm -rf dist
52-
python setup.py sdist
53-
python setup.py bdist_wheel
59+
python -m build .
5460
```
5561

56-
## Upload the artifacts
62+
### Upload the artifacts
5763

5864
```bash
5965
twine check dist/* && twine upload dist/*
6066
```
6167

62-
## Change back to dev version
68+
### Change back to dev version
6369

6470
```bash
65-
vim notebook/_version.py # Add the .dev suffix
71+
tbump --only-patch <dev_version> # Add the .dev suffix
6672
python setup.py jsversion
6773
git commit -am "Back to dev version"
6874
```
6975

70-
## Push the commits and tags
76+
### Push the commits and tags
7177

7278
```bash
7379
git push origin ${release_branch} --tags

bower.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"create-react-class": "https://cdn.jsdelivr.net/npm/[email protected]/create-react-class.min.js",
1010
"es6-promise": "~1.0",
1111
"font-awesome": "components/font-awesome#~4.7.0",
12-
"google-caja": "5669",
1312
"jed": "~1.1.1",
1413
"jquery": "components/jquery#~3.5.0",
1514
"jquery-typeahead": "~2.10.6",

0 commit comments

Comments
 (0)