Django 2.0rc1 - TH V2 WIP

django_th/forms/services.py

@@ -39,6 +39,6 @@ class Meta:
         widget=forms.Select(),
         required=True
     )
-    name = forms.ChoiceField(available_services())
+    name = forms.ChoiceField(choices=available_services())
 
     # todo : set the value of status when editing the object

django_th/migrations/0001_initial.py

@@ -54,28 +54,29 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
                 ('token', models.CharField(max_length=255)),
-                ('name', models.ForeignKey(to_field='name', to='django_th.ServicesActivated', related_name='+')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('name', models.ForeignKey(to_field='name', to='django_th.ServicesActivated', related_name='+',
+                                           on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
         ),
         migrations.AddField(
             model_name='triggerservice',
             name='consumer',
-            field=models.ForeignKey(blank=True, related_name='+', to='django_th.UserService'),
+            field=models.ForeignKey(blank=True, related_name='+', to='django_th.UserService', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='triggerservice',
             name='provider',
-            field=models.ForeignKey(blank=True, related_name='+', to='django_th.UserService'),
+            field=models.ForeignKey(blank=True, related_name='+', to='django_th.UserService', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='triggerservice',
             name='user',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='rss',
             name='trigger',
-            field=models.ForeignKey(to='django_th.TriggerService'),
+            field=models.ForeignKey(to='django_th.TriggerService', on_delete=models.CASCADE),
         ),
     ]

django_th/models/__init__.py

@@ -62,9 +62,9 @@ class UserService(models.Model):
         (NONE, _('None'))
     )
 
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     token = models.CharField(max_length=255, blank=True)
-    name = models.ForeignKey(ServicesActivated, to_field='name', related_name='+')
+    name = models.ForeignKey(ServicesActivated, to_field='name', related_name='+', on_delete=models.CASCADE)
     username = models.CharField(_('username'), max_length=255, default='', blank=True)
     password = models.CharField(_('password'), max_length=128, default='', blank=True)
     host = models.CharField(_('host'), max_length=255, default='', blank=True)
@@ -90,10 +90,10 @@ class TriggerService(models.Model):
     """
         TriggerService
     """
-    provider = models.ForeignKey(UserService, related_name='+', blank=True)
-    consumer = models.ForeignKey(UserService, related_name='+', blank=True)
+    provider = models.ForeignKey(UserService, related_name='+', blank=True, on_delete=models.CASCADE)
+    consumer = models.ForeignKey(UserService, related_name='+', blank=True, on_delete=models.CASCADE)
     description = models.CharField(max_length=200)
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     date_created = models.DateField(auto_now_add=True)
     date_triggered = models.DateTimeField(null=True)
     status = models.BooleanField(default=False)
@@ -126,7 +126,7 @@ class Digest(models.Model):
     """
     Digest service to store the data from other service
     """
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     title = models.CharField(max_length=600)
     link = models.URLField()
     duration = models.CharField(max_length=1)

django_th/services/services.py

@@ -2,7 +2,7 @@
 # django stuff
 from django.conf import settings
 from django.core.cache import caches
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 try:
     from django.apps import apps

django_th/settings.py

@@ -1,6 +1,6 @@
 # Django settings for django_th project.
 import os
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 DEBUG = True  # set to False when using in production
 ALLOWED_HOSTS = ['127.0.0.1', 'localhost']
@@ -86,7 +86,7 @@
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    # 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
@@ -114,7 +114,7 @@
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'formtools',
-    'django_js_reverse',
+    # 'django_js_reverse',
     'rest_framework',
     'django_th',
     'th_rss',

django_th/templates/home.html

@@ -147,6 +147,6 @@
 {% endif %}
 {% endblock %}
 {% block extrajs %}
-<script src="{% url 'js_reverse' %}" type="text/javascript"></script>
+<script src="{# url 'js_reverse' #}" type="text/javascript"></script>
 <script src="{% static 'js/th.js' %}" type="text/javascript"></script>
 {% endblock %}

django_th/tests/test_views_userservices.py

@@ -1,8 +1,7 @@
 # coding: utf-8
-from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.test import RequestFactory
-
+from django.urls import reverse
 
 from django_th.forms.base import UserServiceForm
 from django_th.models import UserService, ServicesActivated

django_th/tests/test_xcmd.py

@@ -8,8 +8,8 @@
 class TestCmdMgt(TestCase):
 
     def test_run(self):
-        management.call_command('recycle', verbosity=0, interactive=False)
-        management.call_command('read', verbosity=0, interactive=False)
-        management.call_command('publish', verbosity=0, interactive=False)
-        management.call_command('read_n_pub', trigger_id=1, verbosity=0, interactive=False)
+        management.call_command('recycle', verbosity=0)
+        management.call_command('read', verbosity=0)
+        management.call_command('publish', verbosity=0)
+        management.call_command('read_n_pub', trigger_id=1, verbosity=0)
         # management.call_command('send_digest', verbosity=0, interactive=False)

django_th/urls.py

@@ -1,5 +1,7 @@
 from django.conf.urls import include, url
 from django.conf import settings
+from django.contrib import admin
+from django.urls import path
 
 from django_th.forms.wizard import DummyForm, ProviderForm, ConsumerForm, ServicesDescriptionForm
 
@@ -12,18 +14,17 @@
 from django_th.views_userservices import UserServiceDeleteView, renew_service
 from django_th.views_wizard import UserServiceWizard, finalcallback
 
-from django_js_reverse.views import urls_js
-
-
-from django.contrib import admin
-admin.autodiscover()
+# from django_js_reverse.views import urls_js
+# from django.contrib import admin
+# admin.autodiscover()
 
 urlpatterns = [
-    url(r'^jsreverse/$', urls_js, name='js_reverse'),
+    # url(r'^jsreverse/$', urls_js, name='js_reverse'),
     # ****************************************
     # admin module
     # ****************************************
-    url(r'^admin/', include(admin.site.urls)),
+    path('admin/', admin.site.urls),
+    # url(r'^admin/', include(admin.site.urls), ),
     # ****************************************
     # auth module
     # ****************************************

django_th/views_userservices.py

@@ -2,7 +2,7 @@
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
-from django.core.urlresolvers import reverse_lazy, reverse
+from django.urls import reverse_lazy, reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect, get_object_or_404
 from django.utils.translation import ugettext_lazy as _

django_th/views_wizard.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.utils.decorators import method_decorator

requirements.txt

@@ -1,7 +1,7 @@
 arrow==0.10.0
 awesome-slugify==1.6.5
 djangorestframework==3.7.3
-Django==1.11.7
+Django==2.0rc1
 django-environ==0.4.4
 django-formtools==2.1
 django-js-reverse==0.7.3

setup.py

@@ -3,7 +3,7 @@
 
 install_requires = [
     'djangorestframework==3.7.3',
-    'Django==1.11.7',
+    'Django==2.0rc1',
     'django-formtools==2.1',
     'arrow==0.10.0',
     'django-js-reverse==0.7.3',

th_evernote/migrations/0001_initial.py

@@ -30,6 +30,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='evernote',
             name='trigger',
-            field=models.ForeignKey(to='django_th.TriggerService'),
+            field=models.ForeignKey(to='django_th.TriggerService', on_delete=models.CASCADE),
         ),
     ]

th_evernote/models.py

@@ -14,7 +14,7 @@ class Evernote(Services):
     notebook = models.CharField(max_length=80)
     title = models.CharField(max_length=80)
     text = models.TextField()
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'th_evernote'

th_github/migrations/0001_initial.py

@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
                 ('description', models.CharField(max_length=255)),
                 ('repo', models.CharField(max_length=80)),
                 ('project', models.CharField(max_length=80)),
-                ('trigger', models.ForeignKey(to='django_th.TriggerService')),
+                ('trigger', models.ForeignKey(to='django_th.TriggerService', on_delete=models.CASCADE)),
             ],
             options={
                 'db_table': 'django_th_github',

th_github/models.py

@@ -14,7 +14,7 @@ class Github(Services):
     # but keep at least this one
     repo = models.CharField(max_length=80)  # owner
     project = models.CharField(max_length=80)  # repo
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'th_github'

th_instapush/migrations/0001_initial.py

@@ -30,6 +30,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='instapush',
             name='trigger',
-            field=models.ForeignKey(to='django_th.TriggerService'),
+            field=models.ForeignKey(to='django_th.TriggerService', on_delete=models.CASCADE),
         ),
     ]

