Skip to content

Commit

Permalink
Merge branch 'release/4.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
wolph committed Apr 6, 2018
2 parents 877d798 + 9574dc9 commit f09559d
Show file tree
Hide file tree
Showing 28 changed files with 428 additions and 228 deletions.
45 changes: 11 additions & 34 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,21 @@
sudo: false
language: python
python: 2.7
cache: pip
language: python
python: 3.6

env:
- TOX_ENV=py27-django18
- TOX_ENV=py27-django19
- TOX_ENV=py27-django110
- TOX_ENV=py27-django111
- TOX_ENV=py33-django18
- TOX_ENV=py34-django19
- TOX_ENV=py34-django110
- TOX_ENV=py34-django111
- TOX_ENV=py35-django19
- TOX_ENV=py35-django110
- TOX_ENV=py35-django111
- TOX_ENV=py36-django19
- TOX_ENV=py36-django110
- TOX_ENV=py36-django111
- TOX_ENV=pypy-django18
- TOX_ENV=pypy-django19
- TOX_ENV=pypy-django110
- TOX_ENV=pypy-django111
- TOX_ENV=pypy-django11
- TOX_ENV=py27-django11
- TOX_ENV=py35-django11
- TOX_ENV=py35-django20
- TOX_ENV=py36-django11
- TOX_ENV=py36-django20
- TOX_ENV=flake8
- TOX_ENV=docs
- TOX_ENV=coveralls

install:
- pip install -r requirements.txt
- pip install -r requirements_test.txt
- pip install -e .
- pip install tox
- pip install coveralls

script:
- tox -e $TOX_ENV
- py.test

after_success:
- coveralls

notifications:
email:
on_success: never
on_failure: change

2 changes: 2 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
os.environ['DJANGO_SETTINGS_MODULE'] = 'example.settings'
from tags_input import __about__ as metadata

import django
django.setup()
# -- General configuration -----------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
Expand Down
1 change: 1 addition & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-e.[docs,tests]
12 changes: 8 additions & 4 deletions example/autocompletionexample/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ def full_clean(self, *args, **kwargs):

class Bar(ReprModel):
name = models.CharField(max_length=50, help_text='The bar name')
foo = models.ForeignKey(Foo, help_text='The foo object')
foo = models.ForeignKey(Foo, help_text='The foo object',
on_delete=models.CASCADE)


class Spam(ReprModel):
Expand All @@ -45,9 +46,11 @@ def clean(self):


class FooExtraSpam(ReprModel):
foo = models.ForeignKey(Foo, help_text='The foo object')
foo = models.ForeignKey(Foo, help_text='The foo object',
on_delete=models.CASCADE)
extra_spam = models.ForeignKey(
'ExtraSpam', help_text='The extra spam object')
'ExtraSpam', help_text='The extra spam object',
on_delete=models.CASCADE)


class ExtraSpam(ReprModel):
Expand All @@ -58,5 +61,6 @@ class ExtraSpam(ReprModel):
class Egg(ReprModel):
name = models.CharField(max_length=50, help_text='The egg name')
name2 = models.CharField(max_length=50, help_text='The egg 2nd name')
foo = models.OneToOneField(Foo, help_text='The foo object')
foo = models.OneToOneField(Foo, help_text='The foo object',
on_delete=models.CASCADE)

Binary file renamed example/database → example/database.sqlite3
Binary file not shown.
14 changes: 14 additions & 0 deletions example/demo/forms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
from django import forms

from tags_input import fields

from . import models


class TagsInputForm(forms.Form):
tag_input = fields.TagsInputField(
models.SimpleName.objects.all(),
create_missing=True,
required=True,
)

9 changes: 5 additions & 4 deletions example/demo/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def full_clean(self, *args, **kwargs):

class ForeignKeyToSimpleName(ReprModel):
name = models.CharField(max_length=50)
simple_name = models.ForeignKey(SimpleName)
simple_name = models.ForeignKey(SimpleName, on_delete=models.CASCADE)


class ManyToManyToSimpleName(ReprModel):
Expand Down Expand Up @@ -79,8 +79,9 @@ def clean(self):

class ThroughModel(ReprModel):
name = models.CharField(max_length=50)
simple_name = models.ForeignKey(SimpleName)
many_to_many_through = models.ForeignKey('ManyToManyThrough')
simple_name = models.ForeignKey(SimpleName, on_delete=models.CASCADE)
many_to_many_through = models.ForeignKey('ManyToManyThrough',
on_delete=models.CASCADE)


class ManyToManyThrough(ReprModel):
Expand All @@ -90,7 +91,7 @@ class ManyToManyThrough(ReprModel):

class InlineModel(ReprModel):
name = models.CharField(max_length=50)
simple_name = models.ForeignKey(SimpleName)
simple_name = models.ForeignKey(SimpleName, on_delete=models.CASCADE)
simple_names = models.ManyToManyField(ManyToManyToSimpleName)
double_names = models.ManyToManyField(ManyToManyToDoubleName)

9 changes: 9 additions & 0 deletions example/demo/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from django.conf import urls
from example.demo import views

app_label = 'example.demo'
urlpatterns = [
urls.url(r'^$', views.index, name='index'),
]


11 changes: 11 additions & 0 deletions example/demo/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from django_utils import view_decorators

from . import forms


@view_decorators.env
def index(request):
request.template = 'index.html'
data = request.POST or None

request.context['form'] = forms.TagsInputForm(data)
Binary file removed example/master
Binary file not shown.
Binary file removed example/master.1
Binary file not shown.
Binary file removed example/other_database
Binary file not shown.
1 change: 1 addition & 0 deletions example/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-e.[tests]
Loading

0 comments on commit f09559d

Please sign in to comment.