Create django.yml

.github/workflows/django.yml

@@ -0,0 +1,50 @@
+name: Django CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+# Prevent multiple workflows with same branch/pull_request
+concurrency: 
+  group: ${{ github.ref_name }}
+  cancel-in-progress: true
+
+env:
+  PIPENV_VENV_IN_PROJECT: 1
+  ENV: development
+  SECRET_KEY: NOT SET
+  DJANGO_SUPERUSER_USERNAME: admin
+  DJANGO_SUPERUSER_PASSWORD: Django123
+  DJANGO_SUPERUSER_EMAIL: [email protected]
+
+jobs:
+
+  job_build_django:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7.5' # Closest version to 3.7.3 available.
+
+      - name: Install dependencies
+        run: |
+          python -V
+          PY=$(which python)
+          echo $PY
+          python -m pip install --upgrade pip
+          python -m pip install pipenv
+          python -m pipenv install --python $PY
+
+      - name: Run pylint
+        run: python -m pipenv run pylint infoscreen root 
+
+      - name: Verify migrations
+        run: |
+          python -m pipenv run python manage.py migrate
+      - name: Run tests
+        run: python -m pipenv run pytest

infoscreen/admin.py

@@ -8,10 +8,10 @@ class ScreenAdmin(root_models.CustomBaseAdmin):
     list_display = ['name']
     ordering = []
     list_filter = ['images', 'videos']
-    filter_horizontal = ['images','videos']
+    filter_horizontal = ['images', 'videos']
     search_fields = ['name', 'slug']
-    
-    
+
+
 class ScreenHasImageAdmin(admin.ModelAdmin):
     list_display = ['screen', 'image', 'nr']
     ordering = ['screen', 'nr']
@@ -36,8 +36,7 @@ class VideoAdmin(root_models.CustomBaseAdmin):
     search_fields = ['name']
 
 
-
 admin.site.register(infoscreen_models.Screen, ScreenAdmin)
 # admin.site.register(infoscreen_models.ScreenHasImage, ScreenHasImageAdmin)
 admin.site.register(infoscreen_models.Image, ImageAdmin)
-admin.site.register(infoscreen_models.Video, VideoAdmin)
+admin.site.register(infoscreen_models.Video, VideoAdmin)

infoscreen/apps.py

@@ -4,13 +4,13 @@
 class InfoScreenConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'infoscreen'
-    
+
     def ready(self):
-        
+
         from django.core import management
-        
+
         try:
             # https://docs.djangoproject.com/en/3.0/ref/django-admin/#createsuperuser
             management.call_command('createsuperuser', interactive=False)
         except:
-            pass
+            pass

infoscreen/constants/choices.py

@@ -1,4 +1,3 @@
-
 class Weekday:
     MON = 0
     TUE = 1
@@ -7,13 +6,5 @@ class Weekday:
     FRI = 4
     SAT = 5
     SUN = 6
-
-    CHOICES = [
-        (MON, "Mandag"),
-        (TUE, "Tirsdag"),
-        (WED, "Onsdag"),
-        (THU, "Torsdag"),
-        (FRI, "Fredag"),
-        (SAT, "Lørdag"),
-        (SUN, "Søndag")
-    ]
+
+    CHOICES = [(MON, 'Mandag'), (TUE, 'Tirsdag'), (WED, 'Onsdag'), (THU, 'Torsdag'), (FRI, 'Fredag'), (SAT, 'Lørdag'), (SUN, 'Søndag')]

infoscreen/models/color.py

@@ -1,31 +1,32 @@
+import re
+from django.core.exceptions import ValidationError
 from django.db import models
-
 from root import models as root_models
 
 
 class Color(root_models.CustomBaseModel):
     name = models.CharField(max_length=200, null=True, blank=True, verbose_name='navn')
-    hex = models.CharField(max_length=6, null=True, blank=True, verbose_name="hex", help_text="Fargekode i hex (6 symboler)")
+    hex = models.CharField(max_length=6, null=True, blank=True, verbose_name='hex', help_text='Fargekode i hex (6 symboler)')
 
     class Meta:
         ordering = []
         verbose_name = 'farge'
         verbose_name_plural = 'farger'
-        
+
     def __str__(self):
