Skip to content

Commit

Permalink
Merge branch 'release/0.06'
Browse files Browse the repository at this point in the history
  • Loading branch information
hfaran committed Dec 28, 2013
2 parents d9e1771 + 25687f3 commit 736fe3a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
3 changes: 0 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
MySQL-python>=1.2.4
tornado>=3.1.1
dataset>=0.3.14
torndb>=0.1
jsonschema>=2.3.0
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import os
import sys
# Temporary patch for issue reported here:
# https://groups.google.com/forum/#!topic/nose-users/fnJ-kAUbYHQ
import multiprocessing # TODO: Remove when Travis-CI updates 2.7 to 2.7.4+
__DIR__ = os.path.abspath(os.path.dirname(__file__))
import codecs
from setuptools import setup
Expand Down
2 changes: 1 addition & 1 deletion tornado_json/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# Alternatively, just put the version in a text file or something to avoid
# this.

__version__ = '0.05'
__version__ = '0.06'
13 changes: 11 additions & 2 deletions tornado_json/db.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
import torndb
import dataset
try:
import torndb
import dataset
except ImportError as e:
print (
"Install `torndb` and `dataset` packages from pip to use the"
" tornado_json.db module. These modules are not listed as dependencies"
" during installation as this module is considered non-essential to"
" Tornado-JSON as a whole."
)
raise e


class MySQLConnection(object):
Expand Down

0 comments on commit 736fe3a

Please sign in to comment.