Skip to content
Snippets Groups Projects
Commit 80ad106a authored by Bastien Abadie's avatar Bastien Abadie
Browse files

Merge branch 'django-2.1' into 'master'

Upgrade to django 2.1

See merge request !76
parents 28b2dd1a c9132f23
No related branches found
No related tags found
1 merge request!76Upgrade to django 2.1
......@@ -82,7 +82,7 @@ class Migration(migrations.Migration):
name='watched_branches',
field=arkindex.project.fields.ArrayField(
base_field=models.CharField(max_length=50),
default=['refs/heads/master'],
default=arkindex.dataimport.models.repository_default_branches,
size=None,
),
),
......
......@@ -146,6 +146,15 @@ class RepositorySource(Enum):
GitLab = 'gitlab'
def repository_default_branches():
'''
This is needed to avoid re-using the same list instance
as Repository.watched_branches default on new instances
See Django warning postgres.E003
'''
return list('refs/heads/master')
class Repository(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4)
url = models.URLField(unique=True)
......@@ -154,7 +163,7 @@ class Repository(models.Model):
clone_token = models.CharField(max_length=250)
corpus = models.ForeignKey('documents.Corpus', on_delete=models.CASCADE, related_name='repos')
user = models.ForeignKey('users.User', on_delete=models.CASCADE, related_name='repos')
watched_branches = ArrayField(models.CharField(max_length=50), default=['refs/heads/master'])
watched_branches = ArrayField(models.CharField(max_length=50), default=repository_default_branches)
class Meta:
verbose_name_plural = 'repositories'
......
......@@ -2,7 +2,7 @@ celery==4.2.0
celery_once==2.0.0
certifi==2017.7.27.1
chardet==3.0.4
Django==2.0
Django==2.1
django-enumfields==0.10.0
djangorestframework==3.7.1
django-webpack-loader==0.5.0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment