Skip to content

Commit d64a86b

Browse files
jeflemjeflem
committed
Merge branch 'main' into course_titles
2 parents 96c8845 + b9515d8 commit d64a86b

File tree

9 files changed

+90
-29
lines changed

9 files changed

+90
-29
lines changed

‎.github/workflows/test-extensions.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,34 @@ defaults:
1515
shell: bash
1616

1717
jobs:
18+
labextension-compatibility:
19+
runs-on: ubuntu-22.04
20+
timeout-minutes: 10
21+
steps:
22+
- uses: actions/checkout@v3
23+
- name: Install node
24+
uses: actions/setup-node@v3
25+
with:
26+
node-version: '18.x'
27+
# NOTE: actions/setup-python@v2 can make use of a cache within the GitHub
28+
# Action virtual environment and setup extremely fast. 3.9 isn't
29+
# available in this cache as of November 2020.
30+
- name: Install Python
31+
uses: actions/setup-python@v2
32+
- name: Install package
33+
run: |
34+
python -m pip install --upgrade pip wheel setuptools
35+
pip install -e .
36+
pip freeze
37+
- name: Check compatibility
38+
run: |
39+
if [[ $(jupyter labextension list 2>&1 | grep '(python, nbgrader)' | grep ' X') ]]
40+
then
41+
echo "Compatibility error"
42+
jupyter labextension list
43+
exit 1
44+
fi
45+
1846
ui-test:
1947
runs-on: ${{ matrix.os }}
2048
timeout-minutes: 40

‎CHANGELOG.md‎

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,55 @@ A summary of changes to nbgrader.
22

33
<!-- <START NEW CHANGELOG ENTRY> -->
44

