[Python-modules-commits] [python-django-navtag] 01/01: New upstream version 2.1.2
Michael Fladischer
fladi at moszumanska.debian.org
Wed Nov 1 19:17:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch upstream
in repository python-django-navtag.
commit 29d34cbf33900705d6f9331a099b2a7a44b11047
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Wed Nov 1 19:39:41 2017 +0100
New upstream version 2.1.2
---
LICENSE | 36 +++++------
PKG-INFO | 3 +-
django_navtag.egg-info/PKG-INFO | 3 +-
django_navtag.egg-info/SOURCES.txt | 5 +-
django_navtag/test_settings.py | 14 -----
django_navtag/tests/__init__.py | 1 -
django_navtag/tests/settings.py | 35 +++++++++++
django_navtag/tests/{navtag.py => test_navtag.py} | 0
setup.cfg | 4 +-
setup.py | 2 +-
tox.ini | 73 +++++++++--------------
11 files changed, 89 insertions(+), 87 deletions(-)
diff --git a/LICENSE b/LICENSE
index 72816ff..0cab408 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,25 +1,19 @@
Copyright (c) 2013, Chris Beaven
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name easy-thumbnails nor the names of its contributors may be
- used to endorse or promote products derived from this software without
- specific prior written permission.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/PKG-INFO b/PKG-INFO
index 25b0dd9..f02bb61 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: django-navtag
-Version: 2.1.1
+Version: 2.1.2
Summary: A simple Django navigation template tag
Home-page: http://github.com/SmileyChris/django-navtag
Author: Chris Beaven
Author-email: smileychris at gmail.com
License: UNKNOWN
+Description-Content-Type: UNKNOWN
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/django_navtag.egg-info/PKG-INFO b/django_navtag.egg-info/PKG-INFO
index 25b0dd9..f02bb61 100644
--- a/django_navtag.egg-info/PKG-INFO
+++ b/django_navtag.egg-info/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: django-navtag
-Version: 2.1.1
+Version: 2.1.2
Summary: A simple Django navigation template tag
Home-page: http://github.com/SmileyChris/django-navtag
Author: Chris Beaven
Author-email: smileychris at gmail.com
License: UNKNOWN
+Description-Content-Type: UNKNOWN
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/django_navtag.egg-info/SOURCES.txt b/django_navtag.egg-info/SOURCES.txt
index 01f464a..0924411 100644
--- a/django_navtag.egg-info/SOURCES.txt
+++ b/django_navtag.egg-info/SOURCES.txt
@@ -1,11 +1,11 @@
LICENSE
MANIFEST.in
README.rst
+setup.cfg
setup.py
tox.ini
django_navtag/__init__.py
django_navtag/models.py
-django_navtag/test_settings.py
django_navtag.egg-info/PKG-INFO
django_navtag.egg-info/SOURCES.txt
django_navtag.egg-info/dependency_links.txt
@@ -26,4 +26,5 @@ django_navtag/templates/navtag_tests/text/home.txt
django_navtag/templatetags/__init__.py
django_navtag/templatetags/navtag.py
django_navtag/tests/__init__.py
-django_navtag/tests/navtag.py
\ No newline at end of file
+django_navtag/tests/settings.py
+django_navtag/tests/test_navtag.py
\ No newline at end of file
diff --git a/django_navtag/test_settings.py b/django_navtag/test_settings.py
deleted file mode 100644
index ffb7762..0000000
--- a/django_navtag/test_settings.py
+++ /dev/null
@@ -1,14 +0,0 @@
-DATABASE_ENGINE = 'sqlite3'
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': ':memory:',
- }
-}
-
-INSTALLED_APPS = [
- 'django_navtag',
-]
-
-SECRET_KEY = 'testing'
diff --git a/django_navtag/tests/__init__.py b/django_navtag/tests/__init__.py
index 1580249..e69de29 100644
--- a/django_navtag/tests/__init__.py
+++ b/django_navtag/tests/__init__.py
@@ -1 +0,0 @@
-from .navtag import NavTagTest
diff --git a/django_navtag/tests/settings.py b/django_navtag/tests/settings.py
new file mode 100644
index 0000000..438a995
--- /dev/null
+++ b/django_navtag/tests/settings.py
@@ -0,0 +1,35 @@
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'NAME': ':memory:',
+ }
+}
+
+INSTALLED_APPS = [
+ 'django_navtag',
+]
+
+SECRET_KEY = 'testing'
+
+MIDDLEWARE_CLASSES = (
+ 'django.middleware.common.CommonMiddleware',
+ 'django.middleware.csrf.CsrfViewMiddleware',
+)
+
+TEMPLATES = [
+ {
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'APP_DIRS': True,
+ 'OPTIONS': {
+ 'context_processors': [
+ 'django.contrib.auth.context_processors.auth',
+ 'django.template.context_processors.debug',
+ 'django.template.context_processors.i18n',
+ 'django.template.context_processors.media',
+ 'django.template.context_processors.static',
+ 'django.template.context_processors.tz',
+ 'django.contrib.messages.context_processors.messages',
+ ],
+ },
+ },
+]
diff --git a/django_navtag/tests/navtag.py b/django_navtag/tests/test_navtag.py
similarity index 100%
rename from django_navtag/tests/navtag.py
rename to django_navtag/tests/test_navtag.py
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..adf5ed7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,7 @@
+[bdist_wheel]
+universal = 1
+
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index 73166c6..e027e59 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ class Tox(TestCommand):
setup(
name='django-navtag',
- version='2.1.1',
+ version='2.1.2',
description=("A simple Django navigation template tag"),
author='Chris Beaven',
author_email='smileychris at gmail.com',
diff --git a/tox.ini b/tox.ini
index c5c0f88..d95fce5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,64 +2,47 @@
distribute = False
envlist =
readme,
- 1.4.X,
- 1.5.X,
- 1.6.X,
- py33-1.6.X,
- py34-1.6.X,
- master
+ coverage-setup,
+ py{27,34,35}-django{18,19,110,111}
+ py36-django111
+ py33-django18
+ py27-django16,
+ coverage-report
+skip_missing_interpreters = True
[testenv]
-downloadcache = {toxworkdir}/_download/
-commands =
- {envbindir}/python {envbindir}/django-admin.py test {posargs:django_navtag}
+usedevelop = True
setenv =
- DJANGO_SETTINGS_MODULE = django_navtag.test_settings
+ DJANGO_SETTINGS_MODULE = django_navtag.tests.settings
+deps =
+ coverage
+ django16: Django>=1.6,<1.7
+ django18: Django>=1.8,<1.9
+ django19: Django>=1.9,<1.10
+ django110: Django>=1.10,<1.11
+ django111: Django>=1.11,<1.12
+commands =
+ {envbindir}/coverage run -a --source django_navtag {envbindir}/django-admin.py test {posargs:django_navtag.tests}
[testenv:readme]
deps =
docutils
whitelist_externals = mkdir
commands =
- mkdir -p {envtmpdir}
- rst2html.py --exit-status=2 README.rst {envtmpdir}/readme.html
-
-[testenv:1.4.X]
-basepython = python2.6
-deps =
- Django<1.5
+ rst2html.py --report=info --halt=warning README.rst /dev/null
-[testenv:1.5.X]
-basepython = python2.7
-deps =
- Django<1.6
-
-[testenv:1.6.X]
+[testenv:old]
basepython = python2.7
deps =
Django<1.7
-commands =
- {envbindir}/python {envbindir}/django-admin.py test {posargs:django_navtag.tests}
-
-[testenv:py33-1.6.X]
-basepython = python3.3
-deps =
- Django<1.7
-commands =
- {envbindir}/python {envbindir}/django-admin.py test {posargs:django_navtag.tests}
+ coverage
-[testenv:py34-1.6.X]
-basepython = python3.4
-deps =
- Django<1.7
-commands =
- {envbindir}/python {envbindir}/django-admin.py test {posargs:django_navtag.tests}
+[testenv:coverage-setup]
+deps = coverage
+commands = coverage erase
-[testenv:master]
-basepython = python2.7
-changedir = {envsitepackagesdir}/django_navtag
-deps =
- https://github.com/django/django/zipball/master
- coverage
+[testenv:coverage-report]
+deps = coverage
commands =
- coverage run --source="." {envbindir}/django-admin.py test {posargs:django_navtag.tests} && coverage report -m
+ coverage report --include="django_navtag/tests/*" --fail-under=100
+ coverage report --omit="django_navtag/tests/*" --fail-under=90 -m
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-navtag.git
More information about the Python-modules-commits
mailing list