Merged tests for migrations file

Author: Megh-Thakkar

.travis.yml

@@ -8,3 +8,4 @@ install:
 
 script:
   - python manage.py migrate
+  - python manage.py test

biojs/settings.py

@@ -25,9 +25,9 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 try:
     from config import *
-    DEBUG = False
+    DEBUG = DEBUG
 except:
-    DEBUG = True
+    DEGUB = True
 
 ALLOWED_HOSTS = ['*']
 

main/management/commands/updatecomponents.py

@@ -105,19 +105,33 @@ def handle(self, *args, **options):
 
             if _component.github_url:
                 print _component.github_url
-                github_data = get_github_data(_component.github_url)
+                try:
+                    github_data = get_github_data(_component.github_url)
+                except:
+                    continue
                 _component.stars = github_data['stargazers_count']
                 _component.forks = github_data['forks']
-                _component.watchers = github_data['watchers']
+                # subscriber_count
+                _component.watchers = github_data['subscribers_count']
                 _component.icon_url = github_data['owner']['avatar_url']
                 _component.open_issues = github_data['open_issues']
                 try:
                     _component.license = github_data['license']['name']
                 except:
                     pass
+                try:
+                    str_date = github_data['created_at']
+                    req_date = datetime.strptime(str_date, "%Y-%m-%dT%H:%M:%SZ") #This object is timezone unaware
+                    aware_date = pytz.utc.localize(req_date)    #This object is now timezone aware
+                    _component.created_time = aware_date
+                except:
+                    pass
                 _component.save()
                 print str(github_data['contributors_url']) + '?client_id=' + GITHUB_CLIENT_ID + '&client_secret=' + GITHUB_CLIENT_SECRET
-                contributors_data = get_contributors_data(str(github_data['contributors_url']) + '?client_id=' + GITHUB_CLIENT_ID + '&client_secret=' + GITHUB_CLIENT_SECRET)
+                try:
+                    contributors_data = get_contributors_data(str(github_data['contributors_url']) + '?client_id=' + GITHUB_CLIENT_ID + '&client_secret=' + GITHUB_CLIENT_SECRET)
+                except:
+                    continue
                 commits = 0
                 count = 0
                 for contributor in contributors_data:
@@ -133,7 +147,10 @@ def handle(self, *args, **options):
                         _contribution = Contribution.objects.create(component=_component, contributor=_contributor, contributions=contributor["contributions"])
                     commits += _contribution.contributions
                     count +=1
-                _component.downloads = get_downloads(str(github_data['downloads_url']) + '?client_id=' + GITHUB_CLIENT_ID + '&client_secret=' + GITHUB_CLIENT_SECRET)
+                try:
+                    _component.downloads = get_downloads(str(github_data['downloads_url']) + '?client_id=' + GITHUB_CLIENT_ID + '&client_secret=' + GITHUB_CLIENT_SECRET)
+                except:
+                    pass
                 _component.commits = commits
                 _component.no_of_contributors = count
                 _component.save()

main/migrations/0009_auto_20180609_0855.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.13 on 2018-06-09 08:55
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0008_auto_20180603_0800'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='component',
+            name='created_time',
+            field=models.DateTimeField(null=True),
+        ),
+    ]

main/models.py

@@ -21,7 +21,7 @@ class Component(models.Model):
     name = models.CharField(max_length=100)
     stars = models.IntegerField(default=0, null=True)
     downloads = models.BigIntegerField(default=0, null=True)
-    created_time = models.DateTimeField(editable=False, null=True)
+    created_time = models.DateTimeField(null=True)
     modified_time = models.DateTimeField(null=True)
     tags = models.ManyToManyField('Tag', null=True)
     icon_url = models.URLField(null=True, blank=True)
@@ -43,8 +43,6 @@ class Component(models.Model):
     license = models.CharField(max_length=50, null=True)
 
     def save(self, *args, **kwargs):
-        if not self.id:
-            self.created_time = timezone.now()
         if not self.url_name:
             self.url_name = (str(self.name).replace(' ', '-')).replace('/', '-').replace('@','').lower()
         return super(Component, self).save(*args, **kwargs)

main/serializers.py

@@ -44,17 +44,28 @@ class Meta:
 
 class DetailComponentSerializer(serializers.ModelSerializer):
     tags = serializers.SerializerMethodField()
+    github_url = serializers.SerializerMethodField()
+
     def get_tags(self, obj):
         tags = []
         for t in obj.tags.all():
             tags.append(t.name)
         return tags
+
+    def get_github_url(self, obj):
+        if obj.github_url:
+            list_url = obj.github_url.split('/')
+            return list_url[0] + '//github.com/' + list_url[4] + '/' + list_url[5].split('?')[0] #  remove get request params(client_id and secret)
+        else:
+            return ''
+
     class Meta:
         model = Component
         fields = (
                 'name',
                 'stars',
                 'downloads',
+                'created_time',
                 'modified_time',
                 'tags',
                 'icon_url',
@@ -65,11 +76,9 @@ class Meta:
                 'forks',
                 'watchers',
                 'no_of_contributors',
+                'open_issues',
                 'version',
                 'author',
-                'author_email',
-                'npm_url',
-                'homepage_url',
                 'license',
             )
 

main/views.py

@@ -27,8 +27,8 @@ def all_components(request):    # requested on_load() for querying
         })
 
 def top_components(request):
-    top_components = TopComponentSerializer(Component.objects.all().order_by('-downloads')[:10], many=True)
-    print top_components
+    # Download data is from Github and hence stars are used
+    top_components = TopComponentSerializer(Component.objects.all().order_by('-stars')[:10], many=True)
     return JsonResponse({
         'top_components':top_components.data,
         })

static/admin/css/base.css

@@ -187,11 +187,15 @@ p.mini {
     margin-top: -3px;
 }
 
-.help, p.help, form p.help {
+.help, p.help, form p.help, div.help, form div.help, div.help li {
     font-size: 11px;
     color: #999;
 }
 
+div.help ul {
+     margin-bottom: 0;
+}
+
 .help-tooltip {
     cursor: help;
 }
@@ -410,6 +414,9 @@ input, textarea, select, .form-row p, form .button {
     font-weight: normal;
     font-size: 13px;
 }
+.form-row div.help {
+    padding: 2px 3px;
+}
 
 textarea {
     vertical-align: top;
@@ -731,7 +738,7 @@ a.deletelink:focus, a.deletelink:hover {
 
 .object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink {
     background-repeat: no-repeat;
-    background-position: 93% center;
+    background-position: right 7px center;
     padding-right: 26px;
 }
 

static/admin/css/changelists.css

@@ -166,6 +166,8 @@
 #changelist-filter a {
     display: block;
     color: #999;
+    text-overflow: ellipsis;
+    overflow-x: hidden;
 }
 
 #changelist-filter li.selected {

static/admin/css/dashboard.css

@@ -21,9 +21,6 @@
 
 ul.actionlist li {
     list-style-type: none;
-}
-
-ul.actionlist li {
     overflow: hidden;
     text-overflow: ellipsis;
     -o-text-overflow: ellipsis;