th_instapush/models.py

@@ -15,7 +15,7 @@ class Instapush(Services):
     app_secret = models.CharField(max_length=255)
     event_name = models.CharField(max_length=255)
     tracker_name = models.CharField(max_length=80)
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'th_instapush'

th_mastodon/models.py

@@ -21,7 +21,7 @@ class Mastodon(Services):
     since_id = models.BigIntegerField(null=True, blank=True)
     max_id = models.BigIntegerField(null=True, blank=True)
     count = models.IntegerField(null=True, blank=True)
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'th_mastodon'

th_pelican/migrations/0001_initial.py

@@ -31,6 +31,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='pelican',
             name='trigger',
-            field=models.ForeignKey(to='django_th.TriggerService'),
+            field=models.ForeignKey(to='django_th.TriggerService', on_delete=models.CASCADE),
         ),
     ]

th_pelican/models.py

@@ -14,7 +14,7 @@ class Pelican(Services):
     tags = models.CharField(max_length=200, blank=True)
     category = models.CharField(max_length=200, blank=True)
     path = models.CharField(max_length=255)
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'th_pelican'

th_pocket/migrations/0001_initial.py

@@ -30,6 +30,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='pocket',
             name='trigger',
-            field=models.ForeignKey(to='django_th.TriggerService'),
-        ),        
-    ]
+            field=models.ForeignKey(to='django_th.TriggerService', on_delete=models.CASCADE),
+        ),
+    ]

