From 35ed7aae9a72a4a7f2e4d9117eb8f0ae6bac6411 Mon Sep 17 00:00:00 2001 From: Nicolas Brichet Date: Thu, 12 May 2022 09:56:54 +0200 Subject: [PATCH] (1) switch to 0.8.0.dev version, (2) remove duplicate information in pyproject.toml file, (3) add github workflow to upload artifact and (4) fix traitlets dependency (version 5.2.0 breaks tests) --- .github/workflows/check-release.yml | 5 ++ nbgrader/_version.py | 4 +- nbgrader/nbextensions/assignment_list/main.js | 2 +- nbgrader/nbextensions/course_list/main.js | 2 +- .../nbextensions/validate_assignment/main.js | 2 +- package.json | 2 +- pyproject.toml | 75 ++----------------- setup.cfg | 1 + 8 files changed, 19 insertions(+), 74 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 26d4e5e3b..c56fd49e8 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -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 \ No newline at end of file diff --git a/nbgrader/_version.py b/nbgrader/_version.py index cd4fcb032..b81563384 100644 --- a/nbgrader/_version.py +++ b/nbgrader/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 8, 0) -__version__ = '.'.join(map(str, version_info)) \ No newline at end of file +version_info = (0, 8, 0, "dev") +__version__ = '.'.join(map(str, version_info)) diff --git a/nbgrader/nbextensions/assignment_list/main.js b/nbgrader/nbextensions/assignment_list/main.js index 27d437d09..74792a644 100644 --- a/nbgrader/nbextensions/assignment_list/main.js +++ b/nbgrader/nbextensions/assignment_list/main.js @@ -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 diff --git a/nbgrader/nbextensions/course_list/main.js b/nbgrader/nbextensions/course_list/main.js index 10f45054c..9ec043713 100644 --- a/nbgrader/nbextensions/course_list/main.js +++ b/nbgrader/nbextensions/course_list/main.js @@ -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 diff --git a/nbgrader/nbextensions/validate_assignment/main.js b/nbgrader/nbextensions/validate_assignment/main.js index b4c27eaaf..836ab19dc 100644 --- a/nbgrader/nbextensions/validate_assignment/main.js +++ b/nbgrader/nbextensions/validate_assignment/main.js @@ -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 diff --git a/package.json b/package.json index c708fa8b0..fe8a21153 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/pyproject.toml b/pyproject.toml index 5d657457f..d2c9417df 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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\d+)\.(?P\d+)\.(?P\d+) + (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?Pdev))? ''' [tool.tbump.git] @@ -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" @@ -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 = "" diff --git a/setup.cfg b/setup.cfg index cc841434d..9de68fed7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -41,6 +41,7 @@ install_requires = qtconsole>=5.2 ipywidgets>=7.6 nbclient>=0.6.1 + traitlets<5.2.0 [options.extras_require] docs =