summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelle van der Waa <jelle@archlinux.org>2020-08-06 21:45:53 +0200
committerjelle van der Waa <jelle@vdwaa.nl>2020-09-11 21:23:54 +0200
commita06400ee239f3563660153ca36084877512f9aea (patch)
tree7ee2f40eadbbcb437587a3c5d3043aa77421a521
parent145ad176a6a7c6e40ff4f0df57a454a03bf5b809 (diff)
downloadarchweb-a06400ee239f3563660153ca36084877512f9aea.tar.gz
archweb-a06400ee239f3563660153ca36084877512f9aea.zip
Remove own implementation of PositiveBigIntegerField
Django 3.1 now includes a PositiveBigIntegerField. Closes: #292
-rw-r--r--main/fields.py13
-rw-r--r--main/migrations/0001_initial.py5
-rw-r--r--main/models.py5
3 files changed, 4 insertions, 19 deletions
diff --git a/main/fields.py b/main/fields.py
deleted file mode 100644
index b4c26007..00000000
--- a/main/fields.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from django.db import models
-
-
-class PositiveBigIntegerField(models.BigIntegerField):
- def get_internal_type(self):
- return "BigIntegerField"
-
- def formfield(self, **kwargs):
- defaults = {'min_value': 0}
- defaults.update(kwargs)
- return super(PositiveBigIntegerField, self).formfield(**defaults)
-
-# vim: set ts=4 sw=4 et:
diff --git a/main/migrations/0001_initial.py b/main/migrations/0001_initial.py
index cf7159e6..cf9b48f6 100644
--- a/main/migrations/0001_initial.py
+++ b/main/migrations/0001_initial.py
@@ -2,7 +2,6 @@
from django.db import models, migrations
-import main.fields
import django.db.models.deletion
from django.conf import settings
@@ -56,8 +55,8 @@ class Migration(migrations.Migration):
('pkgdesc', models.TextField(null=True, verbose_name='description')),
('url', models.CharField(max_length=255, null=True, verbose_name='URL')),
('filename', models.CharField(max_length=255)),
- ('compressed_size', main.fields.PositiveBigIntegerField()),
- ('installed_size', main.fields.PositiveBigIntegerField()),
+ ('compressed_size', models.PositiveBigIntegerField()),
+ ('installed_size', models.PositiveBigIntegerField()),
('build_date', models.DateTimeField(null=True)),
('last_update', models.DateTimeField(db_index=True)),
('files_last_update', models.DateTimeField(null=True, blank=True)),
diff --git a/main/models.py b/main/models.py
index 7f60276c..f80786af 100644
--- a/main/models.py
+++ b/main/models.py
@@ -6,7 +6,6 @@ from django.db.models import Q
from django.contrib.auth.models import User
from django.contrib.sites.models import Site
-from .fields import PositiveBigIntegerField
from .utils import set_created_field, DependStandin, SignatureWrapper
from devel.models import DeveloperKey
from packages.alpm import AlpmAPI
@@ -100,8 +99,8 @@ class Package(models.Model):
pkgdesc = models.TextField('description', null=True)
url = models.CharField('URL', max_length=255, null=True)
filename = models.CharField(max_length=255)
- compressed_size = PositiveBigIntegerField()
- installed_size = PositiveBigIntegerField()
+ compressed_size = models.PositiveBigIntegerField()
+ installed_size = models.PositiveBigIntegerField()
build_date = models.DateTimeField(null=True)
last_update = models.DateTimeField(db_index=True)
files_last_update = models.DateTimeField(null=True, blank=True)