th_pocket/models.py

@@ -15,7 +15,7 @@ class Pocket(Services):
     url = models.URLField(max_length=255)
     title = models.CharField(max_length=80, blank=True)
     tweet_id = models.CharField(max_length=80, blank=True)
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'th_pocket'

th_pushbullet/migrations/0001_initial.py

@@ -30,6 +30,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='pushbullet',
             name='trigger',
-            field=models.ForeignKey(to='django_th.TriggerService'),
+            field=models.ForeignKey(to='django_th.TriggerService', on_delete=models.CASCADE),
         ),
-    ]
+    ]

th_pushbullet/models.py

@@ -13,7 +13,7 @@ class Pushbullet(Services):
     device = models.CharField(max_length=80, blank=True)
     email = models.EmailField(max_length=255, blank=True)
     channel_tag = models.CharField(max_length=80, blank=True)
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'th_pushbullet'

th_reddit/migrations/0001_initial.py

@@ -24,7 +24,8 @@ class Migration(migrations.Migration):
                 ('description', models.CharField(max_length=255)),
                 ('subreddit', models.CharField(max_length=80)),
                 ('share_link', models.BooleanField(default=False)),
-                ('trigger', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='django_th.TriggerService')),
+                ('trigger', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                                              to='django_th.TriggerService')),
             ],
             options={
                 'db_table': 'django_th_reddit',

th_reddit/models.py

@@ -14,7 +14,7 @@ class Reddit(Services):
     # but keep at least this one
     subreddit = models.CharField(max_length=80)
     share_link = models.BooleanField(default=False)
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'th_reddit'

th_reddit/my_reddit.py

@@ -4,7 +4,7 @@
 # django classes
 from django.conf import settings
 from django.core.cache import caches
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 # django_th classes
 from django_th.models import update_result, UserService

th_rss/models.py

@@ -11,7 +11,7 @@ class Rss(Services):
     """
     uuid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False)
     url = models.URLField(max_length=255)
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'django_th'

th_rss/tests.py

@@ -2,7 +2,7 @@
 import arrow
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import RequestFactory
 
 from django_th.tests.test_main import MainTest, setup_view

th_slack/migrations/0001_initial.py

@@ -30,6 +30,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='slack',
             name='trigger',
-            field=models.ForeignKey(to='django_th.TriggerService'),
+            field=models.ForeignKey(to='django_th.TriggerService', on_delete=models.CASCADE),
         ),
     ]

th_slack/models.py

@@ -12,7 +12,7 @@ class Slack(Services):
     slack_token = models.CharField(max_length=2000, blank=True, null=True)
     team_id = models.CharField(max_length=100, blank=True, null=True)
     channel = models.CharField(max_length=100, blank=True, null=True)
-    trigger = models.ForeignKey(TriggerService)
+    trigger = models.ForeignKey(TriggerService, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'th_slack'