final fix build :D

algolia · Jun 19, 2015 · 42fccd6 · 42fccd6
1 parent c2b70d1
commit 42fccd6
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 32 deletions.
diff --git a/algoliasearch-django/management/__init__.py → ChangeLog b/algoliasearch-django/management/__init__.py → ChangeLog
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 include LICENSE
 include README.md
+include ChangeLog
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ pip install algoliasearch-django
 Setup
 -------------
 
-In your Django settings, add `AlgoliaSearch` to `INSTALLED_APPS` and add two settings:
+In your Django settings, add `django.contrib.algoliasearch` to `INSTALLED_APPS` and add two settings:
 
 ```python
 ALGOLIA_APPLICATION_ID = 'MyAppID'
@@ -50,14 +50,14 @@ Simply call `AlgoliaSearch.register()` for each of the models you want to index.
 
 ```python
 from django.apps import AppConfig
-import AlgoliaSearch
+from django.contrib import algoliasearch
 
 class YourAppConfig(AppConfig):
     name = 'your_app'
 
     def ready(self):
         YourModel = self.get_model('your_model')
-        AlgoliaSearch.register(YourModel)
+        algoliasearch.register(YourModel)
 ```
 
 And then, don't forget the line below in the `__init__.py` file of your Django application.
@@ -69,7 +69,7 @@ default_app_config = 'your_django_app.apps.YourAppConfig'
 By default, all the fields of your model will be used. You can configure the index by creating a subclass of `AlgoliaIndex`. A good place to do this is in a separeted file, like `index.py`.
 
 ```python
-from AlgoliaSearch import AlgoliaIndex
+from django.contrib.algoliasearch import AlgoliaIndex
 
 class YourModelIndex(AlgoliaIndex):
     fields = ('name', 'date')
@@ -78,7 +78,7 @@ class YourModelIndex(AlgoliaIndex):
     index_name = 'my_index'
 ```
 
-And then replace `AlgoliaSearch.register(YourModel)` with `AlgoliaSearch.register(YourModel, YourModelIndex)`.
+And then replace `algoliasearch.register(YourModel)` with `algoliasearch.register(YourModel, YourModelIndex)`.
 
 ## Commands
 
@@ -110,7 +110,7 @@ class ContactIndex(AlgoliaIndex):
     geo_field = 'location'
 
 
-AlgoliaSearch.register(Contact, ContactIndex)
+algoliasearch.register(Contact, ContactIndex)
 ```
 
 # Options

diff --git a/algoliasearch-django/admin.py b/algoliasearch-django/admin.py
diff --git a/algoliasearch-django/tests.py b/algoliasearch-django/tests.py
diff --git a/algoliasearch-django/version.py b/algoliasearch-django/version.py
diff --git a/algoliasearch-django/views.py b/algoliasearch-django/views.py
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
     with open(path_readme) as readme:
         README = readme.read()
 
-path_version = os.path.join(os.path.dirname(__file__), 'algoliasearch-django/version.py')
+path_version = os.path.join(os.path.dirname(__file__), 'src/version.py')
 if sys.version_info[0] == 3:
     exec(open(path_version).read())
 else:
@@ -31,13 +31,21 @@
     name = 'algoliasearch-django',
     version = VERSION,
     license = 'MIT License',
-    packages = ['django.contrib.algoliasearch'],
-    package_dir = {'django.contrib.algoliasearch': 'algoliasearch-django'},
+    packages = [
+        'django.contrib.algoliasearch',
+        'django.contrib.algoliasearch.management',
+        'django.contrib.algoliasearch.management.commands'
+    ],
+    package_dir = {
+        'django.contrib.algoliasearch': 'src',
+        'django.contrib.algoliasearch.management': 'src/management',
+        'django.contrib.algoliasearch.management.commands': 'src/management/commands'
+    },
     install_requires = ['django', 'algoliasearch'],
     description = 'Algolia Search integration for Django',
     long_description = README,
     author = 'Algolia Team',
-    author_email = 'hey@algolia.com',
+    author_email = 'support@algolia.com',
     url = 'https://github.com/algolia/algoliasearch-django',
     keywords = ['algolia', 'pyalgolia', 'search', 'backend', 'hosted', 'cloud',
         'full-text search', 'faceted search', 'django'],

