Merge with master:bee19dc

Author: Ludvig Kihlman

.travis.yml

@@ -1,8 +1,8 @@
 language: python
 python:
-  - 3.5
   - 3.6
   - 3.7
+  - 3.8
   - nightly
 env:
   global:
@@ -13,22 +13,28 @@ env:
     - GROUP=python
 matrix:
   exclude:
-  - python: 3.5
-    env: GROUP=docs
-  - python: 3.6
-    env: GROUP=docs
-  - python: nightly
-    env: GROUP=docs
-  - python: 3.5
-    env: GROUP=nbextensions
-  - python: 3.6
-    env: GROUP=nbextensions
-  - python: nightly
-    env: GROUP=nbextensions
+    - python: 3.6
+      env: GROUP=docs
+    - python: 3.7
+      env: GROUP=docs
+    - python: 3.8
+      env: GROUP=docs
+    - python: nightly
+      env: GROUP=docs
+    - python: 3.6
+      env: GROUP=nbextensions
+    - python: 3.7
+      env: GROUP=nbextensions
+    - python: 3.8
+      env: GROUP=nbextensions
+    - python: nightly
+      env: GROUP=nbextensions
+  allow_failures:
+    - python: nightly
 addons:
   apt:
     packages:
-    - pandoc
+      - pandoc
   firefox: latest
 before_install:
   - pip install -U pip wheel setuptools

azure-pipelines.yml

@@ -24,6 +24,12 @@ strategy:
     Python37Extensions:
       python.version: '3.7'
       testgroup: 'nbextensions'
+    Python38:
+      python.version: '3.8'
+      testgroup: 'python'
+    Python38Extensions:
+      python.version: '3.8'
+      testgroup: 'nbextensions'   
 
 steps:
 - script: |

dev-requirements.txt

@@ -2,7 +2,7 @@ pytest>=4.5
 pytest-cov
 pytest-rerunfailures
 pytest-xdist
-pytest-mypy==0.4.2
+#pytest-mypy
 coverage
 selenium
 sphinx
@@ -11,3 +11,5 @@ sphinx-autodoc-typehints
 codecov
 nbval
 requests-mock
+wheel
+

nbgrader/apps/collectapp.py

@@ -20,6 +20,10 @@
         {'ExchangeCollect' : {'update': True}},
         "Update existing submissions with ones that have newer timestamps."
     ),
+    'before-duedate': (
+        {'ExchangeCollect' : {'before_duedate': True}},
+        "Collect the last submission before due date or the last submission if no submission before due date."
+    ),
 })
 
 class CollectApp(NbGrader):

nbgrader/converters/base.py

@@ -5,6 +5,7 @@
 import sqlalchemy
 import traceback
 
+from rapidfuzz import fuzz
 from traitlets.config import LoggingConfigurable, Config
 from traitlets import Bool, List, Dict, Integer, Instance, Type
 from traitlets import default
@@ -120,11 +121,6 @@ def init_notebooks(self) -> None:
             assignment_glob2 = self._format_source("*", self.coursedir.student_id)
             found = glob.glob(assignment_glob2)
             if found:
-                # Normally it is a bad idea to put imports in the middle of
-                # a function, but we do this here because otherwise fuzzywuzzy
-                # prints an annoying message about python-Levenshtein every
-                # time nbgrader is run.
-                from fuzzywuzzy import fuzz
                 scores = sorted([(fuzz.ratio(assignment_glob, x), x) for x in found])
                 self.log.error("Did you mean: %s", scores[-1][1])
 

nbgrader/exchange/abc/collect.py

@@ -10,6 +10,11 @@ class ExchangeCollect(Exchange):
         help="Update existing submissions with ones that have newer timestamps."
     ).tag(config=True)
 
