From 04b5d86b6c194d5d2f172a386589b6a58a47e8ca Mon Sep 17 00:00:00 2001 From: Douglas Paz Date: Fri, 7 Dec 2018 09:58:10 -0300 Subject: [PATCH 1/7] Add icon field in RepositoryCategory --- .../migrations/0027_repositorycategory_icon.py | 18 ++++++++++++++++++ bothub/common/models.py | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 bothub/common/migrations/0027_repositorycategory_icon.py diff --git a/bothub/common/migrations/0027_repositorycategory_icon.py b/bothub/common/migrations/0027_repositorycategory_icon.py new file mode 100644 index 00000000..ccc65153 --- /dev/null +++ b/bothub/common/migrations/0027_repositorycategory_icon.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.3 on 2018-12-07 12:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('common', '0026_auto_20181010_1704'), + ] + + operations = [ + migrations.AddField( + model_name='repositorycategory', + name='icon', + field=models.CharField(default='botinho', max_length=16, verbose_name='icon'), + ), + ] diff --git a/bothub/common/models.py b/bothub/common/models.py index b390f4b5..944c3b9f 100644 --- a/bothub/common/models.py +++ b/bothub/common/models.py @@ -44,6 +44,10 @@ class Meta: name = models.CharField( _('name'), max_length=32) + icon = models.CharField( + _('icon'), + max_length=16, + default='botinho') def __str__(self): return self.name # pragma: no cover From 1f69fd19f7d0f5185f9a15bb5156f5f4ca4208b3 Mon Sep 17 00:00:00 2001 From: Douglas Paz Date: Fri, 7 Dec 2018 10:00:03 -0300 Subject: [PATCH 2/7] Add RepositoryCategory in admin --- bothub/common/admin.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bothub/common/admin.py b/bothub/common/admin.py index 70698d85..31ef03a5 100644 --- a/bothub/common/admin.py +++ b/bothub/common/admin.py @@ -4,6 +4,7 @@ from bothub.common.models import Repository from bothub.common.models import RepositoryUpdate +from bothub.common.models import RepositoryCategory class RepositoryUpdateInline(admin.TabularInline): @@ -57,3 +58,10 @@ class RepositoryAdmin(admin.ModelAdmin): inlines = [ RepositoryUpdateInline, ] + +@admin.register(RepositoryCategory) +class RepositoryCategoryAdmin(admin.ModelAdmin): + list_display = [ + '__str__', + 'icon', + ] From 7b97a55746e83c40a23b31cd8007b67e9df9a3da Mon Sep 17 00:00:00 2001 From: Douglas Paz Date: Fri, 7 Dec 2018 10:06:21 -0300 Subject: [PATCH 3/7] Add icon field in category serializer --- bothub/api/v2/repository/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bothub/api/v2/repository/serializers.py b/bothub/api/v2/repository/serializers.py index 418d472b..cd0f9481 100644 --- a/bothub/api/v2/repository/serializers.py +++ b/bothub/api/v2/repository/serializers.py @@ -15,6 +15,7 @@ class Meta: fields = [ 'id', 'name', + 'icon', ] From dd94f9ac33303e0d75c62da3006ada7fdeebb0da Mon Sep 17 00:00:00 2001 From: Douglas Paz Date: Fri, 7 Dec 2018 10:07:24 -0300 Subject: [PATCH 4/7] lint --- bothub/common/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bothub/common/admin.py b/bothub/common/admin.py index 31ef03a5..222d9221 100644 --- a/bothub/common/admin.py +++ b/bothub/common/admin.py @@ -59,6 +59,7 @@ class RepositoryAdmin(admin.ModelAdmin): RepositoryUpdateInline, ] + @admin.register(RepositoryCategory) class RepositoryCategoryAdmin(admin.ModelAdmin): list_display = [ From 85694a3a7a9f2b68931ce02aa412e47eb33ed87f Mon Sep 17 00:00:00 2001 From: Douglas Paz Date: Wed, 12 Dec 2018 18:35:28 -0300 Subject: [PATCH 5/7] Fix #220 --- bothub/api/v1/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bothub/api/v1/views.py b/bothub/api/v1/views.py index 95deb2cc..18538fd0 100644 --- a/bothub/api/v1/views.py +++ b/bothub/api/v1/views.py @@ -989,7 +989,7 @@ class RepositoryUpdatesViewSet( mixins.ListModelMixin, GenericViewSet): queryset = RepositoryUpdate.objects.filter( - training_started_at__isnull=False) + training_started_at__isnull=False).order_by('-trained_at') serializer_class = RepositoryUpdateSerializer filter_class = RepositoryUpdatesFilter permission_classes = [ From 3ac793c4f217033f86cc6f0fb8689e61c3f5643a Mon Sep 17 00:00:00 2001 From: Douglas Paz Date: Mon, 17 Dec 2018 17:37:50 -0300 Subject: [PATCH 6/7] Update Pipfile --- Pipfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 58dca00c..ce7bcb38 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -18,10 +18,10 @@ "default": { "certifi": { "hashes": [ - "sha256:339dc09518b07e2fa7eda5450740925974815557727d6bd35d319c1524a04a4c", - "sha256:6d58c986d22b038c8c0df30d639f23a3e6d172a05c3583e766f4c0b785c0986a" + "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7", + "sha256:993f830721089fef441cdfeb4b2c8c9df86f0c63239f06bd025a76a7daddb033" ], - "version": "==2018.10.15" + "version": "==2018.11.29" }, "chardet": { "hashes": [ @@ -247,11 +247,11 @@ }, "ipython": { "hashes": [ - "sha256:a5781d6934a3341a1f9acb4ea5acdc7ea0a0855e689dbe755d070ca51e995435", - "sha256:b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd" + "sha256:6a9496209b76463f1dec126ab928919aaf1f55b38beb9219af3fe202f6bbdd12", + "sha256:f69932b1e806b38a7818d9a1e918e5821b685715040b48e59c657b3c7961b742" ], "index": "pypi", - "version": "==7.1.1" + "version": "==7.2.0" }, "ipython-genutils": { "hashes": [ @@ -262,10 +262,10 @@ }, "jedi": { "hashes": [ - "sha256:0191c447165f798e6a730285f2eee783fff81b0d3df261945ecb80983b5c3ca7", - "sha256:b7493f73a2febe0dc33d51c99b474547f7f6c0b2c8fb2b21f453eef204c12148" + "sha256:571702b5bd167911fe9036e5039ba67f820d6502832285cde8c881ab2b2149fd", + "sha256:c8481b5e59d34a5c7c42e98f6625e633f6ef59353abea6437472c7ec2093f191" ], - "version": "==0.13.1" + "version": "==0.13.2" }, "mccabe": { "hashes": [ @@ -327,17 +327,17 @@ }, "pygments": { "hashes": [ - "sha256:6301ecb0997a52d2d31385e62d0a4a4cf18d2f2da7054a5ddad5c366cd39cee7", - "sha256:82666aac15622bd7bb685a4ee7f6625dd716da3ef7473620c192c0168aae64fc" + "sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a", + "sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d" ], - "version": "==2.3.0" + "version": "==2.3.1" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" ], - "version": "==1.11.0" + "version": "==1.12.0" }, "traitlets": { "hashes": [ From 1b6b391208fd7c77814a01defc2ec9046467dc62 Mon Sep 17 00:00:00 2001 From: Douglas Paz Date: Mon, 17 Dec 2018 17:40:07 -0300 Subject: [PATCH 7/7] Bump version to 1.18.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1887f3f9..7fe40a7b 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name='bothub-engine', - version='1.17.0', + version='1.18.0', description='Bothub Engine', packages=find_packages(), install_requires=[