Skip to content

Commit

Permalink
Merge branch 'release/0.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
hedleyroos committed Jul 6, 2017
2 parents d0a35d0 + 1c076cc commit 941f553
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -3,6 +3,7 @@ language: python
env:
- TOXENV=django19
- TOXENV=django110
- TOXENV=django111

install:
- pip install tox
Expand Down
1 change: 1 addition & 0 deletions AUTHORS.rst
Expand Up @@ -4,3 +4,4 @@ Authors
Praekelt Consulting
-------------------
* Jonathan Bydendyk

5 changes: 5 additions & 0 deletions CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========

0.1.1
-----
#. Django 1.11 support.

0.1.0
-----
#. Initial release.

1 change: 1 addition & 0 deletions README.rst
Expand Up @@ -48,3 +48,4 @@ License
-------

Please see the License requirements in the LICENSE file of this repository.

1 change: 1 addition & 0 deletions link/api/__init__.py
Expand Up @@ -16,6 +16,7 @@ class Meta(object):
class LinkSerializer(PropertiesMixin, serializers.HyperlinkedModelSerializer):
class Meta(object):
model = Link
fields = ("absolute_url", )


class LinkObjectsViewSet(viewsets.ModelViewSet):
Expand Down
2 changes: 2 additions & 0 deletions link/tests/requirements/111.txt
@@ -0,0 +1,2 @@
django==1.11
django-test-without-migrations==0.6
52 changes: 52 additions & 0 deletions link/tests/settings/111.py
@@ -0,0 +1,52 @@
DEBUG = True

DATABASES = {
"default": {
"ENGINE": "django.db.backends.sqlite3"
}
}

ROOT_URLCONF = "link.tests.urls"

INSTALLED_APPS = [
"test_without_migrations",
"link",
"link.tests",
"django.contrib.admin",
"django.contrib.auth",
"django.contrib.contenttypes",
"django.contrib.sessions",
"django.contrib.messages",
"django.contrib.staticfiles"
]

MIDDLEWARE_CLASSES = [
"django.middleware.security.SecurityMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
"django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.auth.middleware.SessionAuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware"
]

TEMPLATES = [
{
"BACKEND": "django.template.backends.django.DjangoTemplates",
"DIRS": [],
"APP_DIRS": True,
"OPTIONS": {
"context_processors": [
"django.template.context_processors.debug",
"django.template.context_processors.request",
"django.contrib.auth.context_processors.auth",
"django.contrib.messages.context_processors.messages",
],
},
},
]

SITE_ID = 1
STATIC_URL = "/static/"
SECRET_KEY = "SECRET_KEY"
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -6,7 +6,7 @@
name="django-link",
description="Modeled link objects which include linking to objects, views and static urls.",
long_description="".join([open(f, "r").read() for f in description_files]),
version="0.1.0",
version="0.1.1",
author="Praekelt Consulting",
author_email="dev@praekelt.com",
license="BSD",
Expand Down
9 changes: 9 additions & 0 deletions tox.ini
Expand Up @@ -2,6 +2,7 @@
envlist =
django19
django110
django111

[testenv]
basepython = python2.7
Expand All @@ -21,3 +22,11 @@ deps =
commands =
coverage run manage.py test --nomigrations --settings=link.tests.settings.110
coverage report -m

[testenv:django111]
deps =
coverage
-rlink/tests/requirements/111.txt
commands =
coverage run manage.py test --nomigrations --settings=link.tests.settings.111
coverage report -m

0 comments on commit 941f553

Please sign in to comment.