From 9b97797292236ae690916d997de5dc36f52e0867 Mon Sep 17 00:00:00 2001 From: "Jessica B. Hamrick" Date: Thu, 24 Aug 2017 12:26:33 -0400 Subject: [PATCH 1/3] Bump version --- nbgrader/_version.py | 2 +- nbgrader/nbextensions/assignment_list/main.js | 2 +- nbgrader/nbextensions/validate_assignment/main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nbgrader/_version.py b/nbgrader/_version.py index 113daa116..270f5d7aa 100644 --- a/nbgrader/_version.py +++ b/nbgrader/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 5, 3, 'dev') +version_info = (0, 5, 3) __version__ = '.'.join(map(str, version_info)) \ No newline at end of file diff --git a/nbgrader/nbextensions/assignment_list/main.js b/nbgrader/nbextensions/assignment_list/main.js index ac12c82cb..6aecb9b5e 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.5.3.dev"; + var nbgrader_version = "0.5.3"; 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 236a8140f..173f3d87c 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.5.3.dev"; + var nbgrader_version = "0.5.3"; var ajax = utils.ajax || $.ajax; // Notebook v4.3.1 enabled xsrf so use notebooks ajax that includes the From 49b965840f637a273921deed9def96f4c9544313 Mon Sep 17 00:00:00 2001 From: "Jessica B. Hamrick" Date: Thu, 24 Aug 2017 12:37:04 -0400 Subject: [PATCH 2/3] Update changelog --- nbgrader/docs/source/changelog.rst | 19 +++++++++++++++++++ nbgrader/docs/source/spelling_wordlist.txt | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/nbgrader/docs/source/changelog.rst b/nbgrader/docs/source/changelog.rst index d339bc2de..e0e9dcb92 100644 --- a/nbgrader/docs/source/changelog.rst +++ b/nbgrader/docs/source/changelog.rst @@ -8,6 +8,25 @@ A summary of changes to nbgrader. 0.5.x ----- +0.5.3 +~~~~~ + +nbgrader version 0.5.3 is a bugfix release, with the following PRs merged: + +- PR #868: Fix travis to work with trusty +- PR #867: Change to the root of the course directory before running nbgrader converters +- PR #866: Set nbgrader url prefix to be relative to notebook_dir +- PR #865: Produce warnings if the exchange isn't set up correctly +- PR #864: Fix link to jupyterhub docs +- PR #861: fix the html to ipynb in docs + +Thanks to the following users who submitted PRs or reported issues that were fixed for the 0.5.3 release: + +- jhamrick +- misolietavec +- mpacer +- rdpratti + 0.5.2 ~~~~~ diff --git a/nbgrader/docs/source/spelling_wordlist.txt b/nbgrader/docs/source/spelling_wordlist.txt index ab6f8654f..032c16b74 100644 --- a/nbgrader/docs/source/spelling_wordlist.txt +++ b/nbgrader/docs/source/spelling_wordlist.txt @@ -52,6 +52,7 @@ delimeters dementrock deprecations dev +dir dirs dlsun doesn @@ -140,6 +141,8 @@ matplotlib metadata mikebolt minrk +misolietavec +mpacer multi namespace nbconvert @@ -173,6 +176,7 @@ programmatically ps py quickstart +rdpratti readonly readthedocs redSlug From 29f6ac5a4560aaf26ff16910a25cd670a63d60cc Mon Sep 17 00:00:00 2001 From: "Jessica B. Hamrick" Date: Thu, 24 Aug 2017 12:37:18 -0400 Subject: [PATCH 3/3] Rerun docs --- .../managing_assignment_files.ipynb | 40 ++++++++--------- .../managing_assignment_files_manually.ipynb | 44 +++++++++---------- .../user_guide/managing_the_database.ipynb | 4 +- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/nbgrader/docs/source/user_guide/managing_assignment_files.ipynb b/nbgrader/docs/source/user_guide/managing_assignment_files.ipynb index ebbabf4b5..06f61463a 100644 --- a/nbgrader/docs/source/user_guide/managing_assignment_files.ipynb +++ b/nbgrader/docs/source/user_guide/managing_assignment_files.ipynb @@ -415,9 +415,9 @@ "output_type": "stream", "text": [ "total 40\n", - "-rw-r--r-- 1 jhamrick wheel 5733 Jul 20 12:49 jupyter.png\n", - "-rw-r--r-- 1 jhamrick wheel 7884 Jul 20 12:49 problem1.ipynb\n", - "-rw-r--r-- 1 jhamrick wheel 2258 Jul 20 12:49 problem2.ipynb\n" + "-rw-r--r-- 1 jhamrick wheel 5733 Aug 24 12:27 jupyter.png\n", + "-rw-r--r-- 1 jhamrick wheel 7884 Aug 24 12:27 problem1.ipynb\n", + "-rw-r--r-- 1 jhamrick wheel 2258 Aug 24 12:27 problem2.ipynb\n" ] } ], @@ -585,8 +585,8 @@ "output_type": "stream", "text": [ "[SubmitApp | INFO] Source: /private/tmp/student_home/ps1\n", - "[SubmitApp | INFO] Destination: /tmp/exchange/example_course/inbound/jhamrick+ps1+2017-07-20 16:49:59.860656 UTC\n", - "[SubmitApp | INFO] Submitted as: example_course ps1 2017-07-20 16:49:59.860656 UTC\n" + "[SubmitApp | INFO] Destination: /tmp/exchange/example_course/inbound/jhamrick+ps1+2017-08-24 16:27:58.538803 UTC\n", + "[SubmitApp | INFO] Submitted as: example_course ps1 2017-08-24 16:27:58.538803 UTC\n" ] } ], @@ -614,9 +614,9 @@ "output_type": "stream", "text": [ "total 8\n", - "drwxr-xr-x 3 jhamrick wheel 102 Jul 20 12:49 Library\n", - "-rw-r--r-- 1 jhamrick wheel 91 Jul 20 12:49 nbgrader_config.py\n", - "drwxr-xr-x 5 jhamrick wheel 170 Jul 20 12:49 ps1\n" + "drwxr-xr-x 3 jhamrick wheel 102 Aug 24 12:27 Library\n", + "-rw-r--r-- 1 jhamrick wheel 91 Aug 24 12:27 nbgrader_config.py\n", + "drwxr-xr-x 5 jhamrick wheel 170 Aug 24 12:27 ps1\n" ] } ], @@ -644,7 +644,7 @@ "output_type": "stream", "text": [ "[ListApp | INFO] Submitted assignments:\n", - "[ListApp | INFO] example_course jhamrick ps1 2017-07-20 16:49:59.860656 UTC\n" + "[ListApp | INFO] example_course jhamrick ps1 2017-08-24 16:27:58.538803 UTC\n" ] } ], @@ -672,8 +672,8 @@ "output_type": "stream", "text": [ "[SubmitApp | INFO] Source: /private/tmp/student_home/ps1\n", - "[SubmitApp | INFO] Destination: /tmp/exchange/example_course/inbound/jhamrick+ps1+2017-07-20 16:50:04.440193 UTC\n", - "[SubmitApp | INFO] Submitted as: example_course ps1 2017-07-20 16:50:04.440193 UTC\n" + "[SubmitApp | INFO] Destination: /tmp/exchange/example_course/inbound/jhamrick+ps1+2017-08-24 16:28:01.658960 UTC\n", + "[SubmitApp | INFO] Submitted as: example_course ps1 2017-08-24 16:28:01.658960 UTC\n" ] } ], @@ -701,8 +701,8 @@ "output_type": "stream", "text": [ "[ListApp | INFO] Submitted assignments:\n", - "[ListApp | INFO] example_course jhamrick ps1 2017-07-20 16:49:59.860656 UTC\n", - "[ListApp | INFO] example_course jhamrick ps1 2017-07-20 16:50:04.440193 UTC\n" + "[ListApp | INFO] example_course jhamrick ps1 2017-08-24 16:27:58.538803 UTC\n", + "[ListApp | INFO] example_course jhamrick ps1 2017-08-24 16:28:01.658960 UTC\n" ] } ], @@ -737,7 +737,7 @@ "output_type": "stream", "text": [ "[SubmitApp | INFO] Source: /private/tmp/student_home/ps1\n", - "[SubmitApp | INFO] Destination: /tmp/exchange/example_course/inbound/jhamrick+ps1+2017-07-20 16:50:08.284396 UTC\n", + "[SubmitApp | INFO] Destination: /tmp/exchange/example_course/inbound/jhamrick+ps1+2017-08-24 16:28:04.815889 UTC\n", "[SubmitApp | WARNING] Possible missing notebooks and/or extra notebooks submitted for assignment ps1:\n", " Expected:\n", " \tproblem1.ipynb: MISSING\n", @@ -745,7 +745,7 @@ " Submitted:\n", " \tmyproblem1.ipynb: EXTRA\n", " \tproblem2.ipynb: OK\n", - "[SubmitApp | INFO] Submitted as: example_course ps1 2017-07-20 16:50:08.284396 UTC\n" + "[SubmitApp | INFO] Submitted as: example_course ps1 2017-08-24 16:28:04.815889 UTC\n" ] } ], @@ -805,7 +805,7 @@ "output_type": "stream", "text": [ "[SubmitApp | INFO] Source: /private/tmp/student_home/ps1\n", - "[SubmitApp | INFO] Destination: /tmp/exchange/example_course/inbound/jhamrick+ps1+2017-07-20 16:50:09.859381 UTC\n", + "[SubmitApp | INFO] Destination: /tmp/exchange/example_course/inbound/jhamrick+ps1+2017-08-24 16:28:06.408245 UTC\n", "[SubmitApp | CRITICAL] Assignment ps1 not submitted. There are missing notebooks for the submission:\n", " Expected:\n", " \tproblem1.ipynb: MISSING\n", @@ -931,9 +931,9 @@ "output_type": "stream", "text": [ "[ListApp | INFO] Submitted assignments:\n", - "[ListApp | INFO] example_course jhamrick ps1 2017-07-20 16:49:59.860656 UTC\n", - "[ListApp | INFO] example_course jhamrick ps1 2017-07-20 16:50:04.440193 UTC\n", - "[ListApp | INFO] example_course jhamrick ps1 2017-07-20 16:50:08.284396 UTC\n" + "[ListApp | INFO] example_course jhamrick ps1 2017-08-24 16:27:58.538803 UTC\n", + "[ListApp | INFO] example_course jhamrick ps1 2017-08-24 16:28:01.658960 UTC\n", + "[ListApp | INFO] example_course jhamrick ps1 2017-08-24 16:28:04.815889 UTC\n" ] } ], @@ -989,7 +989,7 @@ "total 0\n", "drwxr-xr-x 3 jhamrick staff 102 May 31 14:10 bitdiddle\n", "drwxr-xr-x 3 jhamrick staff 102 May 31 14:10 hacker\n", - "drwxr-xr-x 3 jhamrick staff 102 Jul 20 12:50 jhamrick\n" + "drwxr-xr-x 3 jhamrick staff 102 Aug 24 12:28 jhamrick\n" ] } ], diff --git a/nbgrader/docs/source/user_guide/managing_assignment_files_manually.ipynb b/nbgrader/docs/source/user_guide/managing_assignment_files_manually.ipynb index 10b999885..dc8cf0540 100644 --- a/nbgrader/docs/source/user_guide/managing_assignment_files_manually.ipynb +++ b/nbgrader/docs/source/user_guide/managing_assignment_files_manually.ipynb @@ -181,7 +181,7 @@ "text": [ "total 64\n", "-rw-r--r-- 1 jhamrick staff 18022 May 31 14:30 notebooks.zip\n", - "-rw-r--r-- 1 jhamrick staff 8628 Jul 20 12:49 ps1_hacker_attempt_2016-01-30-20-30-10_problem1.ipynb\n" + "-rw-r--r-- 1 jhamrick staff 8628 Aug 24 12:27 ps1_hacker_attempt_2016-01-30-20-30-10_problem1.ipynb\n" ] } ], @@ -260,7 +260,7 @@ "text": [ "total 64\n", "-rw-r--r-- 1 jhamrick staff 18022 May 31 14:30 notebooks.zip\n", - "-rw-r--r-- 1 jhamrick staff 8628 Jul 20 12:49 ps1_hacker_attempt_2016-01-30-20-30-10_problem1.ipynb\n" + "-rw-r--r-- 1 jhamrick staff 8628 Aug 24 12:27 ps1_hacker_attempt_2016-01-30-20-30-10_problem1.ipynb\n" ] } ], @@ -372,18 +372,18 @@ "[ZipCollectApp | INFO] Parsing file: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/downloaded/ps1/extracted/ps1_hacker_attempt_2016-01-30-20-30-10_problem1.ipynb\n", "[ZipCollectApp | WARNING] 4 files collected, 3 files skipped\n", "[ZipCollectApp | INFO] Start transfering files...\n", - "[ZipCollectApp | WARNING] Directory not found. Creating: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/hacker/ps1\n", - "[ZipCollectApp | INFO] Copying from: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/downloaded/ps1/extracted/notebooks/ps1_hacker_attempt_2016-01-30-16-30-10_problem2.ipynb\n", - "[ZipCollectApp | INFO] Copying to: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/hacker/ps1/problem2.ipynb\n", - "[ZipCollectApp | INFO] Copying from: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/downloaded/ps1/extracted/ps1_hacker_attempt_2016-01-30-20-30-10_problem1.ipynb\n", - "[ZipCollectApp | INFO] Copying to: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/hacker/ps1/problem1.ipynb\n", - "[ZipCollectApp | INFO] Creating timestamp: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/hacker/ps1/timestamp.txt\n", "[ZipCollectApp | WARNING] Directory not found. Creating: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/bitdiddle/ps1\n", "[ZipCollectApp | INFO] Copying from: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/downloaded/ps1/extracted/notebooks/ps1_bitdiddle_attempt_2016-01-30-15-30-10_problem1.ipynb\n", "[ZipCollectApp | INFO] Copying to: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/bitdiddle/ps1/problem1.ipynb\n", "[ZipCollectApp | INFO] Copying from: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/downloaded/ps1/extracted/notebooks/ps1_bitdiddle_attempt_2016-01-30-15-30-10_problem2.ipynb\n", "[ZipCollectApp | INFO] Copying to: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/bitdiddle/ps1/problem2.ipynb\n", - "[ZipCollectApp | INFO] Creating timestamp: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/bitdiddle/ps1/timestamp.txt\n" + "[ZipCollectApp | INFO] Creating timestamp: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/bitdiddle/ps1/timestamp.txt\n", + "[ZipCollectApp | WARNING] Directory not found. Creating: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/hacker/ps1\n", + "[ZipCollectApp | INFO] Copying from: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/downloaded/ps1/extracted/notebooks/ps1_hacker_attempt_2016-01-30-16-30-10_problem2.ipynb\n", + "[ZipCollectApp | INFO] Copying to: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/hacker/ps1/problem2.ipynb\n", + "[ZipCollectApp | INFO] Copying from: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/downloaded/ps1/extracted/ps1_hacker_attempt_2016-01-30-20-30-10_problem1.ipynb\n", + "[ZipCollectApp | INFO] Copying to: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/hacker/ps1/problem1.ipynb\n", + "[ZipCollectApp | INFO] Creating timestamp: /Users/jhamrick/project/tools/nbgrader/nbgrader/docs/source/user_guide/submitted_zip/hacker/ps1/timestamp.txt\n" ] } ], @@ -410,15 +410,15 @@ "output_type": "stream", "text": [ "total 24\n", - "drwxr-xr-x 8 jhamrick staff 272 Jul 20 12:50 notebooks\n", - "-rw-r--r-- 1 jhamrick staff 8628 Jul 20 12:50 ps1_hacker_attempt_2016-01-30-20-30-10_problem1.ipynb\n", + "drwxr-xr-x 8 jhamrick staff 272 Aug 24 12:28 notebooks\n", + "-rw-r--r-- 1 jhamrick staff 8628 Aug 24 12:28 ps1_hacker_attempt_2016-01-30-20-30-10_problem1.ipynb\n", "total 88\n", - "-rw-rw-r-- 1 jhamrick staff 5733 Jul 20 12:50 ps1_bitdiddle_attempt_2016-01-30-15-30-10_jupyter.png\n", - "-rw-rw-r-- 1 jhamrick staff 7712 Jul 20 12:50 ps1_bitdiddle_attempt_2016-01-30-15-30-10_problem1.ipynb\n", - "-rw-rw-r-- 1 jhamrick staff 2228 Jul 20 12:50 ps1_bitdiddle_attempt_2016-01-30-15-30-10_problem2.ipynb\n", - "-rw-rw-r-- 1 jhamrick staff 5733 Jul 20 12:50 ps1_hacker_attempt_2016-01-30-16-30-10_jupyter.png\n", - "-rw-rw-r-- 1 jhamrick staff 8830 Jul 20 12:50 ps1_hacker_attempt_2016-01-30-16-30-10_myproblem1.ipynb\n", - "-rw-rw-r-- 1 jhamrick staff 2358 Jul 20 12:50 ps1_hacker_attempt_2016-01-30-16-30-10_problem2.ipynb\n" + "-rw-rw-r-- 1 jhamrick staff 5733 Aug 24 12:28 ps1_bitdiddle_attempt_2016-01-30-15-30-10_jupyter.png\n", + "-rw-rw-r-- 1 jhamrick staff 7712 Aug 24 12:28 ps1_bitdiddle_attempt_2016-01-30-15-30-10_problem1.ipynb\n", + "-rw-rw-r-- 1 jhamrick staff 2228 Aug 24 12:28 ps1_bitdiddle_attempt_2016-01-30-15-30-10_problem2.ipynb\n", + "-rw-rw-r-- 1 jhamrick staff 5733 Aug 24 12:28 ps1_hacker_attempt_2016-01-30-16-30-10_jupyter.png\n", + "-rw-rw-r-- 1 jhamrick staff 8830 Aug 24 12:28 ps1_hacker_attempt_2016-01-30-16-30-10_myproblem1.ipynb\n", + "-rw-rw-r-- 1 jhamrick staff 2358 Aug 24 12:28 ps1_hacker_attempt_2016-01-30-16-30-10_problem2.ipynb\n" ] } ], @@ -448,8 +448,8 @@ "output_type": "stream", "text": [ "total 0\n", - "drwxr-xr-x 3 jhamrick staff 102 Jul 20 12:50 bitdiddle\n", - "drwxr-xr-x 3 jhamrick staff 102 Jul 20 12:50 hacker\n" + "drwxr-xr-x 3 jhamrick staff 102 Aug 24 12:28 bitdiddle\n", + "drwxr-xr-x 3 jhamrick staff 102 Aug 24 12:28 hacker\n" ] } ], @@ -469,9 +469,9 @@ "output_type": "stream", "text": [ "total 40\n", - "-rw-r--r-- 1 jhamrick staff 8628 Jul 20 12:50 problem1.ipynb\n", - "-rw-rw-r-- 1 jhamrick staff 2358 Jul 20 12:50 problem2.ipynb\n", - "-rw-r--r-- 1 jhamrick staff 19 Jul 20 12:50 timestamp.txt\n" + "-rw-r--r-- 1 jhamrick staff 8628 Aug 24 12:28 problem1.ipynb\n", + "-rw-rw-r-- 1 jhamrick staff 2358 Aug 24 12:28 problem2.ipynb\n", + "-rw-r--r-- 1 jhamrick staff 19 Aug 24 12:28 timestamp.txt\n" ] } ], diff --git a/nbgrader/docs/source/user_guide/managing_the_database.ipynb b/nbgrader/docs/source/user_guide/managing_the_database.ipynb index 90540f415..034e451b3 100644 --- a/nbgrader/docs/source/user_guide/managing_the_database.ipynb +++ b/nbgrader/docs/source/user_guide/managing_the_database.ipynb @@ -245,8 +245,8 @@ "name": "stderr", "output_type": "stream", "text": [ - "[DbStudentAddApp | INFO] Creating/updating student with ID 'bitdiddle': {'email': None, 'last_name': 'Bitdiddle', 'first_name': 'Ben'}\n", - "[DbStudentAddApp | INFO] Creating/updating student with ID 'hacker': {'last_name': 'Hacker', 'email': None, 'first_name': 'Alyssa'}\n" + "[DbStudentAddApp | INFO] Creating/updating student with ID 'bitdiddle': {'first_name': 'Ben', 'last_name': 'Bitdiddle', 'email': None}\n", + "[DbStudentAddApp | INFO] Creating/updating student with ID 'hacker': {'first_name': 'Alyssa', 'last_name': 'Hacker', 'email': None}\n" ] } ],