Merge pull request #497 from troygrosfield/master

Get tests successfully running for python 3.4 and django 1.7

Author: tschellenbach

.gitignore

@@ -24,11 +24,12 @@ bulkloader-*
 facebook_example/django_fb_test
 facebook_example/media/*
 
+# ignore uploaded test images
+facebook_example/facebook_example/media/*
+
 #hide the docs and coverage
 html
 htmlcov
 
 # But allow the gitignore file
-!.gitignore
-
-
+!.gitignore

.travis.yml

@@ -7,10 +7,10 @@ notifications:
     - [email protected]
 env:
   # test the standalone functionality
-  - DJANGO=1.6.5 CUSTOM_USER_MODEL=0 MODE=standalone REQUIREMENTS=development6 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
-  - DJANGO=1.6.5 CUSTOM_USER_MODEL=1 MODE=standalone REQUIREMENTS=development6 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
-  - DJANGO=1.7 CUSTOM_USER_MODEL=0 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
-  - DJANGO=1.7 CUSTOM_USER_MODEL=1 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
+  - DJANGO=1.6.8 CUSTOM_USER_MODEL=0 MODE=standalone REQUIREMENTS=development6 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
+  - DJANGO=1.6.8 CUSTOM_USER_MODEL=1 MODE=standalone REQUIREMENTS=development6 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
+  - DJANGO=1.7.1 CUSTOM_USER_MODEL=0 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
+  - DJANGO=1.7.1 CUSTOM_USER_MODEL=1 MODE=standalone REQUIREMENTS=development7 SETTINGS=facebook_example.settings TESTS=django_facebook open_facebook
 postgres:
   adapter: sqlite3
   database: django_fb_test
@@ -24,7 +24,7 @@ install:
   - pip install -r facebook_example/requirements/$REQUIREMENTS.txt --use-mirrors -I --allow-all-external
   - pip install -q Django==$DJANGO --use-mirrors -I
 before_script:
-  - "pep8 --exclude=migrations --ignore=E501,E225,W293 django_facebook open_facebook"
+  - "pep8 --exclude=south_migrations --ignore=E501,E225,W293 django_facebook open_facebook"
 #  - pyflakes -x W src
 script:
   - pip install -e .

django_facebook/migrations/0001_initial.py renamed to django_facebook/south_migrations/0001_initial.py

@@ -96,7 +96,7 @@ def forwards(self, orm):
                 ('state', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
             ))
             db.send_create_signal(u'django_facebook', ['FacebookCustomUser'])
-    
+
             # Adding M2M table for field groups on 'FacebookCustomUser'
             m2m_table_name = db.shorten_name(u'django_facebook_facebookcustomuser_groups')
             db.create_table(m2m_table_name, (
@@ -105,7 +105,7 @@ def forwards(self, orm):
                 ('group', models.ForeignKey(orm[u'auth.group'], null=False))
             ))
             db.create_unique(m2m_table_name, ['facebookcustomuser_id', 'group_id'])
-    
+
             # Adding M2M table for field user_permissions on 'FacebookCustomUser'
             m2m_table_name = db.shorten_name(u'django_facebook_facebookcustomuser_user_permissions')
             db.create_table(m2m_table_name, (
@@ -271,4 +271,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['django_facebook']
+    complete_apps = ['django_facebook']

facebook_example/facebook_example/settings.py

@@ -10,7 +10,7 @@
 
 if DJANGO != '1.5.1':
     CUSTOM_USER_MODEL = False
-    
+
 TESTING = 'test' in sys.argv
 
 FACEBOOK_APP_ID = '215464901804004'
@@ -28,7 +28,7 @@
 
 if django_version >= (1, 4, 0):
     TEMPLATE_CONTEXT_PROCESSORS.append('django.core.context_processors.tz')
-    
+
 AUTHENTICATION_BACKENDS = (
     'django_facebook.auth_backends.FacebookBackend',
     'django.contrib.auth.backends.ModelBackend',
@@ -162,12 +162,15 @@
     # 'django.contrib.admindocs',
     'django_facebook',
     'member',
-    'south',
     'open_facebook',
     'django.contrib.admin',
 )
 
-
+if django_version < (1, 7, 0):
+    # south isn't needed by django >= 1.7 since migrations were added.  See:
+    # - https://docs.djangoproject.com/en/dev/topics/migrations/#libraries-third-party-apps
+    # - http://south.readthedocs.org/en/latest/releasenotes/1.0.html#library-migration-path
+    INSTALLED_APPS += ('south',)
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
@@ -259,4 +262,4 @@
         'guardian',
     )
 
-FACEBOOK_OG_SHARE_DB_TABLE = 'django_facebook_open_graph_share'
+FACEBOOK_OG_SHARE_DB_TABLE = 'django_facebook_open_graph_share'

facebook_example/member/migrations/0010_initial.py renamed to facebook_example/member/south_migrations/0010_initial.py

@@ -333,8 +333,8 @@ def test_albums(self):
         if profile_album:
             pictures = graph.get('%s/photos' % profile_album['id'])['data'][:3]
             for picture in pictures:
-                print picture['source']
+                print(picture['source'])
         if cover_album:
             pictures = graph.get('%s/photos' % cover_album['id'])['data'][:3]
             for picture in pictures:
-                print picture['source']
+                print(picture['source'])