Merge pull request #206 from mvantellingen/fix-warnings

Fix warnings

src/localshop/apps/accounts/migrations/0001_initial.py

@@ -48,7 +48,7 @@ class Migration(migrations.Migration):
                 ('secret_key', models.UUIDField(editable=False, max_length=32, blank=True, help_text=b'The secret key', unique=True, verbose_name=b'Secret key', db_index=True)),
                 ('comment', models.CharField(default=b'', max_length=255, null=True, help_text="A comment about this credential, e.g. where it's being used", blank=True)),
                 ('last_usage', models.DateTimeField(null=True, blank=True)),
-                ('user', models.ForeignKey(related_name='access_keys', to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(related_name='access_keys', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
             options={
                 'ordering': ['-created'],
@@ -76,8 +76,8 @@ class Migration(migrations.Migration):
                 ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, verbose_name='created', editable=False)),
                 ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, verbose_name='modified', editable=False)),
                 ('role', models.CharField(max_length=100, choices=[(b'owner', 'Owner'), (b'developer', 'Developer')])),
-                ('team', models.ForeignKey(related_name='members', to='accounts.Team')),
-                ('user', models.ForeignKey(related_name='team_memberships', to=settings.AUTH_USER_MODEL)),
+                ('team', models.ForeignKey(related_name='members', to='accounts.Team', on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(related_name='team_memberships', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
             options={
             },

src/localshop/apps/accounts/models.py

@@ -30,7 +30,7 @@ class AccessKey(models.Model):
     created = AutoCreatedField()
 
     user = models.ForeignKey(
-        settings.AUTH_USER_MODEL, related_name='access_keys')
+        settings.AUTH_USER_MODEL, related_name='access_keys', on_delete=models.CASCADE)
 
     access_key = models.UUIDField(
         verbose_name='Access key', help_text='The access key',
@@ -72,9 +72,9 @@ def owners(self):
 
 
 class TeamMember(TimeStampedModel):
-    team = models.ForeignKey(Team, related_name='members')
+    team = models.ForeignKey(Team, related_name='members', on_delete=models.CASCADE)
     user = models.ForeignKey(
-        settings.AUTH_USER_MODEL, related_name='team_memberships')
+        settings.AUTH_USER_MODEL, related_name='team_memberships', on_delete=models.CASCADE)
     role = models.CharField(max_length=100, choices=[
         ('owner', _("Owner")),
         ('developer', _("Developer")),

src/localshop/apps/accounts/urls.py

@@ -2,23 +2,25 @@
 
 from localshop.apps.accounts import views
 
+app_name = 'accounts'
+
 urlpatterns = [
-    url('^profile/$', views.ProfileView.as_view(), name='profile'),
-    url('^access-keys/$', views.AccessKeyListView.as_view(), name='access_key_list'),
-    url('^access-keys/new$', views.AccessKeyCreateView.as_view(), name='access_key_create'),
-    url('^access-keys/(?P<pk>\d+)/', include([
-        url('^secret$', views.AccessKeySecretView.as_view(), name='access_key_secret'),
-        url('^edit$', views.AccessKeyUpdateView.as_view(), name='access_key_edit'),
-        url('^delete$', views.AccessKeyDeleteView.as_view(), name='access_key_delete'),
+    url(r'^profile/$', views.ProfileView.as_view(), name='profile'),
+    url(r'^access-keys/$', views.AccessKeyListView.as_view(), name='access_key_list'),
+    url(r'^access-keys/new$', views.AccessKeyCreateView.as_view(), name='access_key_create'),
+    url(r'^access-keys/(?P<pk>\d+)/', include([
+        url(r'^secret$', views.AccessKeySecretView.as_view(), name='access_key_secret'),
+        url(r'^edit$', views.AccessKeyUpdateView.as_view(), name='access_key_edit'),
+        url(r'^delete$', views.AccessKeyDeleteView.as_view(), name='access_key_delete'),
     ])),
 
-    url('^teams/$', views.TeamListView.as_view(), name='team_list'),
-    url('^teams/create$', views.TeamCreateView.as_view(), name='team_create'),
-    url('^teams/(?P<pk>\d+)/', include([
-        url('^$', views.TeamDetailView.as_view(), name='team_detail'),
-        url('^edit$', views.TeamUpdateView.as_view(), name='team_edit'),
-        url('^delete$', views.TeamDeleteView.as_view(), name='team_delete'),
-        url('^member-add$', views.TeamMemberAddView.as_view(), name='team_member_add'),
-        url('^member-remove$', views.TeamMemberRemoveView.as_view(), name='team_member_remove'),
+    url(r'^teams/$', views.TeamListView.as_view(), name='team_list'),
+    url(r'^teams/create$', views.TeamCreateView.as_view(), name='team_create'),
+    url(r'^teams/(?P<pk>\d+)/', include([
+        url(r'^$', views.TeamDetailView.as_view(), name='team_detail'),
+        url(r'^edit$', views.TeamUpdateView.as_view(), name='team_edit'),
+        url(r'^delete$', views.TeamDeleteView.as_view(), name='team_delete'),
+        url(r'^member-add$', views.TeamMemberAddView.as_view(), name='team_member_add'),
+        url(r'^member-remove$', views.TeamMemberRemoveView.as_view(), name='team_member_remove'),
     ]))
 ]

src/localshop/apps/dashboard/urls.py

@@ -2,69 +2,66 @@
 
 from localshop.apps.dashboard import views
 
+app_name = 'dashboard'
+
 repository_urls = [
     # Package urls
-    url('^packages/add/$',
+    url(r'^packages/add/$',
         views.PackageAddView.as_view(),
         name='package_add'),
-    url('^packages/(?P<name>[-\._\w]+)/', include([
-        url('^$',
+    url(r'^packages/(?P<name>[-\._\w]+)/', include([
+        url(r'^$',
             views.PackageDetailView.as_view(),
             name='package_detail'),
-        url('^refresh-from-upstream/$',
+        url(r'^refresh-from-upstream/$',
             views.PackageRefreshView.as_view(),
             name='package_refresh'),
-        url('^release-mirror-file/$',
+        url(r'^release-mirror-file/$',
             views.PackageMirrorFileView.as_view(),
             name='package_mirror_file'),
     ])),
 
-    # Settings
-    url(r'^settings/', include([
-
-        # CIDR
-        url(r'^cidr/$',
-            views.CidrListView.as_view(), name='cidr_index'),
-        url(r'^cidr/create$',
-            views.CidrCreateView.as_view(), name='cidr_create'),
-        url(r'^cidr/(?P<pk>\d+)/edit',
-            views.CidrUpdateView.as_view(), name='cidr_edit'),
-        url(r'^cidr/(?P<pk>\d+)/delete',
-            views.CidrDeleteView.as_view(), name='cidr_delete'),
-
-        # Credentials
-        url(r'^credentials/$',
-            views.CredentialListView.as_view(),
-            name='credential_index'),
-        url(r'^credentials/create$',
-            views.CredentialCreateView.as_view(),
-            name='credential_create'),
-        url(r'^credentials/(?P<access_key>[-a-f0-9]+)/secret',
-            views.CredentialSecretKeyView.as_view(),
-            name='credential_secret'),
-        url(r'^credentials/(?P<access_key>[-a-f0-9]+)/edit',
-            views.CredentialUpdateView.as_view(),
-            name='credential_edit'),
-        url(r'^credentials/(?P<access_key>[-a-f0-9]+)/delete',
-            views.CredentialDeleteView.as_view(),
-            name='credential_delete'),
+    # CIDR
+    url(r'^settings/cidr/$',
+        views.CidrListView.as_view(), name='cidr_index'),
+    url(r'^settings/cidr/create$',
+        views.CidrCreateView.as_view(), name='cidr_create'),
+    url(r'^settings/cidr/(?P<pk>\d+)/edit',
+        views.CidrUpdateView.as_view(), name='cidr_edit'),
+    url(r'^settings/cidr/(?P<pk>\d+)/delete',
+        views.CidrDeleteView.as_view(), name='cidr_delete'),
 
-        url(r'^teams/$', views.TeamAccessView.as_view(), name='team_access'),
+    # Credentials
+    url(r'^settings/credentials/$',
+        views.CredentialListView.as_view(),
+        name='credential_index'),
+    url(r'^settings/credentials/create$',
+        views.CredentialCreateView.as_view(),
+        name='credential_create'),
+    url(r'^settings/credentials/(?P<access_key>[-a-f0-9]+)/secret',
+        views.CredentialSecretKeyView.as_view(),
+        name='credential_secret'),
+    url(r'^settings/credentials/(?P<access_key>[-a-f0-9]+)/edit',
+        views.CredentialUpdateView.as_view(),
+        name='credential_edit'),
+    url(r'^settings/credentials/(?P<access_key>[-a-f0-9]+)/delete',
+        views.CredentialDeleteView.as_view(),
+        name='credential_delete'),
 
-    ], namespace='repo_settings')),
+    url(r'^settings/teams/$', views.TeamAccessView.as_view(), name='team_access'),
 ]
 
 urlpatterns = [
-    url('^$', views.IndexView.as_view(), name='index'),
-    url('^repositories/create$', views.RepositoryCreateView.as_view(), name='repository_create'),
+    url(r'^$', views.IndexView.as_view(), name='index'),
+    url(r'^repositories/create$', views.RepositoryCreateView.as_view(), name='repository_create'),
 
-    url('^repositories/(?P<slug>[^/]+)/', include([
-        url('^$', views.RepositoryDetailView.as_view(), name='repository_detail'),
-        url('^edit$', views.RepositoryUpdateView.as_view(), name='repository_edit'),
-        url('^delete$', views.RepositoryDeleteView.as_view(), name='repository_delete'),
-        url('^refresh$', views.RepositoryRefreshView.as_view(), name='repository_refresh'),
+    url(r'^repositories/(?P<slug>[^/]+)/', include([
+        url(r'^$', views.RepositoryDetailView.as_view(), name='repository_detail'),
+        url(r'^edit$', views.RepositoryUpdateView.as_view(), name='repository_edit'),
+        url(r'^delete$', views.RepositoryDeleteView.as_view(), name='repository_delete'),
+        url(r'^refresh$', views.RepositoryRefreshView.as_view(), name='repository_refresh'),
     ])),
 
-    url('^repositories/(?P<repo>[^/]+)/', include(repository_urls))
+    url(r'^repositories/(?P<repo>[^/]+)/', include(repository_urls))
 
 ]

src/localshop/apps/dashboard/views/cidr.py

@@ -25,7 +25,7 @@ class CidrCreateView(RepositoryMixin, generic.CreateView):
     template_name = 'dashboard/repository_settings/cidr_form.html'
 
     def get_success_url(self):
-        return reverse('dashboard:repo_settings:cidr_index', kwargs={
+        return reverse('dashboard:cidr_index', kwargs={
             'repo': self.repository.slug,
         })
 
@@ -38,7 +38,7 @@ class CidrUpdateView(RepositoryMixin, generic.UpdateView):
     template_name = 'dashboard/repository_settings/cidr_form.html'
 
     def get_success_url(self):
-        return reverse('dashboard:repo_settings:cidr_index', kwargs={
+        return reverse('dashboard:cidr_index', kwargs={
             'repo': self.repository.slug,
         })
 
@@ -51,7 +51,7 @@ class CidrDeleteView(RepositoryMixin, generic.DeleteView):
     template_name = 'dashboard/repository_settings/cidr_confirm_delete.html'
 
     def get_success_url(self):
-        return reverse('dashboard:repo_settings:cidr_index', kwargs={
+        return reverse('dashboard:cidr_index', kwargs={
             'repo': self.repository.slug,
         })
 

src/localshop/apps/dashboard/views/credentials.py

@@ -38,7 +38,7 @@ def get_queryset(self):
         return self.repository.credentials.all()
 
     def get_success_url(self):
-        return reverse('dashboard:repo_settings:credential_index', kwargs={
+        return reverse('dashboard:credential_index', kwargs={
             'repo': self.repository.slug,
         })
 
@@ -63,7 +63,7 @@ def get_queryset(self):
         return self.repository.credentials.all()
 
     def get_success_url(self):
-        return reverse('dashboard:repo_settings:credential_index', kwargs={
+        return reverse('dashboard:credential_index', kwargs={
             'repo': self.repository.slug,
         })
 
@@ -73,6 +73,6 @@ class CredentialDeleteView(RepositoryMixin, generic.DeleteView):
     slug_url_kwarg = 'access_key'
 
     def get_success_url(self):
-        return reverse('dashboard:repo_settings:credential_index', kwargs={
+        return reverse('dashboard:credential_index', kwargs={
             'repo': self.repository.slug,
         })

src/localshop/apps/dashboard/views/misc.py

@@ -36,7 +36,7 @@ class TeamAccessView(RepositoryMixin, generic.FormView):
     template_name = 'dashboard/repository_settings/teams.html'
 
     def get_success_url(self):
-        return reverse('dashboard:repo_settings:team_access', kwargs={
+        return reverse('dashboard:team_access', kwargs={
             'repo': self.repository.slug,
         })
 

src/localshop/apps/packages/migrations/0001_initial.py

@@ -59,8 +59,8 @@ class Migration(migrations.Migration):
                 ('summary', models.TextField(blank=True)),
                 ('version', models.CharField(max_length=512)),
                 ('classifiers', models.ManyToManyField(to='packages.Classifier')),
-                ('package', models.ForeignKey(related_name='releases', to='packages.Package')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True)),
+                ('package', models.ForeignKey(related_name='releases', to='packages.Package', on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)),
             ],
             options={
                 'ordering': ['-version'],
@@ -80,8 +80,8 @@ class Migration(migrations.Migration):
                 ('md5_digest', models.CharField(max_length=512)),
                 ('python_version', models.CharField(max_length=25)),
                 ('url', models.CharField(max_length=1024, blank=True)),
-                ('release', models.ForeignKey(related_name='files', to='packages.Release')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True)),
+                ('release', models.ForeignKey(related_name='files', to='packages.Release', on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)),
             ],
             options={
             },

src/localshop/apps/packages/migrations/0004_auto_20150517_1612.py

@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='package',
             name='repository',
-            field=models.ForeignKey(related_name='packages', default=1, to='packages.Repository'),
+            field=models.ForeignKey(related_name='packages', default=1, to='packages.Repository', on_delete=models.CASCADE),
             preserve_default=False,
         ),
         migrations.AlterField(

src/localshop/apps/packages/models.py

@@ -87,7 +87,7 @@ class Package(models.Model):
 
     modified = AutoLastModifiedField()
 
-    repository = models.ForeignKey(Repository, related_name='packages')
+    repository = models.ForeignKey(Repository, related_name='packages', on_delete=models.CASCADE)
 
     name = models.CharField(max_length=200, db_index=True, validators=[
         RegexValidator(
@@ -155,11 +155,11 @@ class Release(models.Model):
 
     metadata_version = models.CharField(max_length=64, default=1.0)
 
-    package = models.ForeignKey(Package, related_name="releases")
+    package = models.ForeignKey(Package, related_name="releases", on_delete=models.CASCADE)
 
     summary = models.TextField(blank=True)
 
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)
 
     version = models.CharField(max_length=512)
 
@@ -208,7 +208,7 @@ class ReleaseFile(models.Model):
 
     modified = AutoLastModifiedField()
 
-    release = models.ForeignKey(Release, related_name="files")
+    release = models.ForeignKey(Release, related_name="files", on_delete=models.CASCADE)
 
     size = models.IntegerField(null=True)
 
@@ -224,7 +224,7 @@ class ReleaseFile(models.Model):
 
     url = models.CharField(max_length=1024, blank=True)
 
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)
 
     class Meta:
         unique_together = ('release', 'filetype', 'python_version', 'filename')

src/localshop/apps/packages/urls.py

@@ -3,6 +3,8 @@
 
 from localshop.apps.packages import views
 
+app_name = 'packages'
+
 urlpatterns = [
     url(r'^(?P<repo>[-\._\w]+)/?$', views.SimpleIndex.as_view(),
         name='simple_index'),

src/localshop/apps/packages/views.py

@@ -54,7 +54,7 @@ def post(self, request, repo):
         if not handler:
             return HttpResponseNotFound('Unknown action: %s' % action)
 
-        if not request.user.is_authenticated() and not request.credentials:
+        if not request.user.is_authenticated and not request.credentials:
             return HttpResponseForbidden(
                 "You need to be authenticated to upload packages")
 

src/localshop/apps/permissions/migrations/0001_initial.py

@@ -50,7 +50,7 @@ class Migration(migrations.Migration):
                 ('created', models.DateTimeField(default=django.utils.timezone.now)),
                 ('deactivated', models.DateTimeField(null=True, blank=True)),
                 ('comment', models.CharField(default=b'', max_length=255, null=True, help_text=b"A comment about this credential, e.g. where it's being used", blank=True)),
-                ('creator', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('creator', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
             options={
                 'ordering': ['-created'],

src/localshop/apps/permissions/migrations/0001_squashed_0002_remove_userena.py

@@ -40,7 +40,7 @@ class Migration(migrations.Migration):
                 ('created', models.DateTimeField(default=django.utils.timezone.now)),
                 ('deactivated', models.DateTimeField(null=True, blank=True)),
                 ('comment', models.CharField(default=b'', max_length=255, null=True, help_text=b"A comment about this credential, e.g. where it's being used", blank=True)),
-                ('creator', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('creator', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
             options={
                 'ordering': ['-created'],

src/localshop/apps/permissions/migrations/0002_auto_20150517_1857.py

@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='cidr',
             name='repository',
-            field=models.ForeignKey(related_name='cidr_list', default=1, to='packages.Repository'),
+            field=models.ForeignKey(related_name='cidr_list', default=1, to='packages.Repository', on_delete=models.CASCADE),
             preserve_default=False,
         ),
         migrations.AddField(
@@ -32,7 +32,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='credential',
             name='repository',
-            field=models.ForeignKey(related_name='credentials', default=1, to='packages.Repository'),
+            field=models.ForeignKey(related_name='credentials', default=1, to='packages.Repository', on_delete=models.CASCADE),
             preserve_default=False,
         ),
         migrations.AlterField(

src/localshop/apps/permissions/models.py

@@ -17,7 +17,7 @@ def has_access(self, ip_addr, with_credentials=True):
 class CIDR(models.Model):
     """Allow access based on the IP address of the client."""
     repository = models.ForeignKey(
-        'packages.Repository', related_name='cidr_list')
+        'packages.Repository', related_name='cidr_list', on_delete=models.CASCADE)
     cidr = models.CharField(
         'CIDR', max_length=128, help_text='IP addresses and/or subnet')
     label = models.CharField(
@@ -55,7 +55,7 @@ class Credential(models.Model):
     """Credentials are repository bound"""
     created = AutoCreatedField()
 
-    repository = models.ForeignKey('packages.Repository', related_name='credentials')
+    repository = models.ForeignKey('packages.Repository', related_name='credentials', on_delete=models.CASCADE)
     access_key = models.UUIDField(
         verbose_name='Access key',
         help_text='The access key',