Merge pull request #6 from alextford11/django-3.1

Django 3.1 and Python 3.8

Author: tomhamiltonstubber

.github/workflows/tests.yml

@@ -0,0 +1,25 @@
+name: Tests
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install Dependencies
+        run: make install
+
+      - name: Lint
+        run: make lint
+
+      - name: Tests
+        run: make test
+
+      - name: Codecov
+        run: make codecov

.travis.yml

@@ -0,0 +1,23 @@
+black = black -S -l 120 --target-version py38
+
+.PHONY: install
+install:
+	pip install --progress-bar off -r requirements.txt
+
+.PHONY: black
+black:
+	$(black) bootstrapform_jinja/ testing/
+
+.PHONY: lint
+lint:
+	flake8 bootstrapform_jinja/ testing/
+	$(black) --check bootstrapform_jinja/ testing/
+
+.PHONY: test
+test:
+	coverage run --source=bootstrapform_jinja testing/manage.py test
+
+.PHONY: codecov
+codecov:
+	bash <(curl -s https://codecov.io/bash)
+

Makefile

@@ -1,7 +1,7 @@
 Django bootstrap forms for django-jinja
 =======================================
 
-[![Build Status](https://travis-ci.org/tutorcruncher/django-jinja-bootstrap-form.svg?branch=master&style=flat)](https://travis-ci.org/tutorcruncher/django-jinja-bootstrap-form)
+[![Build Status](https://github.com/tutorcruncher/django-jinja-bootstrap-form/workflows/Tests/badge.svg)](https://github.com/tutorcruncher/django-jinja-bootstrap-form/actions)
 [![PyPI Status](https://img.shields.io/pypi/v/django-jinja-bootstrap-form.svg?style=flat)](https://pypi.python.org/pypi/django-jinja-bootstrap-form)
 [![codecov](https://codecov.io/gh/tutorcruncher/django-jinja-bootstrap-form/branch/master/graph/badge.svg)](https://codecov.io/gh/tutorcruncher/django-jinja-bootstrap-form)
 

README.md

@@ -1,6 +1,5 @@
 from collections import OrderedDict
-from django.forms import CheckboxInput, CheckboxSelectMultiple, FileInput, RadioSelect
-from django.forms.forms import BoundField
+from django.forms import BoundField, CheckboxInput, CheckboxSelectMultiple, FileInput, RadioSelect
 from django.template.loader import get_template
 from django.utils.safestring import mark_safe
 from django_jinja import library

bootstrapform_jinja/templatetags/bootstrap.py

@@ -0,0 +1,5 @@
+black==19.10b0
+coverage==5.2.1
+django==3.1
+django-jinja==2.6.0
+flake8==3.8.3

requirements.txt

@@ -1,4 +1,5 @@
 import os
+
 BASE_DIR = os.path.dirname(__file__)
 
 SECRET_KEY = 'django-jinja-bootstrap-form'
@@ -25,24 +26,13 @@
 
 ROOT_URLCONF = 'testapp.urls'
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ':memory:',
-    }
-}
+DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3', 'NAME': ':memory:'}}
 
 TEMPLATES = [
     {
         'BACKEND': 'django_jinja.backend.Jinja2',
         'APP_DIRS': True,
-        'DIRS': (
-            os.path.join(BASE_DIR, 'templates'),
-        ),
-        'OPTIONS': {
-            'match_extension': '.jinja',
-            'trim_blocks': True,
-            'lstrip_blocks': True,
-        }
+        'DIRS': (os.path.join(BASE_DIR, 'templates'),),
+        'OPTIONS': {'match_extension': '.jinja', 'trim_blocks': True, 'lstrip_blocks': True},
     },
 ]

testing/settings.py

@@ -46,4 +46,3 @@ def test_partial_form(self):
         response = client.get('/partial_bs_form/')
         self.assertContains(response, '<div class="form-group">', status_code=200)
         self.assertHTMLEqualToFixture(response, 'partial.html')
-