Skip to content

Commit

Permalink
Merge b1054c5 into 47f42c8
Browse files Browse the repository at this point in the history
  • Loading branch information
SamiHiltunen committed Oct 1, 2015
2 parents 47f42c8 + b1054c5 commit da9da6b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -52,7 +52,6 @@ before_install:
- "cp .travis.invenio.cfg ${VIRTUAL_ENV}/var/invenio.base-instance/invenio.cfg"

install:
- "travis_retry pip install -e git+https://github.com/inveniosoftware/invenio#egg=invenio"
- "travis_retry pip install -r .travis-$REQUIREMENTS-requirements.txt --allow-all-external"
- "travis_retry pip install -e .[$REXTRAS]"

Expand Down
1 change: 1 addition & 0 deletions requirements-devel.txt
Expand Up @@ -24,3 +24,4 @@

-e git+git://github.com/inveniosoftware/invenio-base.git#egg=invenio-base
-e git+git://github.com/inveniosoftware/invenio-ext.git#egg=invenio-ext
-e git+git://github.com/inveniosoftware/invenio-testing.git#egg=invenio-testing
4 changes: 3 additions & 1 deletion setup.py
Expand Up @@ -36,8 +36,9 @@
requirements = [
'Flask>=0.10.1',
'celery>=3.1.8',
'invenio-base>=0.2.1',
'invenio-base>=0.3.0',
'invenio-ext>=0.1.0',
'msgpack-python>=0.3',
'six>=1.7.2',
]

Expand All @@ -48,6 +49,7 @@
'pytest-cov>=2.1.0',
'pytest-pep8>=1.0.6',
'coverage>=4.0.0',
'invenio-testing>=0.1.1',
]


Expand Down
5 changes: 3 additions & 2 deletions tests/helpers.py
Expand Up @@ -23,12 +23,13 @@

from celery import Celery

from invenio.testsuite import InvenioTestCase

from invenio_celery import InvenioLoader

from invenio_testing import InvenioTestCase


class CeleryTestCase(InvenioTestCase):

def create_celery_app(self):
# Execute tasks synchronously
self.app.config['CELERY_ALWAYS_EAGER'] = True
Expand Down

0 comments on commit da9da6b

Please sign in to comment.