Skip to content

Commit 3448e26

Browse files
committed
uprev, fix references, cleanup
1 parent 556ebd0 commit 3448e26

File tree

9 files changed

+51
-64
lines changed

9 files changed

+51
-64
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ docs/_build
77
/dist
88
.idea
99
testing/env
10-
testing/env3
10+
env/

.travis.yml

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
language: python
22

33
python:
4-
- "3.5"
5-
- "3.4"
6-
- "3.3"
7-
- "2.7"
4+
- '3.5'
5+
- '3.6'
86

97
env:
10-
- DJANGO=django==1.11.3 DJANGO_JINJA=django-jinja==2.3.0
11-
- DJANGO=django==1.10.7 DJANGO_JINJA=django-jinja==2.2.1
12-
- DJANGO=django==1.9.13 DJANGO_JINJA=django-jinja==2.2.1
13-
- DJANGO=django==1.8.18 DJANGO_JINJA=django-jinja==2.1.2
14-
- DJANGO=django==1.8.18 DJANGO_JINJA=django-jinja==1.4.2
15-
- DJANGO=django==1.7.11 DJANGO_JINJA=django-jinja==1.4.2
16-
17-
matrix:
18-
exclude:
19-
- python: "3.5"
20-
env: DJANGO=django==1.7.11 DJANGO_JINJA=django-jinja==1.4.2
21-
- python: "3.3"
22-
env: DJANGO=django==1.11.3 DJANGO_JINJA=django-jinja==2.3.0
23-
- python: "3.3"
24-
env: DJANGO=django==1.10.7 DJANGO_JINJA=django-jinja==2.2.1
25-
- python: "3.3"
26-
env: DJANGO=django==1.9.13 DJANGO_JINJA=django-jinja==2.2.1
8+
- DJANGO=django==1.11.3
9+
- DJANGO=django==1.10.7
10+
- DJANGO=django==1.9.13
11+
- DJANGO=django==1.8.18
2712

2813
install:
29-
- pip install $DJANGO $DJANGO_JINJA flake8
14+
- pip install $DJANGO django-jinja=2.3.1 flake8
3015

3116
script:
32-
- flake8 --max-line-length 120 bootstrapform_jinja/
17+
- flake8 bootstrapform_jinja/
3318
- cd testing && python manage.py test
19+
20+
deploy:
21+
- provider: pypi
22+
user: samuelcolvin
23+
password:
24+
secure: "GXRbfsFFsonr3FI4ovN15WQB+2+S3A0WGnK8dkZ9jiAkGerxlRkhgL7fBk/2/TKZrawm9aIAcsJUMbvVrJKjkcvOBMZF1TH0B85ZZgkO7rkdX0SLvmhjPF3maNuj5kR+37QF9l4+2cJzOenQnaVbFzRwo/y3VaapU/cy0X15DDk="
25+
distributions: sdist bdist_wheel
26+
skip_upload_docs: true
27+
on:
28+
tags: true
29+
python: 3.6

CHANGES.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

MANIFEST.in

Lines changed: 0 additions & 2 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Django bootstrap forms for django-jinja
22
=======================================
33

4-
[![Build Status](https://travis-ci.org/samuelcolvin/django-jinja-bootstrap-form.svg?branch=master&style=flat)](https://travis-ci.org/samuelcolvin/django-jinja-bootstrap-form)
4+
[![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)
55
[![PyPI Status](https://img.shields.io/pypi/v/django-jinja-bootstrap-form.svg?style=flat)](https://pypi.python.org/pypi/django-jinja-bootstrap-form)
66

77
Port of [django-bootstrap-form](https://github.com/tzangms/django-bootstrap-form) which is compatible with

bootstrapform_jinja/meta.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
from distutils.version import StrictVersion
22

33
# start from a fresh number 4 to identify jinja verison
4-
VERSION = StrictVersion('4.1.1')
4+
VERSION = StrictVersion('4.2.0')

bootstrapform_jinja/templatetags/bootstrap.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
from collections import OrderedDict
22
from django.forms import CheckboxInput, CheckboxSelectMultiple, FileInput, RadioSelect
3-
try:
4-
from django.forms.boundfield import BoundField
5-
except ImportError:
6-
from django.forms.forms import BoundField
3+
from django.forms.forms import BoundField
74
from django.template.loader import get_template
85
from django.utils.safestring import mark_safe
96
from django_jinja import library

setup.cfg

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[flake8]
2+
max-line-length = 120
3+
max-complexity = 10
4+
5+
[bdist_wheel]
6+
python-tag = py36
7+
8+
[coverage:run]
9+
source = pydantic
10+
branch = True
11+
12+
[coverage:report]
13+
precision = 2
14+
exclude_lines =
15+
pragma: no cover
16+
raise NotImplementedError
17+
raise NotImplemented

setup.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
django-jinja-bootstrap-form
66
===========================
77
8-
`github.com/samuelcolvin/django-jinja-bootstrap-form <https://github.com/samuelcolvin/django-jinja-bootstrap-form>`_
8+
`github.com/tutorcruncher/django-jinja-bootstrap-form <https://github.com/tutorcruncher/django-jinja-bootstrap-form>`_
99
1010
Port of `django-bootstrap-form <https://github.com/tzangms/django-bootstrap-form>`_
1111
which is compatible with `django-jinja <https://github.com/niwibe/django-jinja>`_.
@@ -23,25 +23,22 @@
2323
description='django-jinja-bootstrap-form',
2424
long_description=description,
2525
classifiers=[
26-
"Programming Language :: Python",
27-
"Topic :: Software Development :: Libraries :: Python Modules",
28-
"Framework :: Django",
29-
"Environment :: Web Environment",
30-
"Programming Language :: Python :: 2",
31-
"Programming Language :: Python :: 2.7",
32-
"Programming Language :: Python :: 3",
33-
"Programming Language :: Python :: 3.3",
34-
"Programming Language :: Python :: 3.4",
35-
"Programming Language :: Python :: 3.5",
26+
'Programming Language :: Python',
27+
'Topic :: Software Development :: Libraries :: Python Modules',
28+
'Framework :: Django',
29+
'Environment :: Web Environment',
30+
'Programming Language :: Python :: 3',
31+
'Programming Language :: Python :: 3.4',
32+
'Programming Language :: Python :: 3.5',
3633
],
3734
keywords='bootstrap,django,jinja2',
3835
author='Samuel Colvin',
3936
author_email='[email protected]',
40-
url='https://github.com/samuelcolvin/django-jinja-bootstrap-form',
37+
url='https://github.com/tutorcruncher/django-jinja-bootstrap-form',
4138
license='BSD',
4239
install_requires=[
43-
"django>=1.7",
44-
"django-jinja>=1.4.1",
40+
'django>=1.9',
41+
'django-jinja>=2.3.1',
4542
],
4643
packages=find_packages(),
4744
include_package_data=True,

0 commit comments

Comments
 (0)