Skip to content

Commit

Permalink
(1) switch to 0.8.0.dev version, (2) remove duplicate information in …
Browse files Browse the repository at this point in the history
…pyproject.toml file, (3) add github workflow to upload artifact and (4) fix traitlets dependency (version 5.2.0 breaks tests)
  • Loading branch information
Nicolas Brichet committed May 12, 2022
1 parent a5c48ef commit 35ed7aa
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 74 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ jobs:
- name: Run Link Check
if: ${{ matrix.group == 'link_check' }}
uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1
- name: Upload Distributions
uses: actions/upload-artifact@v2
with:
name: jupyter-releaser-dist-${{ github.run_number }}
path: .jupyter_releaser_checkout/dist
4 changes: 2 additions & 2 deletions nbgrader/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version_info = (0, 8, 0)
__version__ = '.'.join(map(str, version_info))
version_info = (0, 8, 0, "dev")
__version__ = '.'.join(map(str, version_info))
2 changes: 1 addition & 1 deletion nbgrader/nbextensions/assignment_list/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define([
], function(Jupyter, $, utils, AssignmentList) {
"use strict";

var nbgrader_version = "0.8.0";
var nbgrader_version = "0.8.0.dev";

var ajax = utils.ajax || $.ajax;
// Notebook v4.3.1 enabled xsrf so use notebooks ajax that includes the
Expand Down
2 changes: 1 addition & 1 deletion nbgrader/nbextensions/course_list/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define([
], function(Jupyter, $, utils, CourseList) {
"use strict";

var nbgrader_version = "0.8.0";
var nbgrader_version = "0.8.0.dev";

var ajax = utils.ajax || $.ajax;
// Notebook v4.3.1 enabled xsrf so use notebooks ajax that includes the
Expand Down
2 changes: 1 addition & 1 deletion nbgrader/nbextensions/validate_assignment/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define([
], function ($, Jupyter, dialog, utils) {
"use strict";

var nbgrader_version = "0.8.0";
var nbgrader_version = "0.8.0.dev";

var ajax = utils.ajax || $.ajax;
// Notebook v4.3.1 enabled xsrf so use notebooks ajax that includes the
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nbgrader-deps",
"version": "0.8.0",
"version": "0.8.0.dev",
"description": "nbgrader nodejs dependencies",
"author": "Jupyter Developers",
"license": "BSD",
Expand Down
75 changes: 7 additions & 68 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,72 +1,7 @@
[project]
name = "nbgrader"
description = "A system for assigning and grading notebooks"
license = {file = "LICENSE"}
authors = [{name = "Jupyter Development Team", email = "jupyter@googlegroups.com"}]
keywords = ["Jupyter", "Notebooks", "Grading", "Homework"]
classifiers = [
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",

"Framework :: Jupyter",
"Framework :: Jupyter :: JupyterLab",
"Framework :: Jupyter :: JupyterLab :: 3",
"Framework :: Jupyter :: JupyterLab :: Extensions",
"Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt",
]
urls = {Homepage = "https://github.com/jupyter/nbgrader"}
requires-python = ">=3.7"
dependencies = [
"sqlalchemy>=1.4,<2",
"python-dateutil>=2.8",
"notebook>=6.4,<7",
"nbconvert>=6",
"requests>=2.26",
"jsonschema>=3",
"alembic>=1.7",
"rapidfuzz>=1.8",
"Jinja2>=3",
"MarkupSafe<2.2.0",
"jupyter_client<8",
"jupyter_server>=1.12",
"qtconsole>=5.2",
"ipywidgets>=7.6",
"nbclient>=0.6.1",
]
dynamic = ["version"]

[project.readme]
file = "README.md"
content-type = "text/markdown"

[project.optional-dependencies]
docs = [
"sphinx",
"sphinx_rtd_theme",
"sphinx-autodoc-typehints",
"myst-parser"
]
tests = [
"pytest==7.1.2",
"pytest-cov",
"pytest-rerunfailures",
"pytest-xdist==2.5.0",
"coverage",
"selenium>2.4",
"codecov",
"nbval",
"requests-mock",
"wheel",
]

[project.scripts]
nbgrader = "nbgrader.apps.nbgraderapp:main"

[tool.tbump.version]
current = "0.8.0"
current = "0.8.0.dev"
regex = '''
(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<channel>dev))?
'''

[tool.tbump.git]
Expand All @@ -79,7 +14,7 @@ cmd = "grep -q {new_version} CHANGELOG.md"

[[tool.tbump.file]]
src = "nbgrader/_version.py"
version_template = '({major}, {minor}, {patch})'
version_template = '({major}, {minor}, {patch}, "{channel}")'

[[tool.tbump.file]]
src = "pyproject.toml"
Expand All @@ -96,3 +31,7 @@ src = "nbgrader/nbextensions/course_list/main.js"

[[tool.tbump.file]]
src = "nbgrader/nbextensions/validate_assignment/main.js"

[[tool.tbump.field]]
name = "channel"
default = ""
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ install_requires =
qtconsole>=5.2
ipywidgets>=7.6
nbclient>=0.6.1
traitlets<5.2.0

[options.extras_require]
docs =
Expand Down

0 comments on commit 35ed7aa

Please sign in to comment.