Merge pull request #558 from rexhepberlajolli/rexhepberlajolli/update…

…-django

Update django to 2.2.5

apiv3/resources.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from profiles.models import Profile
 
 def base_resource(obj):

apiv3/tests/test_package.py

@@ -1,5 +1,5 @@
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from grid.models import Grid, GridPackage
 from package.models import Package, Category

apiv3/tests/test_resources.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from apiv3 import resources
 from apiv3.tests.data import BaseData

apiv3/urls.py

@@ -2,6 +2,8 @@
 
 from . import views
 
+app_name = "apiv3"
+
 # New URLs
 urlpatterns = [
     url(

apiv4/serializers.py

@@ -1,7 +1,7 @@
 import six
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import NoReverseMatch
+from django.urls import NoReverseMatch
 
 from rest_framework import relations
 from rest_framework.reverse import reverse

apiv4/urls.py

@@ -0,0 +1,13 @@
+from rest_framework import routers
+
+from .viewsets import PackageViewSet, SearchV2ViewSet, GridViewSet, CategoryViewSet
+
+app_name = "apiv4"
+
+router = routers.DefaultRouter()
+router.register(r'packages', PackageViewSet)
+router.register(r'search', SearchV2ViewSet)
+router.register(r'grids', GridViewSet)
+router.register(r'categories', CategoryViewSet)
+
+urlpatterns = router.urls

apiv4/viewsets.py

@@ -2,7 +2,6 @@
 
 from rest_framework import mixins
 from rest_framework.response import Response
-from rest_framework import routers
 from rest_framework import viewsets
 
 from grid.models import Grid
@@ -52,9 +51,3 @@ class CategoryViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = CategorySerializer
     paginate_by = 20
 
-
-router = routers.DefaultRouter()
-router.register(r'packages', PackageViewSet)
-router.register(r'search', SearchV2ViewSet)
-router.register(r'grids', GridViewSet)
-router.register(r'categories', CategoryViewSet)

compose/caddy/Dockerfile

@@ -9,7 +9,7 @@ RUN apk add --no-cache openssh-client git tar curl
 
 RUN curl --silent --show-error --fail --location \
       --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
-      "https://caddyserver.com/download/linux/amd64?plugins=${plugins}" \
+      "https://caddyserver.com/download/linux/amd64?plugins=${plugins}&license=personal" \
     | tar --no-same-owner -C /usr/bin/ -xz caddy \
  && chmod 0755 /usr/bin/caddy \
  && /usr/bin/caddy -version

core/context_processors.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Max
 
 from searchv2.models import SearchV2

feeds/tests/data.py

@@ -137,10 +137,10 @@ def load():
         #permissions=[[u'delete_gridpackage', u'grid', u'gridpackage'], [u'delete_feature', u'grid', u'feature']],
     )
     group1.permissions.clear()
-    group1.permissions = [
+    group1.permissions.set([
         Permission.objects.get(codename='delete_gridpackage'),
         Permission.objects.get(codename='delete_feature')
-        ]
+    ])
 
     user1, created = User.objects.get_or_create(
         pk=1,
@@ -170,7 +170,7 @@ def load():
         email='',
         date_joined='2010-01-01 12:00:00',
     )
-    user2.groups = [group1]
+    user2.groups.set([group1])
     user2.set_password('cleaner')
     user2.save()
 

feeds/tests/test_latest.py

@@ -1,5 +1,5 @@
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from package.models import Package
 
 import feedparser

grid/migrations/0001_initial.py

@@ -63,8 +63,8 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('created', core.fields.CreationDateTimeField(default=django.utils.timezone.now, verbose_name='created', editable=False, blank=True)),
                 ('modified', core.fields.ModificationDateTimeField(default=django.utils.timezone.now, verbose_name='modified', editable=False, blank=True)),
-                ('grid', models.ForeignKey(to='grid.Grid')),
-                ('package', models.ForeignKey(to='package.Package')),
+                ('grid', models.ForeignKey(to='grid.Grid', on_delete=django.db.models.deletion.CASCADE)),
+                ('package', models.ForeignKey(to='package.Package', on_delete=django.db.models.deletion.CASCADE)),
             ],
             options={
                 'verbose_name': 'Grid Package',
@@ -81,19 +81,19 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='feature',
             name='grid',
-            field=models.ForeignKey(to='grid.Grid'),
+            field=models.ForeignKey(to='grid.Grid', on_delete=django.db.models.deletion.CASCADE),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='element',
             name='feature',
-            field=models.ForeignKey(to='grid.Feature'),
+            field=models.ForeignKey(to='grid.Feature', on_delete=django.db.models.deletion.CASCADE),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='element',
             name='grid_package',
-            field=models.ForeignKey(to='grid.GridPackage'),
+            field=models.ForeignKey(to='grid.GridPackage', on_delete=django.db.models.deletion.CASCADE),
             preserve_default=True,
         ),
     ]

grid/models.py