-        return f"{self.get_name()}"
-    
+        return f'{self.get_name()}'
+
     def get_name(self):
         if self.name:
             return self.name
         return self.hex
-    
+
     def as_css(self):
         # TODO: handle COLOR_RANDOM
         # if self.name == root_constants.COLOR_RANDOM:
-        #     return 
-        return f"#{self.hex}"
-    
+        #     return
+        return f'#{self.hex}'
+
     def clean(self, *args, **kwargs):
         super().clean(*args, **kwargs)
         errors = {}
@@ -34,8 +35,7 @@ def clean(self, *args, **kwargs):
                 errors['hex'] = 'Ugyldig format. Bruk 0-9 og A-F'
         if errors:
             raise ValidationError(errors)
-    
+
     def save(self, *args, **kwargs):
         self.clean()
         super().save(*args, **kwargs)
-

infoscreen/models/fields/__init__.py

@@ -1,2 +1,2 @@
 from .restricted_file import ContentTypeRestrictedFileField
-# from .weekday import WeekdayField
+# from .weekday import WeekdayField

infoscreen/models/fields/weekday.py

@@ -1,15 +1,15 @@
 # from django.db.models import IntegerField
-# 
+#
 # class WeekDayField(IntegerField):
-# 
+#
 #     def __init__(self, *args, **kwargs):
 #         kwargs['choices'] = self.DAYS
 #         super().__init__(*args, **kwargs)
-# 
-#     def clean(self, *args, **kwargs):        
+#
+#     def clean(self, *args, **kwargs):
 #         data = super().clean(*args, **kwargs)
 #         try:
 #             if data and 0 > data > 6: raise forms.ValidationError(_('Ikke eksisterende '))
 #         except AttributeError:
-#             pass        
+#             pass
 #         return data

infoscreen/models/image.py

@@ -2,9 +2,10 @@
 
 from root import models as root_models
 
+
 class Image(root_models.CustomBaseModel):
     name = models.CharField(max_length=140, null=True, blank=True)
     url = models.URLField(null=False, blank=False)
-    
+
     def __str__(self):
-        return f"{self.name}"
+        return f'{self.name}'

infoscreen/models/screen.py

@@ -5,19 +5,19 @@
 class Screen(root_models.CustomBaseModel):
     name = models.CharField(max_length=140, unique=True, null=True, blank=True)
     slug = models.CharField(max_length=140, unique=True, null=False, blank=False)
-    
+
     # images = models.ManyToManyField('Image', through='ScreenHasImage')
     images = models.ManyToManyField('infoscreen.Image', blank=True)
     videos = models.ManyToManyField('infoscreen.Video', blank=True)
 
     def __str__(self):
-        return f"{self.name}"
-    
+        return f'{self.name}'
+
 
 # class ScreenHasImage(models.Model):
 #     screen = models.ForeignKey('infoscreen.Screen', on_delete=models.CASCADE, null=False, blank=False)
 #     image = models.ForeignKey('infoscreen.Image', on_delete=models.CASCADE, null=False, blank=False)
 #     nr = models.IntegerField(null=False, blank=False)
-# 
+#
 #     class Meta:
 #         unique_together = ['screen', 'image']

infoscreen/models/tag.py

@@ -9,27 +9,28 @@
 
 # End: imports -----------------------------------------------------------------
 
-        
+
 class Tag(root_models.CustomBaseModel):
-    name = models.CharField(max_length=200, unique=True, null=False, blank=False, verbose_name='navn', help_text="En vilkårlig egenskap til en plante. (Tips: Du kan prefikse tags med kolon ':', f.eks. 'familie:fiola' )")
+    name = models.CharField(
+        max_length=200, unique=True, null=False, blank=False, verbose_name='navn', help_text='En vilkårlig egenskap til en plante. (Tips: Du kan prefikse tags med kolon ":", f.eks. "familie:fiola" )'
+    )
     bg = models.ForeignKey('infoscreen.Color', on_delete=models.SET_NULL, null=True, blank=True, related_name='tag_bg', verbose_name='bakgrunnsfarge')
     font = models.ForeignKey('infoscreen.Color', on_delete=models.SET_NULL, null=True, blank=True, related_name='tag_font', verbose_name='skriftfarge')
     group = models.ForeignKey('self', on_delete=models.SET_NULL, null=True, blank=True, related_name='children', verbose_name='gruppe')
