Make flake8 part of test suite

This commit is contained in:
Stefan Wehrmeyer 2014-01-25 21:45:30 +01:00
parent 6292bda8aa
commit 92817d5f4d
11 changed files with 28 additions and 39 deletions

View File

@ -6,3 +6,4 @@ python:
- '2.6'
script:
- python setup.py test
- flake8 --ignore=E501,E123,E124,E126,E127,E128 dataset test

View File

@ -8,7 +8,6 @@ from dataset.persistence.util import sqlite_datetime_fix
from dataset.persistence.database import Database
from dataset.persistence.table import Table
from dataset.freeze.app import freeze
from sqlalchemy import Integer, Text
__all__ = ['Database', 'Table', 'freeze', 'connect']

View File

@ -86,4 +86,3 @@ class Export(object):
@property
def name(self):
return self.get('name', self.get('query'))

View File

@ -1,5 +1,4 @@
import os
import logging
import re
import locale
@ -69,8 +68,7 @@ class Serializer(object):
@property
def wrap(self):
return self.export.get_bool('wrap',
default=self.mode=='list')
return self.export.get_bool('wrap', default=self.mode == 'list')
def serialize(self):
self.init()

View File

@ -21,4 +21,3 @@ class TabsonSerializer(JSONSerializer):
if meta is not None:
result['meta'] = meta
return result

View File

@ -11,9 +11,9 @@ except ImportError:
from sqlalchemy import create_engine
from sqlalchemy.pool import NullPool
from sqlalchemy.schema import MetaData, Column, Index
from sqlalchemy.schema import MetaData, Column
from sqlalchemy.schema import Table as SQLATable
from sqlalchemy import Integer, Text, String
from sqlalchemy import Integer, String
from alembic.migration import MigrationContext
from alembic.operations import Operations
@ -107,10 +107,8 @@ class Database(object):
@property
def tables(self):
""" Get a listing of all tables that exist in the database.
>>> print db.tables
set([u'user', u'action'])
"""
Get a listing of all tables that exist in the database.
"""
return list(
set(self.metadata.tables.keys()) | set(self._tables.keys())

View File

@ -24,9 +24,6 @@ class Table(object):
def columns(self):
"""
Get a listing of all columns that exist in the table.
>>> print 'age' in table.columns
True
"""
return set(self.table.columns.keys())
@ -101,7 +98,6 @@ class Table(object):
if chunk:
_process_chunk(chunk)
def update(self, row, keys, ensure=True, types={}):
"""
Update a row in the table. The update is managed via

View File

@ -1,12 +1,12 @@
#coding: utf-8
import re
from unicodedata import normalize as ucnorm, category
SLUG_REMOVE = re.compile(r'[,\s\.\(\)/\\;:]*')
class DatasetException(Exception):
pass
class FreezeException(DatasetException):
pass

View File

@ -35,7 +35,7 @@ setup(
'python-slugify >= 0.0.6',
"PyYAML >= 3.10"
] + py26_dependency,
tests_require=[],
tests_require=['flake8'],
test_suite='test',
entry_points={
'console_scripts': [

View File

@ -8,7 +8,6 @@ from dataset import connect
from dataset.util import DatasetException
from .sample_data import TEST_DATA, TEST_CITY_1
from sqlalchemy.exc import IntegrityError
class DatabaseTestCase(unittest.TestCase):