5+
## 0.9.1
6+
7+
([Full Changelog](https://github.com/jupyter/nbgrader/compare/v0.9.0...7922f769c4b30e9fb9260a7b8a39e7365373f980))
8+
9+
### Maintenance and upkeep improvements
10+
11+
- Labextension compatibility [#1827](https://github.com/jupyter/nbgrader/pull/1827) ([@brichet](https://github.com/brichet))
12+
13+
### Contributors to this release
14+
15+
([GitHub contributors page for this release](https://github.com/jupyter/nbgrader/graphs/contributors?from=2023-09-04&to=2023-09-05&type=c))
16+
17+
[@brichet](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Abrichet+updated%3A2023-09-04..2023-09-05&type=Issues)
18+
19+
<!-- <END NEW CHANGELOG ENTRY> -->
20+
21+
## 0.9.0
22+
23+
([Full Changelog](https://github.com/jupyter/nbgrader/compare/v0.9.0a1...6db380039dab377157620516ae49eafcf7537fc8))
24+
25+
### Enhancements made
26+
27+
- New Feature: Auto-generation of test code [#1817](https://github.com/jupyter/nbgrader/pull/1817) ([@trevorcampbell](https://github.com/trevorcampbell))
28+
- Add missing grade_cells before autograding [#1770](https://github.com/jupyter/nbgrader/pull/1770) ([@tuncbkose](https://github.com/tuncbkose))
29+
30+
### Bugs fixed
31+
32+
- Revert change breaking sqlalchemy 1.4.x [#1823](https://github.com/jupyter/nbgrader/pull/1823) ([@brichet](https://github.com/brichet))
33+
- Fix jquery in documentation, and update documentation [#1819](https://github.com/jupyter/nbgrader/pull/1819) ([@brichet](https://github.com/brichet))
34+
- Add unused arg for docs/cleandocs [#1815](https://github.com/jupyter/nbgrader/pull/1815) ([@trevorcampbell](https://github.com/trevorcampbell))
35+
- Add missing grade_cells before autograding [#1770](https://github.com/jupyter/nbgrader/pull/1770) ([@tuncbkose](https://github.com/tuncbkose))
36+
37+
### Maintenance and upkeep improvements
38+
39+
- Clean remaining code relative to Notebook\<7 [#1824](https://github.com/jupyter/nbgrader/pull/1824) ([@brichet](https://github.com/brichet))
40+
- Update lab and notebook dependencies [#1812](https://github.com/jupyter/nbgrader/pull/1812) ([@brichet](https://github.com/brichet))
41+
42+
### Documentation improvements
43+
44+
- Fix jquery in documentation, and update documentation [#1819](https://github.com/jupyter/nbgrader/pull/1819) ([@brichet](https://github.com/brichet))
45+
- Add unused arg for docs/cleandocs [#1815](https://github.com/jupyter/nbgrader/pull/1815) ([@trevorcampbell](https://github.com/trevorcampbell))
46+
- Fix labextension plugin IDs in the docs [#1811](https://github.com/jupyter/nbgrader/pull/1811) ([@lahwaacz](https://github.com/lahwaacz))
47+
48+
### Contributors to this release
49+
50+
([GitHub contributors page for this release](https://github.com/jupyter/nbgrader/graphs/contributors?from=2023-07-21&to=2023-09-04&type=c))
51+
52+
[@brichet](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Abrichet+updated%3A2023-07-21..2023-09-04&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Agithub-actions+updated%3A2023-07-21..2023-09-04&type=Issues) | [@lahwaacz](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Alahwaacz+updated%3A2023-07-21..2023-09-04&type=Issues) | [@trevorcampbell](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Atrevorcampbell+updated%3A2023-07-21..2023-09-04&type=Issues) | [@tuncbkose](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Atuncbkose+updated%3A2023-07-21..2023-09-04&type=Issues)
53+
554
## 0.9.0a1
655

756
([Full Changelog](https://github.com/jupyter/nbgrader/compare/v0.9.0a0...2d7dc7c0b758c5f61a34b7cc4a0fd2f04d748bb4))
@@ -20,8 +69,6 @@ A summary of changes to nbgrader.
2069

2170
[@brichet](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Abrichet+updated%3A2023-07-18..2023-07-21&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Agithub-actions+updated%3A2023-07-18..2023-07-21&type=Issues)
2271

23-
<!-- <END NEW CHANGELOG ENTRY> -->
24-
2572
## 0.9.0a0
2673

2774
([Full Changelog](https://github.com/jupyter/nbgrader/compare/v0.8.4...1b5ffa93db15012f15ac17bf475eab2420fe73bf))

‎nbgrader/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version_info = (0, 9, 0, "a", "1")
1+
version_info = (0, 9, 1, "", "")
22
__version__ = ".".join(map(str, version_info[:3])) + "".join(version_info[3:])

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nbgrader",
3-
"version": "0.9.0-alpha.1",
3+
"version": "0.9.1",
44
"description": "nbgrader nodejs dependencies",
55
"keywords": [
66
"jupyter",
@@ -46,7 +46,7 @@
4646
"dependencies": {
4747
"@jupyter-notebook/application": "^7.0.2",
4848
"@jupyter-notebook/tree": "^7.0.2",
49-
"@jupyter/ydoc": "^0.3.4",
49+
"@jupyter/ydoc": "^1.0.2",
5050
"@jupyterlab/application": "^4.0.4",
5151
"@jupyterlab/apputils": "^4.1.4",
5252
"@jupyterlab/cells": "^4.0.4",

‎pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies = [
4949
"sqlalchemy>=1.4,<3",
5050
"PyYAML>=6.0",
5151
]
52-
version = "0.9.0a1"
52+
version = "0.9.1"
5353

5454
[project.license]
5555
file = "LICENSE"
@@ -156,7 +156,7 @@ before-build-python = [
156156
]
157157

158158
[tool.tbump.version]
159-
current = "0.9.0a1"
159+
current = "0.9.1"
160160
regex = '''
161161
(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
162162
((?P<channel>a|b|rc|.dev)(?P<release>\d+))?

‎src/assignment_list/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export class AssignmentListWidget extends Widget {
131131
checkNbGraderVersion() {
132132
var warning = this.node.getElementsByClassName('version_error')[0] as HTMLDivElement;
133133
warning.hidden=false;
134-
requestAPI<any>('nbgrader_version?version='+"0.9.0a1")
134+
requestAPI<any>('nbgrader_version?version='+"0.9.1")
135135
.then(response => {
136136
if (!response['success']) {
137137
warning.innerText = response['message'];

‎src/course_list/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class CourseListWidget extends Widget {
7070
}
7171

7272
checkNbGraderVersion() {
73-
let nbgrader_version = '0.9.0a1';
73+
let nbgrader_version = '0.9.1';
7474
requestAPI<any>('nbgrader_version?version='+nbgrader_version)
7575
.then(response => {
7676
if (!response['success']) {

‎src/validate_assignment/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { requestAPI } from './validateassignment';
1010

1111
import { showNbGraderDialog, validate } from '../common/validate';
1212

13-
var nbgrader_version = "0.9.0a1"; // TODO: hardcoded value
13+
var nbgrader_version = "0.9.1"; // TODO: hardcoded value
1414

1515
class ValidateButton extends ToolbarButton {
1616
private _buttonCallback = this.newButtonCallback();

‎yarn.lock‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -492,20 +492,6 @@ __metadata:
492492
languageName: node
493493
linkType: hard
494494

495-
"@jupyter/ydoc@npm:^0.3.4":
496-
version: 0.3.4
497-
resolution: "@jupyter/ydoc@npm:0.3.4"
498-
dependencies:
499-
"@jupyterlab/nbformat": ^3.0.0 || ^4.0.0-alpha.15
500-
"@lumino/coreutils": ^1.11.0 || ^2.0.0-alpha.6
501-
"@lumino/disposable": ^1.10.0 || ^2.0.0-alpha.6
502-
"@lumino/signaling": ^1.10.0 || ^2.0.0-alpha.6
503-
y-protocols: ^1.0.5
504-
yjs: ^13.5.40
505-
checksum: edd14a01be6ceac437d3ebfb5f7a2d2c8eac60fec91e48d8d2ef2bef9f1423b4350c57dba25b3b043759ffb61b601a3815c1ea56532d1d707e3fbeb5df86b7e6
506-
languageName: node
507-
linkType: hard
508-
509495
"@jupyter/ydoc@npm:^1.0.2":
510496
version: 1.0.2
511497
resolution: "@jupyter/ydoc@npm:1.0.2"
@@ -993,7 +979,7 @@ __metadata:
993979
languageName: node
994980
linkType: hard
995981

996-
"@jupyterlab/nbformat@npm:^3.0.0 || ^4.0.0-alpha.15, @jupyterlab/nbformat@npm:^3.0.0 || ^4.0.0-alpha.21 || ^4.0.0, @jupyterlab/nbformat@npm:^4.0.4, @jupyterlab/nbformat@npm:^4.0.5":
982+
"@jupyterlab/nbformat@npm:^3.0.0 || ^4.0.0-alpha.21 || ^4.0.0, @jupyterlab/nbformat@npm:^4.0.4, @jupyterlab/nbformat@npm:^4.0.5":
997983
version: 4.0.5
998984
resolution: "@jupyterlab/nbformat@npm:4.0.5"
999985
dependencies:
@@ -1423,7 +1409,7 @@ __metadata:
14231409
languageName: node
14241410
linkType: hard
14251411

1426-
"@lumino/coreutils@npm:^1.11.0 || ^2.0.0, @lumino/coreutils@npm:^1.11.0 || ^2.0.0-alpha.6, @lumino/coreutils@npm:^1.11.0 || ^2.1.2, @lumino/coreutils@npm:^2.1.1, @lumino/coreutils@npm:^2.1.2":
1412+
"@lumino/coreutils@npm:^1.11.0 || ^2.0.0, @lumino/coreutils@npm:^1.11.0 || ^2.1.2, @lumino/coreutils@npm:^2.1.1, @lumino/coreutils@npm:^2.1.2":
14271413
version: 2.1.2
14281414
resolution: "@lumino/coreutils@npm:2.1.2"
14291415
checksum: 7865317ac0676b448d108eb57ab5d8b2a17c101995c0f7a7106662d9fe6c859570104525f83ee3cda12ae2e326803372206d6f4c1f415a5b59e4158a7b81066f
@@ -1447,7 +1433,7 @@ __metadata:
14471433
languageName: node
14481434
linkType: hard
14491435

1450-
"@lumino/disposable@npm:^1.10.0 || ^2.0.0, @lumino/disposable@npm:^1.10.0 || ^2.0.0-alpha.6, @lumino/disposable@npm:^2.1.2":
1436+
"@lumino/disposable@npm:^1.10.0 || ^2.0.0, @lumino/disposable@npm:^2.1.2":
14511437
version: 2.1.2
14521438
resolution: "@lumino/disposable@npm:2.1.2"
14531439
dependencies:
@@ -1508,7 +1494,7 @@ __metadata:
15081494
languageName: node
15091495
linkType: hard
15101496

1511-
"@lumino/signaling@npm:^1.10.0 || ^2.0.0, @lumino/signaling@npm:^1.10.0 || ^2.0.0-alpha.6, @lumino/signaling@npm:^2.1.1, @lumino/signaling@npm:^2.1.2":
1497+
"@lumino/signaling@npm:^1.10.0 || ^2.0.0, @lumino/signaling@npm:^2.1.1, @lumino/signaling@npm:^2.1.2":
15121498
version: 2.1.2
15131499
resolution: "@lumino/signaling@npm:2.1.2"
15141500
dependencies:
@@ -5458,7 +5444,7 @@ __metadata:
54585444
dependencies:
54595445
"@jupyter-notebook/application": ^7.0.2
54605446
"@jupyter-notebook/tree": ^7.0.2
5461-
"@jupyter/ydoc": ^0.3.4
5447+
"@jupyter/ydoc": ^1.0.2
54625448
"@jupyterlab/application": ^4.0.4
54635449
"@jupyterlab/apputils": ^4.1.4
54645450
"@jupyterlab/builder": ^4.0.4

0 commit comments

Comments
 (0)