diff --git a/algoliasearch-django/__init__.py → src/__init__.py b/algoliasearch-django/__init__.py → src/__init__.py
diff --git a/algoliasearch-django/migrations/__init__.py → src/management/__init__.py b/algoliasearch-django/migrations/__init__.py → src/management/__init__.py
diff --git a/...ch-django/management/commands/__init__.py → src/management/commands/__init__.py b/...ch-django/management/commands/__init__.py → src/management/commands/__init__.py
diff --git a/...agement/commands/algolia_applysettings.py → ...agement/commands/algolia_applysettings.py b/...agement/commands/algolia_applysettings.py → ...agement/commands/algolia_applysettings.py
@@ -1,5 +1,5 @@
 from django.core.management.base import BaseCommand
-import django.contrib.algoliasearch
+from django.contrib import algoliasearch
 
 
 class Command(BaseCommand):
@@ -11,8 +11,8 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         '''Run the management command.'''
         self.stdout.write('Apply settings to index:')
-        for model in AlgoliaSearch.get_registered_model():
-            adapter = AlgoliaSearch.get_adapter(model)
+        for model in algoliasearch.get_registered_model():
+            adapter = algoliasearch.get_adapter(model)
             if options['model'] and not (model.__name__ in options['model']):
                 continue
 

diff --git a/...management/commands/algolia_buildindex.py → ...management/commands/algolia_buildindex.py b/...management/commands/algolia_buildindex.py → ...management/commands/algolia_buildindex.py
@@ -1,5 +1,5 @@
 from django.core.management.base import BaseCommand
-import django.contrib.algoliasearch
+from django.contrib import algoliasearch
 
 
 class Command(BaseCommand):
@@ -12,8 +12,8 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         '''Run the management command.'''
         self.stdout.write('The following models were indexed:')
-        for model in AlgoliaSearch.get_registered_model():
-            adapter = AlgoliaSearch.get_adapter(model)
+        for model in algoliasearch.get_registered_model():
+            adapter = algoliasearch.get_adapter(model)
             if options['model'] and not (model.__name__ in options['model']):
                 continue
 

diff --git a/...management/commands/algolia_clearindex.py → ...management/commands/algolia_clearindex.py b/...management/commands/algolia_clearindex.py → ...management/commands/algolia_clearindex.py
@@ -1,5 +1,5 @@
 from django.core.management.base import BaseCommand
-import django.contrib.algoliasearch
+from django.contrib import algoliasearch
 
 
 class Command(BaseCommand):
@@ -11,8 +11,8 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         '''Run the management command.'''
         self.stdout.write('Clear index:')
-        for model in AlgoliaSearch.get_registered_model():
-            adapter = AlgoliaSearch.get_adapter(model)
+        for model in algoliasearch.get_registered_model():
+            adapter = algoliasearch.get_adapter(model)
             if options['model'] and not (model.__name__ in options['model']):
                 continue
 

diff --git a/...go/management/commands/algolia_reindex.py → src/management/commands/algolia_reindex.py b/...go/management/commands/algolia_reindex.py → src/management/commands/algolia_reindex.py
@@ -1,5 +1,5 @@
 from django.core.management.base import BaseCommand
-import django.contrib.algoliasearch
+from django.contrib import algoliasearch
 
 
 class Command(BaseCommand):
@@ -12,8 +12,8 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         '''Run the management command.'''
         self.stdout.write('The following models were reindexed:')
-        for model in AlgoliaSearch.get_registered_model():
-            adapter = AlgoliaSearch.get_adapter(model)
+        for model in algoliasearch.get_registered_model():
+            adapter = algoliasearch.get_adapter(model)
             if options['model'] and not (model.__name__ in options['model']):
                 continue
 

diff --git a/algoliasearch-django/models.py → src/models.py b/algoliasearch-django/models.py → src/models.py
diff --git a/algoliasearch-django/registration.py → src/registration.py b/algoliasearch-django/registration.py → src/registration.py
diff --git a/src/version.py b/src/version.py
@@ -0,0 +1 @@
+VERSION = '1.1.0'