Skip to content

Commit

Permalink
Changed requirements file.
Browse files Browse the repository at this point in the history
  • Loading branch information
alekzvik committed May 20, 2012
1 parent 8c6035c commit aac4e0c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 18 deletions.
9 changes: 2 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
Flask==0.8
Flask-SQLAlchemy==0.16
Flask-Testing==0.3
Jinja2==2.6
SQLAlchemy==0.7.7
Werkzeug==0.8.3
Whoosh==2.4.0
blinker==1.2
distribute==0.6.24
simplejson==2.5.2
twill==0.9
wsgiref==0.1.2


3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
install_requires=[x.strip() for x in
open(os.path.join(os.path.dirname(__file__),
'requirements.txt')).xreadlines()],
tests_require=['Flask-Testing'],

classifiers=[
'Environment :: Web Environment',
Expand All @@ -36,5 +37,5 @@
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Software Development :: Libraries :: Python Modules'
],
test_suite = 'test.test_all',
test_suite='test.test_all',
)
15 changes: 7 additions & 8 deletions test/test_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from __future__ import absolute_import

from flask import Flask
from flask_sqlalchemy import SQLAlchemy
from flaskext.testing import TestCase
import flask_whooshalchemy
from flask.ext.sqlalchemy import SQLAlchemy
from flask.ext.testing import TestCase
import flask.ext.whooshalchemy

import datetime
import os
Expand Down Expand Up @@ -46,18 +46,17 @@ class ObjectA(db.Model, BlogishBlob):

class ObjectB(db.Model, BlogishBlob):
__tablename__ = 'objectB'
__searchable__ = ['title', 'content', 'content'] # dup intentional
__searchable__ = ['title', 'content', 'content'] # dup intentional


class ObjectC(db.Model, BlogishBlob):
__tablename__ = 'objectC'
__searchable__ = ['title', 'field_that_doesnt_exist']



class Tests(TestCase):
DATABASE_URL='sqlite://'
TESTING=True
DATABASE_URL = 'sqlite://'
TESTING = True

def create_app(self):
tmp_dir = tempfile.mkdtemp()
Expand All @@ -76,7 +75,7 @@ def tearDown(self):
try:
shutil.rmtree(self.app.config['WHOOSH_BASE'])
except OSError, e:
if e.errno != 2: # code 2 - no such file or directory
if e.errno != 2: # code 2 - no such file or directory
raise

db.session.remove()
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ envlist = py25,py26,py27,pypy

[testenv]
deps=
nose
; nose
; Flask-SQLAlchemy
; Flask-Testing
; SQLAlchemy
; Werkzeug
; Whoosh
commands=nosetests
commands=python setup.py test

0 comments on commit aac4e0c

Please sign in to comment.