@@ -1,5 +1,6 @@
 from django.core.cache import cache
 from django.db import models
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from core.models import BaseModel
@@ -50,12 +51,11 @@ def save(self, *args, **kwargs):
         self.clear_detail_template_cache()  # Delete the template fragment cache
         super(Grid, self).save(*args, **kwargs)
 
-    @models.permalink
     def get_absolute_url(self):
-        return ("grid", [self.slug])
+        return reverse("grid", args=[self.slug])
 
     def clear_detail_template_cache(self):
-        key = make_template_fragment_key("detail_template_cache", [self.pk, ])
+        key = make_template_fragment_key("detail_template_cache", [str(self.pk)])
         cache.delete(key)
 
     class Meta:
@@ -76,8 +76,8 @@ class GridPackage(BaseModel):
     * :attr:`package` - the :class:`~grid.models.Package`
     """
 
-    grid = models.ForeignKey(Grid)
-    package = models.ForeignKey(Package)
+    grid = models.ForeignKey(Grid, on_delete=models.CASCADE)
+    package = models.ForeignKey(Package, on_delete=models.CASCADE)
 
     class Meta:
         verbose_name = 'Grid Package'
@@ -101,7 +101,7 @@ class Feature(BaseModel):
     * :attr:`description` - plain-text description
     """
 
-    grid = models.ForeignKey(Grid)
+    grid = models.ForeignKey(Grid, on_delete=models.CASCADE)
     title = models.CharField(_('Title'), max_length=100)
     description = models.TextField(_('Description'), blank=True)
 
