diff --git a/attract_server/__init__.py b/attract_server/__init__.py index 183f89d..6b521c9 100644 --- a/attract_server/__init__.py +++ b/attract_server/__init__.py @@ -1,4 +1,4 @@ -from pillar_server.extension import PillarExtension +from pillar.extension import PillarExtension from .modules import blueprint @@ -6,7 +6,7 @@ from .modules import blueprint class AttractExtension(PillarExtension): @property def name(self): - return 'attract' + return 'Attract' def flask_config(self): """Returns extension-specific defaults for the Flask configuration. diff --git a/attract_server/modules.py b/attract_server/modules.py index d784bde..6a69e7e 100644 --- a/attract_server/modules.py +++ b/attract_server/modules.py @@ -1,5 +1,5 @@ from flask import Blueprint -from pillar_server.utils import jsonify +from pillar.api.utils import jsonify blueprint = Blueprint('attract', __name__) diff --git a/requirements.txt b/requirements.txt index 168054b..891b1ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # Primary requirements: -pillar-server==2.0 +pillar # Testing requirements: pytest==2.9.2 diff --git a/runserver.py b/runserver.py index bd9eebe..ebf544d 100755 --- a/runserver.py +++ b/runserver.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from pillar_server import PillarServer +from pillar import PillarServer from attract_server import AttractExtension app = PillarServer('.') diff --git a/setup.py b/setup.py index cf132a5..5602653 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setuptools.setup( version='1.0', packages=setuptools.find_packages('.', exclude=['test']), install_requires=[ - 'pillar-server>=2.0', + 'pillar>=2.0', ], tests_require=[ 'pytest>=2.9.1',