pillar-server → pillar

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.

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__)
 

requirements.txt

@@ -1,5 +1,5 @@
 # Primary requirements:
-pillar-server==2.0
+pillar
 
 # Testing requirements:
 pytest==2.9.2

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('.')

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',