Merge branch 'master' of github.com:pythonindia/junction into docs

Author: cosmologist10

.travis.yml

@@ -12,7 +12,7 @@ cache:
   - $HOME/.pip-cache/
 
 install:
-  - pip install pip==8.1.2
+  - pip install pip==9.0.1
   - pip install -r requirements-dev.txt --allow-all-external
   - pip install coveralls
 

junction/tickets/migrations/0002_auto_20170104_0124.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ticket',
+            name='email',
+            field=models.EmailField(max_length=254),
+        )
+    ]

requirements-dev.txt

@@ -3,7 +3,11 @@
 # Testing
 # -------------------------------------------------
 mock==2.0.0
-factory_boy==2.7.0
+# Fix for travis CI tests failing
+# Ref: https://github.com/FactoryBoy/factory_boy/issues/334#issuecomment-267696136
+fake-factory==0.7.4
+factory-boy==2.7.0
+
 flake8==2.4.1
 pytest-django==2.9.1
 pytest-cov==2.2.1
@@ -19,3 +23,7 @@ bumpversion==0.5.3
 # Debugging
 # --------------------------------------------------
 ipdb==0.9.0
+
+# Patch for html5lib - issue #520
+html5lib<0.99999999
+bleach<2.0.0

settings/common.py

@@ -67,6 +67,9 @@
     'allauth.socialaccount',
     'allauth.socialaccount.providers.google',
     'allauth.socialaccount.providers.github',
+    'allauth.socialaccount.providers.twitter',
+    'allauth.socialaccount.providers.linkedin',
+    'allauth.socialaccount.providers.facebook',
 
     'bootstrap3',
 
@@ -114,7 +117,7 @@
     # Needed to login by username in Django admin, regardless of `allauth`
     "django.contrib.auth.backends.ModelBackend",
     # `allauth` specific authentication methods, such as login by e-mail
-    "allauth.account.auth_backends.AuthenticationBackend"
+    "allauth.account.auth_backends.AuthenticationBackend",
 )
 
 ACCOUNT_AUTHENTICATION_METHOD = "username_email"

tests/factories.py

@@ -2,6 +2,7 @@
 
 # Standard Library
 import datetime
+from datetime import timedelta
 import uuid
 
 # Third Party Stuff
@@ -138,7 +139,7 @@ class Meta:
         strategy = factory.CREATE_STRATEGY
 
     event_date = fuzzy.FuzzyDate(datetime.date.today(),
-                                 datetime.date(2017, 1, 1)).fuzz()
+                                 datetime.date.today() + timedelta(days=90)).fuzz()
     start_time = fuzzy.FuzzyChoice(['9:30.750000', ]).fuzz()
     end_time = fuzzy.FuzzyChoice(['10:15.750000', ]).fuzz()
     conference = factory.SubFactory("tests.factories.ConferenceFactory")