@@ -132,8 +132,8 @@ class Element(BaseModel):
     * :attr:`text` - the actual contents of the grid cell
     """
 
-    grid_package = models.ForeignKey(GridPackage)
-    feature = models.ForeignKey(Feature)
+    grid_package = models.ForeignKey(GridPackage, on_delete=models.CASCADE)
+    feature = models.ForeignKey(Feature, models.CASCADE)
     text = models.TextField(_('text'), blank=True, help_text=help_text)
 
     class Meta:

grid/tests/data.py

@@ -139,10 +139,10 @@ def load():
         #permissions=[[u'delete_gridpackage', u'grid', u'gridpackage'], [u'delete_feature', u'grid', u'feature']],
     )
     group1.permissions.clear()
-    group1.permissions = [
+    group1.permissions.set([
         Permission.objects.get(codename='delete_gridpackage'),
         Permission.objects.get(codename='delete_feature')
-        ]
+    ])
 
     user1, created = User.objects.get_or_create(
         pk=1,
@@ -175,7 +175,7 @@ def load():
     user2.set_password('cleaner')
     user2.save()
 
-    user2.groups = [group1]
+    user2.groups.set([group1])
 
     user3, created = User.objects.get_or_create(
         pk=3,

grid/tests/test_views.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.models import User, Permission
 
 from grid.models import Grid, Element, Feature, GridPackage

grid/views.py

@@ -2,7 +2,7 @@
 
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib import messages
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Count
 from django.http import HttpResponseRedirect, Http404, HttpResponseForbidden
 from django.shortcuts import get_object_or_404, render
@@ -377,4 +377,4 @@ def grid_timesheet(request, slug, template_name="grid/grid_timesheet.html"):
     return render(request, template_name, {
             'grid': grid,
             'grid_packages': grid_packages,
-        })
+        })

homepage/migrations/0001_initial.py

@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
                 ('modified', core.fields.ModificationDateTimeField(default=django.utils.timezone.now, verbose_name='modified', editable=False, blank=True)),
                 ('start_date', models.DateField(verbose_name='Start Date')),
                 ('end_date', models.DateField(verbose_name='End Date')),
-                ('package', models.ForeignKey(to='package.Package')),
+                ('package', models.ForeignKey(to='package.Package', on_delete=django.db.models.deletion.CASCADE)),
             ],
             options={
                 'ordering': ('-start_date', '-end_date'),
@@ -40,7 +40,7 @@ class Migration(migrations.Migration):
                 ('modified', core.fields.ModificationDateTimeField(default=django.utils.timezone.now, verbose_name='modified', editable=False, blank=True)),
                 ('start_date', models.DateField(verbose_name='Start Date')),
                 ('end_date', models.DateField(verbose_name='End Date')),
-                ('grid', models.ForeignKey(to='grid.Grid')),
+                ('grid', models.ForeignKey(to='grid.Grid', on_delete=django.db.models.deletion.CASCADE)),
             ],
             options={
                 'ordering': ('-start_date', '-end_date'),

homepage/models.py

@@ -1,6 +1,7 @@
 import datetime
 
 from django.db import models
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from grid.models import Grid
@@ -16,7 +17,7 @@ def get_current(self):
 
 class Dpotw(BaseModel):
 
-    package = models.ForeignKey(Package)
+    package = models.ForeignKey(Package, on_delete=models.CASCADE)
     start_date = models.DateField(_("Start Date"))
     end_date = models.DateField(_("End Date"))
 
@@ -32,14 +33,13 @@ class Meta:
     def __str__(self):
         return '%s : %s - %s' % (self.package.title, self.start_date, self.end_date)
 
-    @models.permalink
     def get_absolute_url(self):
-        return ("package", [self.package.slug])
+        return reverse("package", args=[self.package.slug])
 
 
 class Gotw(BaseModel):
 
-    grid = models.ForeignKey(Grid)
+    grid = models.ForeignKey(Grid, on_delete=models.CASCADE)
 
     start_date = models.DateField(_("Start Date"))
     end_date = models.DateField(_("End Date"))
@@ -56,9 +56,8 @@ class Meta:
     def __str__(self):
         return '%s : %s - %s' % (self.grid.title, self.start_date, self.end_date)
 
-    @models.permalink
     def get_absolute_url(self):
-        return ("grid", [self.grid.slug])
+        return reverse("grid", args=[self.grid.slug])
 
 
 class PSA(BaseModel):

homepage/tests/data.py

@@ -137,10 +137,10 @@ def load():
         #permissions=[[u'delete_gridpackage', u'grid', u'gridpackage'], [u'delete_feature', u'grid', u'feature']],
     )
     group1.permissions.clear()
-    group1.permissions = [
+    group1.permissions.set([
         Permission.objects.get(codename='delete_gridpackage'),
         Permission.objects.get(codename='delete_feature')
-        ]
+    ])
 
     user1, created = User.objects.get_or_create(
         pk=1,
@@ -170,7 +170,7 @@ def load():
         email='',
         date_joined='2010-01-01 12:00:00',
     )
-    user2.groups = [group1]
+    user2.groups.set([group1])
     user2.set_password('cleaner')
     user2.save()
 

homepage/tests/test_views.py

@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 
 from grid.models import Grid

package/context_processors.py

@@ -3,7 +3,7 @@
 
 def used_packages_list(request):
     context = {}
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         cache_key = "sitewide_used_packages_list_%s" % request.user.pk
         used_packages_list = cache.get(cache_key)
         if used_packages_list is None:

package/migrations/0001_initial.py

@@ -66,7 +66,7 @@ class Migration(migrations.Migration):
                 ('last_fetched', models.DateTimeField(default=django.utils.timezone.now, null=True, blank=True)),
                 ('documentation_url', models.URLField(default='', null=True, verbose_name='Documentation URL', blank=True)),
                 ('commit_list', models.TextField(verbose_name='Commit List', blank=True)),
-                ('category', models.ForeignKey(verbose_name='Installation', to='package.Category')),
+                ('category', models.ForeignKey(verbose_name='Installation', to='package.Category', on_delete=django.db.models.deletion.CASCADE)),
                 ('created_by', models.ForeignKey(related_name='creator', on_delete=django.db.models.deletion.SET_NULL, blank=True, to=settings.AUTH_USER_MODEL, null=True)),
                 ('last_modified_by', models.ForeignKey(related_name='modifier', on_delete=django.db.models.deletion.SET_NULL, blank=True, to=settings.AUTH_USER_MODEL, null=True)),
                 ('usage', models.ManyToManyField(to=settings.AUTH_USER_MODEL, blank=True)),
@@ -86,7 +86,7 @@ class Migration(migrations.Migration):
                 ('title', models.CharField(max_length='100', verbose_name='Title')),
                 ('url', models.URLField(verbose_name='URL')),
                 ('active', models.BooleanField(default=True, help_text='Moderators have to approve links before they are provided', verbose_name='Active')),
-                ('package', models.ForeignKey(to='package.Package')),
+                ('package', models.ForeignKey(to='package.Package', on_delete=django.db.models.deletion.CASCADE)),
             ],
             options={
                 'ordering': ['title'],
@@ -106,7 +106,7 @@ class Migration(migrations.Migration):
                 ('upload_time', models.DateTimeField(help_text='When this was uploaded to PyPI', null=True, verbose_name='upload_time', blank=True)),
                 ('development_status', models.IntegerField(default=0, verbose_name='Development Status', choices=[(0, 'Unknown'), (1, 'Development Status :: 1 - Planning'), (2, 'Development Status :: 2 - Pre-Alpha'), (3, 'Development Status :: 3 - Alpha'), (4, 'Development Status :: 4 - Beta'), (5, 'Development Status :: 5 - Production/Stable'), (6, 'Development Status :: 6 - Mature'), (7, 'Development Status :: 7 - Inactive')])),
                 ('supports_python3', models.BooleanField(default=False, verbose_name='Supports Python 3')),
-                ('package', models.ForeignKey(blank=True, to='package.Package', null=True)),
+                ('package', models.ForeignKey(blank=True, to='package.Package', null=True, on_delete=django.db.models.deletion.CASCADE)),
             ],
             options={
                 'ordering': ['-upload_time'],
@@ -117,7 +117,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='commit',
             name='package',
-            field=models.ForeignKey(to='package.Package'),
+            field=models.ForeignKey(to='package.Package', on_delete=django.db.models.deletion.CASCADE),
             preserve_default=True,
         ),
     ]