+    before_duedate = Bool(
+        False,
+        help="Collect the last submission before due date or the last submission if no submission before due date."
+    ).tag(config=True)
+
     check_owner = Bool(
         default_value=True,
         help="Whether to cross-check the student_id with the UNIX-owner of the submitted directory."

nbgrader/exchange/default/collect.py

@@ -4,11 +4,14 @@
 import sys
 from collections import defaultdict
 from textwrap import dedent
+import datetime
 
 from nbgrader.exchange.abc import ExchangeCollect as ABCExchangeCollect
 from .exchange import Exchange
 
 from nbgrader.utils import check_mode, parse_utc
+from ...api import Gradebook, MissingEntry
+from ...utils import check_mode, parse_utc
 
 # pwd is for matching unix names with student ide, so we shouldn't import it on
 # windows machines
@@ -54,7 +57,24 @@ def init_src(self):
         pattern = os.path.join(self.inbound_path, '{}+{}+*'.format(student_id, self.coursedir.assignment_id))
         records = [self._path_to_record(f) for f in glob.glob(pattern)]
         usergroups = groupby(records, lambda item: item['username'])
-        self.src_records = [self._sort_by_timestamp(v)[0] for v in usergroups.values()]
+
+        with Gradebook(self.coursedir.db_url, self.coursedir.course_id) as gb:
+            try:
+                assignment = gb.find_assignment(self.coursedir.assignment_id)
+                self.duedate = assignment.duedate
+            except MissingEntry:
+                self.duedate = None
+        if self.duedate is None or not self.before_duedate:
+            self.src_records = [self._sort_by_timestamp(v)[0] for v in usergroups.values()]
+        else:
+            self.src_records = []
+            for v in usergroups.values():
+                records = self._sort_by_timestamp(v)
+                records_before_duedate = [record for record in records if record['timestamp'] <= self.duedate]
+                if records_before_duedate:
+                    self.src_records.append(records_before_duedate[0])
+                else:
+                    self.src_records.append(records[0])
 
     def init_dest(self):
         pass
@@ -99,6 +119,10 @@ def copy_files(self):
                 if self.update and (existing_timestamp is None or new_timestamp > existing_timestamp):
                     copy = True
                     updating = True
+                elif self.before_duedate and existing_timestamp != new_timestamp:
+                    copy = True
+                    updating = True
+
             else:
                 copy = True
 

nbgrader/exchange/default/exchange.py

@@ -6,6 +6,8 @@
 
 from textwrap import dedent
 
+
+from rapidfuzz import fuzz
 from traitlets import Unicode, Bool, default
 from jupyter_core.paths import jupyter_data_dir
 
@@ -117,11 +119,6 @@ def _assignment_not_found(self, src_path, other_path):
         self.log.fatal(msg)
         found = glob.glob(other_path)
         if found:
-            # Normally it is a bad idea to put imports in the middle of
-            # a function, but we do this here because otherwise fuzzywuzzy
-            # prints an annoying message about python-Levenshtein every
-            # time nbgrader is run.
-            from fuzzywuzzy import fuzz
             scores = sorted([(fuzz.ratio(self.src_path, x), x) for x in found])
             self.log.error("Did you mean: %s", scores[-1][1])
 

nbgrader/exchange/default/fetch_assignment.py

@@ -14,11 +14,11 @@ def _load_config(self, cfg, **kwargs):
                 "Use ExchangeFetchAssignment in config, not ExchangeFetch. Outdated config:\n%s",
                 '\n'.join(
                     'ExchangeFetch.{key} = {value!r}'.format(key=key, value=value)
-                    for key, value in cfg.ExchangeFetchAssignment.items()
+                    for key, value in cfg.ExchangeFetch.items()
                 )
             )
             cfg.ExchangeFetchAssignment.merge(cfg.ExchangeFetch)
-            del cfg.ExchangeFetchAssignment
+            del cfg.ExchangeFetch
 
         super(ExchangeFetchAssignment, self)._load_config(cfg, **kwargs)
 

nbgrader/tests/apps/test_nbgrader_collect.py

@@ -1,3 +1,4 @@
+import datetime
 import os
 import time
 import pytest
@@ -7,6 +8,7 @@
 from .. import run_nbgrader
 from .base import BaseTestApp
 from .conftest import notwindows
+from ...api import Gradebook
 from ...utils import parse_utc, get_username
 
 
@@ -151,3 +153,45 @@ def test_permissions(self, exchange, course_dir, cache, groupshared):
         assert self._get_permissions(join(exchange, "abc101", "inbound")) == ("2733" if not groupshared else "2773")
         assert self._get_permissions(join(course_dir, "submitted", "foobar_student", "ps1")) == ("777" if not groupshared else "2777")
         assert self._get_permissions(join(course_dir, "submitted", "foobar_student", "ps1", "p1.ipynb")) == ("644" if not groupshared else "664")
+
+    @pytest.mark.parametrize('before_duedate',
+                              ['yes', 'no', 'nofirst'])
+    def test_collect_before_due_date(self, exchange, course_dir, cache, db, before_duedate):
+        """Test --before-duedate flag.
+
+        Test is parameterized so we test both with it and without the flag.
+
+        'yes': test with --before-duedate
+        'no': test without
+        'nofirst': test with --before-duedate but no assignment before duedate
+
+        """
+        # Release assignment
+        self._release_and_fetch("ps1", exchange, course_dir)
+
+        # Submit something, wait, submit again.  Due date is between.
+        if before_duedate != 'nofirst':
+            # We don't submit first assignment.
+            self._submit("ps1", exchange, cache)
+            time.sleep(.05)
+        time_duedate = datetime.datetime.utcnow()
+        time.sleep(.05)
+        self._submit("ps1", exchange, cache)
+
+        # Set the due date
+        with Gradebook(db) as gb:
+            gb.update_or_create_assignment('ps1', duedate=time_duedate)
+
+        # Collect
+        flags = ['--db', db]
+        if before_duedate != 'no':
+            flags.append('--before-duedate')
+        self._collect("ps1", exchange, flags=flags)
+
+        root = os.path.os.path.join(os.path.join(course_dir, "submitted", get_username(), "ps1"))
+        timestamp = self._read_timestamp(root)
+        # Test both ways: with --before-duedate flag and without
+        if before_duedate == 'yes':
+            assert timestamp < time_duedate
+        else: # 'no', 'nofirst'
+            assert timestamp > time_duedate