Skip to content

Commit

Permalink
Merge pull request #759 from jhamrick/fix-nbextension-tests
Browse files Browse the repository at this point in the history
Fix nbextension tests
  • Loading branch information
jhamrick committed May 31, 2017
2 parents 502bd69 + 253872b commit 71d318c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: python
sudo: false
python:
- 2.7
- 3.4
- 3.5
- 3.6
env:
Expand Down
8 changes: 0 additions & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,10 @@ environment:
PYTHON_VERSION: "2.7"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python34-x64"
PYTHON_VERSION: "3.4"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python35-x64"
PYTHON_VERSION: "3.5"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"

install:
# If there is a newer build queued for the same PR, cancel this one. The
# AppVeyor 'rollout builds' option is supposed to serve the same purpose but
Expand Down
2 changes: 1 addition & 1 deletion nbgrader/exchange/exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Exchange(LoggingConfigurable):
).tag(config=True)

timestamp_format = Unicode(
"%Y-%m-%d %H:%M:%S %Z",
"%Y-%m-%d %H:%M:%S.%f %Z",
help="Format string for timestamps"
).tag(config=True)

Expand Down

0 comments on commit 71d318c

Please sign in to comment.