-    
+
     class Meta:
         ordering = []
         verbose_name = 'tag'
         verbose_name_plural = 'tags'
-        
+
     def __str__(self):
-        return f"{self.full_name()}"
-        
+        return f'{self.full_name()}'
+
     def full_name(self):
         if self.group:
-            return f"{self.group.full_name()} :: {self.name}"
-        return f"{self.name}"
-
-
+            return f'{self.group.full_name()} :: {self.name}'
+        return f'{self.name}'
+
     def color_list(self):
         """Hierarchical list of colors from least to most significant"""
         colors = []
@@ -38,8 +39,6 @@ def color_list(self):
         if self.color:
             colors.append(self.color)
         return colors
-    
+
     def color_list_css(self):
         return [color.as_css() for color in self.color_list()]
-
-

infoscreen/models/video.py

@@ -1,15 +1,15 @@
 from django.db import models
+from root import models as root_models
 from ..utils.__init__ import parse_url
 
-from root import models as root_models
 
 class Video(root_models.CustomBaseModel):
     name = models.CharField(max_length=140, null=True, blank=True)
     youtube_code = models.CharField(max_length=140, null=False, blank=False)
-    
+
     def __str__(self):
-        return f"{self.name}"
-    
+        return f'{self.name}'
+
     def save(self, *args, **kwargs):
         self.youtube_code = parse_url(self.youtube_code)
         super().save(*args, **kwargs)

infoscreen/templatetags/infoscreen_tags.py

@@ -1,6 +1,5 @@
 # imports
 from django import template
-from django.conf import settings
 # End: imports -----------------------------------------------------------------
 
 register = template.Library()

infoscreen/urls.py

@@ -1,4 +1,4 @@
-from django.urls import path, include
+from django.urls import path
 from django.views.generic.base import RedirectView
 
 from infoscreen import views
@@ -10,4 +10,3 @@
     path('screen/<str:slug>/', views.ScreenView.as_view(), name='view_screen'),
     path('screens/', views.ScreenListView.as_view(), name='screen_list'),
 ]
-

infoscreen/utils/__init__.py

@@ -1,16 +1,15 @@
-TEST1 = "https://youtu.be/16GVZ6s5XEw"
-TEST2 = "https://www.youtube.com/watch?v=16GVZ6s5XEw&ab_channel=BigLozOfficial"
-TEST3 = "https://youtu.be/16GVZ6s5XEw/?id=1"
+TEST1 = 'https://youtu.be/16GVZ6s5XEw'
+TEST2 = 'https://www.youtube.com/watch?v=16GVZ6s5XEw&ab_channel=BigLozOfficial'
+TEST3 = 'https://youtu.be/16GVZ6s5XEw/?id=1'
 
 
 def parse_url(url):
-    if "https://youtu.be/" in url:
-        new = url.replace("https://youtu.be/", '')
-        new = new.split("/", 1)
+    if 'https://youtu.be/' in url:
+        new = url.replace('https://youtu.be/', '')
+        new = new.split('/', 1)
         return new[0]
-    elif "https://www.youtube.com/" in url:
-        new = url.split("=", 1)
-        new = new[1].split("&", 1)
+    if 'https://www.youtube.com/' in url:
+        new = url.split('=', 1)
+        new = new[1].split('&', 1)
         return new[0]
-    else:
-        return "oopsie woopsie, you made a fucky wucky"
+    return 'oopsie woopsie, you made a fucky wucky'

root/constants.py

@@ -1,4 +1,3 @@
-
 class Environment:
     """
     Useful in eg. templates
@@ -8,6 +7,6 @@ class Environment:
     DEV = 'development'
     HEROKU = 'heroku'
     PROD = 'production'
-    
+
     ALL = [BASE, DEV, PROD, HEROKU]
     VALID = [DEV, PROD, HEROKU]

root/models/__init__.py

@@ -1 +1 @@
-from .base import CustomBaseAdmin, CustomBaseModel, CustomModelForm
+from .base import CustomBaseAdmin, CustomBaseModel, CustomModelForm