Merge pull request #15 from DataIsTheNewBlack/dev

Django Updated to Django 1.11 and Requirements Updated.

application/settings.py

@@ -125,7 +125,7 @@ def assign_env_value(var_name):
     'oauth',
 ]
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -135,7 +135,6 @@ def assign_env_value(var_name):
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.contrib.staticfiles.storage.StaticFilesStorage',
 ]
 
 ROOT_URLCONF = 'application.urls'

application/urls.py

@@ -23,7 +23,7 @@
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
     url(r'^admin/django-ses/', include('django_ses.urls')),
     url(r'^api/1.0/', include('feedcrunch_api_v1.urls')),
     url(r'^oauth/', include('oauth.urls')),

feedcrunch/model_files/models_geo.py

@@ -16,7 +16,7 @@ def __str__(self):
 class Country(models.Model):
     name = models.CharField(primary_key=True, max_length=60)
     code = models.CharField(max_length=2)
-    continent = models.ForeignKey(Continent)
+    continent = models.ForeignKey(Continent, on_delete=models.CASCADE)
 
     def __str__(self):
         return self.name

feedcrunch/model_files/models_post.py

@@ -20,7 +20,7 @@ def create_key(size=8):
 
 class Post(models.Model):
     id = models.AutoField(primary_key=True)
-    user = models.ForeignKey(FeedUser, related_name='rel_posts')
+    user = models.ForeignKey(FeedUser, related_name='rel_posts', on_delete=models.CASCADE)
     title = models.CharField(max_length=255)
     link = models.URLField(max_length=2000)
     when = models.DateTimeField(auto_now_add=True)

feedcrunch/model_files/models_rss_subscriber.py

@@ -51,7 +51,7 @@ class FeedType(DjangoChoices):
         web = ChoiceItem()
 
     id         = models.AutoField(primary_key=True)
-    user       = models.ForeignKey(FeedUser, related_name='rel_rss_subscribers')
+    user       = models.ForeignKey(FeedUser, related_name='rel_rss_subscribers', on_delete=models.CASCADE)
     ipaddress  = models.GenericIPAddressField(protocol='both', unpack_ipv4=False)
     date       = models.DateField(auto_now_add=True, blank=False, null=False)
     feedtype   = models.CharField(max_length=4, choices=FeedType.choices, default=FeedType.rss)
@@ -83,7 +83,7 @@ class RSSSubsStat(models.Model):
     objects = RSSSubsStatManager()
 
     id    = models.AutoField(primary_key=True)
-    user  = models.ForeignKey(FeedUser, related_name='rel_rss_subscribers_count', blank=False, null=False)
+    user  = models.ForeignKey(FeedUser, related_name='rel_rss_subscribers_count', blank=False, null=False, on_delete=models.CASCADE)
     date  = models.DateField(auto_now_add=False, blank=False, null=False)
     count = models.IntegerField(default=0, blank=False, null=False)
 

requirements.txt

@@ -20,7 +20,7 @@ dateutils==0.6.6
 decorator==4.0.11
 dill==0.2.6
 dj-database-url==0.4.2
-django==1.10.7
+django==1.11
 django-admin-view-permission==0.7
 django-braces==1.11.0
 django-celery-results==1.0.1
@@ -66,7 +66,7 @@ psutil==5.2.1
 psycopg2==2.7.1
 pyasn1==0.2.3
 pycparser==2.17
-pycrypto>=2.6.1
+pycryptodome==3.4.5
 pyparsing==2.2.0
 pyreadline==2.1
 python-dateutil==2.6.0

scripts/win/install_dependencies.bat

@@ -6,7 +6,5 @@ call pip install --upgrade pip
 call pip install "lib_bin\windows\lxml-3.7.3-cp36-cp36m-win_amd64.whl"
 call pip install "lib_bin\windows\scipy-0.19.0-cp36-cp36m-win_amd64.whl"
 call pip install "lib_bin\windows\scikit_learn-0.18.1-cp36-cp36m-win_amd64.whl"
-call pip install "lib_bin\windows\pycrypto-2.7a2-cp36-cp36m-win_amd64.whl"
-call pip install "lib_bin\windows\Pillow-4.0.0-cp36-cp36m-win_amd64.whl"
 call pip install -r requirements.txt
 PAUSE;