[Python-modules-commits] [python-django-treebeard] 01/01: New upstream version 4.2.0+dfsg
Michael Fladischer
fladi at moszumanska.debian.org
Sun Jan 21 20:21:26 UTC 2018
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch upstream
in repository python-django-treebeard.
commit be339415b3b3af2021b79ff59b8cbb9d601604d6
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Sat Jan 13 18:57:23 2018 +0100
New upstream version 4.2.0+dfsg
---
CHANGES | 11 ++++++++---
PKG-INFO | 14 ++++++++++----
README.rst | 6 +++---
django_treebeard.egg-info/PKG-INFO | 14 ++++++++++----
django_treebeard.egg-info/requires.txt | 2 +-
setup.cfg | 1 +
setup.py | 8 +++++++-
treebeard/__init__.py | 2 +-
treebeard/admin.py | 8 ++++++--
treebeard/models.py | 6 +++++-
treebeard/tests/models.py | 24 ++++++++++++++----------
treebeard/tests/settings.py | 32 ++++++++++++++++++--------------
treebeard/tests/test_treebeard.py | 2 +-
treebeard/tests/urls.py | 2 +-
14 files changed, 86 insertions(+), 46 deletions(-)
diff --git a/CHANGES b/CHANGES
index 479918b..8303b42 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,16 @@
+Release 4.2.0 (Dec 8, 2017)
+----------------------------
+
+* Support for Django-2.0
+
Release 4.1.2 (Jun 22, 2017)
----------------------------
+----------------------------
* Fixed MANIFEST.in for Debian packaging.
Release 4.1.1 (May 24, 2017)
----------------------------
+----------------------------
* Removed deprecated templatetag inclusion
* Added support for Python-3.6
@@ -13,7 +18,7 @@ Release 4.1.1 (May 24, 2017)
Release 4.1.0 (Nov 24, 2016)
----------------------------
+----------------------------
* Add support for Django-1.10
* Drop support for Django-1.7
diff --git a/PKG-INFO b/PKG-INFO
index f71bd45..2ff38ca 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-treebeard
-Version: 4.1.2
+Version: 4.2.0
Summary: Efficient tree implementations for Django
Home-page: https://github.com/django-treebeard/django-treebeard/
Author: Gustavo Picon
@@ -20,7 +20,7 @@ Description: ================
.. image:: https://readthedocs.org/projects/django-treebeard/badge/?version=latest
:target: https://readthedocs.org/projects/django-treebeard/
-
+
.. image:: https://travis-ci.org/django-treebeard/django-treebeard.svg?branch=master
:target: https://travis-ci.org/django-treebeard/django-treebeard
@@ -58,8 +58,8 @@ Description: ================
**django-treebeard** officially supports
- * Django 1.8 - 1.10
- * Python 2.7, 3.4, 3.5
+ * Django 1.8 - 2.0
+ * Python 2.7, 3.4, 3.5, 3.6
* PostgreSQL, MySQL, SQLite database back-ends.
Platform: UNKNOWN
@@ -68,10 +68,16 @@ Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Environment :: Web Environment
Classifier: Framework :: Django
+Classifier: Framework :: Django :: 1.8
+Classifier: Framework :: Django :: 1.9
+Classifier: Framework :: Django :: 1.10
+Classifier: Framework :: Django :: 1.11
+Classifier: Framework :: Django :: 2.0
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Operating System :: OS Independent
Classifier: Topic :: Software Development :: Libraries
Classifier: Topic :: Utilities
diff --git a/README.rst b/README.rst
index 2d8ad10..ff7873d 100644
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,7 @@ Status
.. image:: https://readthedocs.org/projects/django-treebeard/badge/?version=latest
:target: https://readthedocs.org/projects/django-treebeard/
-
+
.. image:: https://travis-ci.org/django-treebeard/django-treebeard.svg?branch=master
:target: https://travis-ci.org/django-treebeard/django-treebeard
@@ -50,6 +50,6 @@ Supported versions
**django-treebeard** officially supports
-* Django 1.8 - 1.10
-* Python 2.7, 3.4, 3.5
+* Django 1.8 - 2.0
+* Python 2.7, 3.4, 3.5, 3.6
* PostgreSQL, MySQL, SQLite database back-ends.
diff --git a/django_treebeard.egg-info/PKG-INFO b/django_treebeard.egg-info/PKG-INFO
index f71bd45..2ff38ca 100644
--- a/django_treebeard.egg-info/PKG-INFO
+++ b/django_treebeard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-treebeard
-Version: 4.1.2
+Version: 4.2.0
Summary: Efficient tree implementations for Django
Home-page: https://github.com/django-treebeard/django-treebeard/
Author: Gustavo Picon
@@ -20,7 +20,7 @@ Description: ================
.. image:: https://readthedocs.org/projects/django-treebeard/badge/?version=latest
:target: https://readthedocs.org/projects/django-treebeard/
-
+
.. image:: https://travis-ci.org/django-treebeard/django-treebeard.svg?branch=master
:target: https://travis-ci.org/django-treebeard/django-treebeard
@@ -58,8 +58,8 @@ Description: ================
**django-treebeard** officially supports
- * Django 1.8 - 1.10
- * Python 2.7, 3.4, 3.5
+ * Django 1.8 - 2.0
+ * Python 2.7, 3.4, 3.5, 3.6
* PostgreSQL, MySQL, SQLite database back-ends.
Platform: UNKNOWN
@@ -68,10 +68,16 @@ Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Environment :: Web Environment
Classifier: Framework :: Django
+Classifier: Framework :: Django :: 1.8
+Classifier: Framework :: Django :: 1.9
+Classifier: Framework :: Django :: 1.10
+Classifier: Framework :: Django :: 1.11
+Classifier: Framework :: Django :: 2.0
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Operating System :: OS Independent
Classifier: Topic :: Software Development :: Libraries
Classifier: Topic :: Utilities
diff --git a/django_treebeard.egg-info/requires.txt b/django_treebeard.egg-info/requires.txt
index e38f742..531dd9b 100644
--- a/django_treebeard.egg-info/requires.txt
+++ b/django_treebeard.egg-info/requires.txt
@@ -1 +1 @@
-Django>=1.7
+Django>=1.8
diff --git a/setup.cfg b/setup.cfg
index 8bfd5a1..861a9f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,5 @@
[egg_info]
tag_build =
tag_date = 0
+tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index 26f6054..550f28e 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ setup_args = dict(
include_package_data=True,
description='Efficient tree implementations for Django',
long_description=codecs.open(os.path.join(root_dir(), 'README.rst'), encoding='utf-8').read(),
- install_requires=['Django>=1.7'],
+ install_requires=['Django>=1.8'],
tests_require=['pytest'],
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -34,10 +34,16 @@ setup_args = dict(
'License :: OSI Approved :: Apache Software License',
'Environment :: Web Environment',
'Framework :: Django',
+ 'Framework :: Django :: 1.8',
+ 'Framework :: Django :: 1.9',
+ 'Framework :: Django :: 1.10',
+ 'Framework :: Django :: 1.11',
+ 'Framework :: Django :: 2.0',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
'Operating System :: OS Independent',
'Topic :: Software Development :: Libraries',
'Topic :: Utilities'])
diff --git a/treebeard/__init__.py b/treebeard/__init__.py
index b8edffd..263b3c6 100644
--- a/treebeard/__init__.py
+++ b/treebeard/__init__.py
@@ -17,4 +17,4 @@ Release logic:
11. git commit -m 'Start with <version>'
12. git push
"""
-__version__ = '4.1.2'
+__version__ = '4.2.0'
diff --git a/treebeard/admin.py b/treebeard/admin.py
index 369b3e7..871932b 100644
--- a/treebeard/admin.py
+++ b/treebeard/admin.py
@@ -67,8 +67,12 @@ class TreeAdmin(admin.ModelAdmin):
"""
Adds a url to move nodes to this admin
"""
- from django.views.i18n import javascript_catalog
-
+ if django.VERSION < (1, 10):
+ from django.views.i18n import javascript_catalog
+ else:
+ from django.views.i18n import JavaScriptCatalog
+ javascript_catalog = JavaScriptCatalog.as_view()
+
urls = super(TreeAdmin, self).get_urls()
new_urls = [
url('^move/$', self.admin_site.admin_view(self.move_node), ),
diff --git a/treebeard/models.py b/treebeard/models.py
index f24e4f6..50522af 100644
--- a/treebeard/models.py
+++ b/treebeard/models.py
@@ -6,6 +6,7 @@ import operator
if sys.version_info >= (3, 0):
from functools import reduce
+import django
from django.db.models import Q
from django.db import models, transaction, router, connections
@@ -49,7 +50,10 @@ class Node(models.Model):
field.get_internal_type() == 'ForeignKey' and
field.name != 'parent'
):
- foreign_keys[field.name] = field.rel.to
+ if django.VERSION >= (1, 9):
+ foreign_keys[field.name] = field.remote_field.model
+ else:
+ foreign_keys[field.name] = field.rel.to
return foreign_keys
@classmethod
diff --git a/treebeard/tests/models.py b/treebeard/tests/models.py
index 6aa252b..763aa53 100644
--- a/treebeard/tests/models.py
+++ b/treebeard/tests/models.py
@@ -32,7 +32,7 @@ class MP_UnicodeNode(MP_Node):
class MP_TestNodeSomeDep(models.Model):
- node = models.ForeignKey(MP_TestNode)
+ node = models.ForeignKey(MP_TestNode, on_delete=models.CASCADE)
def __str__(self): # pragma: no cover
return 'Node %d' % self.pk
@@ -42,7 +42,7 @@ class MP_TestNodeRelated(MP_Node):
steplen = 3
desc = models.CharField(max_length=255)
- related = models.ForeignKey(RelatedModel)
+ related = models.ForeignKey(RelatedModel, on_delete=models.CASCADE)
def __str__(self): # pragma: no cover
return 'Node %d' % self.pk
@@ -67,7 +67,7 @@ class NS_UnicodetNode(NS_Node):
class NS_TestNodeSomeDep(models.Model):
- node = models.ForeignKey(NS_TestNode)
+ node = models.ForeignKey(NS_TestNode, on_delete=models.CASCADE)
def __str__(self): # pragma: no cover
return 'Node %d' % self.pk
@@ -75,7 +75,7 @@ class NS_TestNodeSomeDep(models.Model):
class NS_TestNodeRelated(NS_Node):
desc = models.CharField(max_length=255)
- related = models.ForeignKey(RelatedModel)
+ related = models.ForeignKey(RelatedModel, on_delete=models.CASCADE)
def __str__(self): # pragma: no cover
return 'Node %d' % self.pk
@@ -89,7 +89,8 @@ class AL_TestNode(AL_Node):
parent = models.ForeignKey('self',
related_name='children_set',
null=True,
- db_index=True)
+ db_index=True,
+ on_delete=models.CASCADE)
sib_order = models.PositiveIntegerField()
desc = models.CharField(max_length=255)
@@ -101,7 +102,8 @@ class AL_UnicodeNode(AL_Node):
parent = models.ForeignKey('self',
related_name='children_set',
null=True,
- db_index=True)
+ db_index=True,
+ on_delete=models.CASCADE)
sib_order = models.PositiveIntegerField()
desc = models.CharField(max_length=255)
@@ -110,7 +112,7 @@ class AL_UnicodeNode(AL_Node):
class AL_TestNodeSomeDep(models.Model):
- node = models.ForeignKey(AL_TestNode)
+ node = models.ForeignKey(AL_TestNode, on_delete=models.CASCADE)
def __str__(self): # pragma: no cover
return 'Node %d' % self.pk
@@ -120,10 +122,11 @@ class AL_TestNodeRelated(AL_Node):
parent = models.ForeignKey('self',
related_name='children_set',
null=True,
- db_index=True)
+ db_index=True,
+ on_delete=models.CASCADE)
sib_order = models.PositiveIntegerField()
desc = models.CharField(max_length=255)
- related = models.ForeignKey(RelatedModel)
+ related = models.ForeignKey(RelatedModel, on_delete=models.CASCADE)
def __str__(self): # pragma: no cover
return 'Node %d' % self.pk
@@ -158,7 +161,8 @@ class AL_TestNodeSorted(AL_Node):
parent = models.ForeignKey('self',
related_name='children_set',
null=True,
- db_index=True)
+ db_index=True,
+ on_delete=models.CASCADE)
node_order_by = ['val1', 'val2', 'desc']
val1 = models.IntegerField()
val2 = models.IntegerField()
diff --git a/treebeard/tests/settings.py b/treebeard/tests/settings.py
index 9b26215..39c9d43 100644
--- a/treebeard/tests/settings.py
+++ b/treebeard/tests/settings.py
@@ -3,6 +3,7 @@ Django settings for testing treebeard
"""
import os
+import django
def get_db_conf():
@@ -53,20 +54,6 @@ def get_db_conf():
DATABASES = {'default': get_db_conf()}
SECRET_KEY = '7r33b34rd'
-# This little hacks forces Django into the old syncdb behaviour,
-# creating models without migrations.
-
-class DisableMigrations(object):
-
- def __contains__(self, item):
- return True
-
- def __getitem__(self, item):
- return "notmigrations"
-
-
-MIGRATION_MODULES = DisableMigrations()
-
INSTALLED_APPS = [
'django.contrib.auth',
'django.contrib.contenttypes',
@@ -77,6 +64,23 @@ INSTALLED_APPS = [
'treebeard.tests'
]
+# This little hacks forces Django into the old syncdb behaviour,
+# creating models without migrations.
+
+if django.VERSION >= (1, 9):
+ MIGRATION_MODULES = {app.split('.')[-1]: None for app in INSTALLED_APPS}
+else:
+ class DisableMigrations(object):
+
+ def __contains__(self, item):
+ return True
+
+ def __getitem__(self, item):
+ return "notmigrations"
+
+
+ MIGRATION_MODULES = DisableMigrations()
+
MIDDLEWARE_CLASSES = [
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
diff --git a/treebeard/tests/test_treebeard.py b/treebeard/tests/test_treebeard.py
index 0817848..d0e7a6b 100644
--- a/treebeard/tests/test_treebeard.py
+++ b/treebeard/tests/test_treebeard.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Unit/Functional tests"""
-from __future__ import with_statement, unicode_literals
+from __future__ import unicode_literals
import datetime
import os
diff --git a/treebeard/tests/urls.py b/treebeard/tests/urls.py
index 7191b32..56cd0fe 100644
--- a/treebeard/tests/urls.py
+++ b/treebeard/tests/urls.py
@@ -4,5 +4,5 @@ from django.contrib import admin
admin.autodiscover()
urlpatterns = [
- url(r'^admin/', include(admin.site.urls)),
+ url(r'^admin/', admin.site.urls),
]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-treebeard.git
More information about the Python-modules-commits
mailing list