Merge pull request #48 from moscowpython/tech/hello_ci

Tech/hello ci

Author: Melevir

.github/workflows/pr.yml

@@ -0,0 +1,18 @@
+name: CI
+
+on:
+    pull_request:
+      branches: [ master ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+        with:
+          python-version: "3.8"
+      - name: Install requirements
+        run: pip install -r requirements-dev.txt
+      - name: Run lint
+        run: make check

Makefile

@@ -0,0 +1,10 @@
+isort:
+	isort .
+style:
+	flake8 .
+types:
+	mypy .
+test:
+	cd landing_page; pytest .
+check:
+	make isort style types test

landing_page/mainpage/admin.py

@@ -1,8 +1,16 @@
 from django.contrib import admin
 
 from .models import (
-    MoscowPythonMeetup, LearnPythonCourse, Curators, Feedback, GraduateProjects, GraduateStories,
-    LearnPythonCoursePrices, GraduateProjectsVideos, Podcasts, LearnPythonMultiCityCourses
+    Curators,
+    Feedback,
+    GraduateProjects,
+    GraduateProjectsVideos,
+    GraduateStories,
+    LearnPythonCourse,
+    LearnPythonCoursePrices,
+    LearnPythonMultiCityCourses,
+    MoscowPythonMeetup,
+    Podcasts,
 )
 
 admin.site.register(MoscowPythonMeetup)
@@ -14,4 +22,4 @@
 admin.site.register(LearnPythonCoursePrices)
 admin.site.register(GraduateProjectsVideos)
 admin.site.register(Podcasts)
-admin.site.register(LearnPythonMultiCityCourses)
+admin.site.register(LearnPythonMultiCityCourses)

landing_page/mainpage/models.py

@@ -1,12 +1,14 @@
-from django.db import models
+import datetime
 from datetime import date, timedelta
 
+from django.db import models
+
 
 class MoscowPythonMeetup(models.Model):
     class Meta:
         verbose_name_plural = "MoscowPython Митапы"
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'MoscowPython Meetup № {self.meetup_number}'
 
     meetup_number = models.IntegerField(
@@ -30,7 +32,7 @@ class LearnPythonCourse(models.Model):
     class Meta:
         verbose_name_plural = "LearnPython Наборы"
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'LearnPython Набор № {self.course_index}'
 
     course_index = models.IntegerField(
@@ -162,18 +164,18 @@ def __str__(self):
         default=False,
     )
 
-    def get_date_after_first_lesson(self):
+    def get_date_after_first_lesson(self) -> datetime.date:
         return self.course_start_date + timedelta(days=1)
 
-    def get_day_before_last_lesson(self):
+    def get_day_before_last_lesson(self) -> datetime.date:
         return self.course_end_date - timedelta(days=1)
 
 
 class LearnPythonCoursePrices(models.Model):
     class Meta:
         verbose_name_plural = 'LearnPython Цены на курсы'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'Интервал {self.price_range} на {self.course_type}'
 
     price_range = models.IntegerField(
@@ -215,18 +217,19 @@ def __str__(self):
     )
 
     @property
-    def within_price_range(self):
+    def within_price_range(self) -> bool:
         return self.price_range_start_date <= date.today() <= self.price_range_end_date
 
     @property
-    def past_due_date(self):
+    def past_due_date(self) -> bool:
         return date.today() > self.price_range_end_date
 
+
 class LearnPythonMultiCityCourses(models.Model):
     class Meta:
         verbose_name_plural = 'LearnPython Цены на курсы в разных городах'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'Курсы в городе {self.city_name}'
 
     city_name = models.CharField(
@@ -286,7 +289,7 @@ class Curators(models.Model):
     class Meta:
         verbose_name_plural = 'LearnPython Кураторы'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'Куратор {self.curator_name}'
 
     curator_name = models.CharField(
@@ -338,7 +341,7 @@ class Feedback(models.Model):
     class Meta:
         verbose_name_plural = "LearnPython Отзывы"
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'Отзыв участника {self.feedback_author}'
 
     feedback_author = models.CharField(
@@ -387,7 +390,7 @@ class GraduateStories(models.Model):
     class Meta:
         verbose_name_plural = 'Learn Python Истории учеников'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'История участника {self.story_author}'
 
     story_author = models.CharField(
@@ -459,7 +462,7 @@ class GraduateProjects(models.Model):
     class Meta:
         verbose_name_plural = 'LearnPython Проекты Учеников'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'Проект "{self.project_name}"'
 
     project_name = models.CharField(
@@ -481,7 +484,7 @@ class GraduateProjectsVideos(models.Model):
     class Meta:
         verbose_name_plural = 'LearnPython Видео проектов Учеников'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'Проект "{self.project_name}"'
 
     project_name = models.CharField(
@@ -517,7 +520,7 @@ class Podcasts(models.Model):
     class Meta:
         verbose_name_plural = 'LearnPython Подкаст с учеником'
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'Проект "{self.podcast_name}"'
 
     podcast_name = models.CharField(

landing_page/mainpage/views.py

@@ -1,13 +1,12 @@
 import dataclasses
 import datetime
+from datetime import date
 from typing import Optional
 
-from django.http import HttpResponse
+from django.http import HttpRequest, HttpResponse
 from django.template import loader
-from .models import (LearnPythonCourse, GraduateProjects,
-                     Feedback, Curators, GraduateProjectsVideos
-                     )
-from datetime import date
+
+from .models import Curators, Feedback, GraduateProjects, GraduateProjectsVideos, LearnPythonCourse
 
 
 @dataclasses.dataclass
@@ -27,7 +26,7 @@ class Enrollment:
     late_price: CoursePrice
 
 
-def index(request):
+def index(request: HttpRequest) -> HttpResponse:
     template = loader.get_template('mainpage/index.html')
 
     enrollment = Enrollment(
@@ -65,7 +64,7 @@ def index(request):
     return HttpResponse(template.render(context, request))
 
 
-def projects(request):
+def projects(request: HttpRequest) -> HttpResponse:
     template = loader.get_template('mainpage/projects.html')
 
     try:

landing_page/tests/__init__.py

@@ -0,0 +1,8 @@
+import pytest
+from django.test import Client
+
+
+@pytest.mark.django_db
+def test__index__shows_up(client: Client) -> None:
+    response = client.get('/')
+    assert response.status_code == 200

landing_page/tests/test_index.py

@@ -0,0 +1,6 @@
+-r requirements.txt
+flake8==6.1.0
+mypy==1.5.0
+isort==5.12.0
+pytest==7.4.0
+pytest-django==4.5.2

requirements-dev.txt

@@ -0,0 +1,28 @@
+[flake8]
+exclude = migrations
+max-line-length = 120
+
+
+[mypy]
+ignore_missing_imports = True
+disallow_incomplete_defs = True
+no_implicit_optional = True
+disallow_untyped_calls = True
+warn_redundant_casts = True
+warn_unused_ignores = True
+disallow_untyped_defs = True
+check_untyped_defs = True
+exclude = migrations
+
+[isort]
+combine_as_imports = true
+default_section = THIRDPARTY
+include_trailing_comma = true
+use_parentheses = true
+known_first_party = learn_bot
+line_length = 120
+multi_line_output = 3
+
+
+[tool:pytest]
+DJANGO_SETTINGS_MODULE = landing_page.settings