fix registration version (dj1.6 compatible), re-add some dep install, change default...

diff --git a/docker-compose.yml b/docker-compose.yml
index 762c32c4154c17058af6b309ade8dd7c468a2896..75e3b45511bd19032d2dee0c50df246a93d65e2a 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,10 +59,10 @@ db:
     - lib
     - log
   environment:
-    - MYSQL_ROOT_PASSWORD=mysecretpassword
-    - MYSQL_DATABASE=sandbox
-    - MYSQL_USER=root
-    - MYSQL_PASSWORD=mysecretpassword
+    - MYSQL_ROOT_PASSWORD=ItCydyatzix8
+    - MYSQL_DATABASE=telemeta
+    - MYSQL_USER=telemeta
+    - MYSQL_PASSWORD=iuvIlkyisFit2
 
 rabbitmq:
   image: rabbitmq:3-management

diff --git a/examples/deploy/start_app.sh b/examples/deploy/start_app.sh
index c0a1cabc9683d796d7eb0ce3eee5209608cfe571..47179f85ad1fc24e278e14d326de8d413ea95eb6 100644 (file)
--- a/examples/deploy/start_app.sh
+++ b/examples/deploy/start_app.sh
@@ -8,7 +8,7 @@ manage=$sandbox'/manage.py'
 wsgi=$sandbox'/wsgi.py'
 
 # stating apps
-# pip install django-haystack elasticsearch
+pip install django-haystack elasticsearch
 
 # waiting for other services
 sh $app_dir/examples/deploy/wait.sh

diff --git a/examples/sandbox/settings.py b/examples/sandbox/settings.py
index a79eea626c31e100ea6af4723e94cefc4dce201a..039dcd546128315f7ce7358a3a3bedbed9ee05e3 100644 (file)
--- a/examples/sandbox/settings.py
+++ b/examples/sandbox/settings.py
@@ -32,9 +32,9 @@ DATABASES = {
 
         # MySQL config
         'ENGINE': 'django.db.backends.mysql',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'USER': 'root',      # Not used with sqlite3.
-        'PASSWORD': 'mysecretpassword',  # Not used with sqlite3.
-        'NAME': 'sandbox',
+        'USER': 'telemeta',      # Not used with sqlite3.
+        'PASSWORD': 'iuvIlkyisFit2',  # Not used with sqlite3.
+        'NAME': 'telemeta',
         'HOST': 'db',      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '3306',      # Set to empty string for default. Not used with sqlite3.
     }
@@ -298,4 +298,6 @@ HAYSTACK_CONNECTIONS = {
 
 HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
 
-HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50
\ No newline at end of file
+HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50
+
+

diff --git a/requirements-dev.txt b/requirements-dev.txt
index fc7257619851f63dc023a67a5bdf43b1ce2856f0..764c86bfd6e2e8d1a1a0bf3885092ebc73b677fb 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,3 @@
 
--e git+https://github.com/mariocesar/sorl-thumbnail.git@eb52b23348fa5b1446c590f4ac95114dae81c168#egg=sorl-thumbnail-12.2
+-e git+https://github.com/mariocesar/sorl-thumbnail.git@v12.2#egg=sorl-thumbnail-12.2
 -e git+https://github.com/Parisson/ebooklib.git#egg=ebooklib-0.16

diff --git a/requirements.txt b/requirements.txt
index d66c1a175ab244a98c32ffd58d2cbc3abd85a831..04fef4d29d7aafabf49605adfa50ddb458e7b97e 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 --index-url https://pypi.python.org/simple/
 
 setuptools
+wheel
 -e .

diff --git a/setup.py b/setup.py
index 90ce7a47e00040697cab863c388c476cf854add9..5f33c1d8f6bc9223220e240784df9d8dc5906db3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ setup(
   version = '1.6',
   install_requires = [
         'django==1.6.11',
-        'django-registration',
+        'django-registration==1.0',
         'django-extensions',
         'django-timezones',
         'django-jqchat',