[Python-modules-commits] [python-django-treebeard] 03/17: Initialize git-dpm
Michael Fladischer
fladi at moszumanska.debian.org
Sat Jan 2 18:39:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-django-treebeard.
commit 380c7cb56ff99f2fbdae11cb305d7d58b9103d5a
Merge: 8d240a2 f18987f
Author: Michael Fladischer <fladi at debian.org>
Date: Wed Dec 30 19:37:26 2015 +0100
Initialize git-dpm
debian/.git-dpm | 8 ++++
...ded-pytest-idmaker-hack.-Using-a-support.patch} | 15 +++++--
...sion-infromation-from-jquery-ui-filename.patch} | 47 +++++++++++++---------
debian/patches/series | 4 +-
treebeard/templatetags/admin_tree.py | 2 +-
treebeard/tests/conftest.py | 19 ---------
treebeard/tests/test_treebeard.py | 26 +++++++-----
7 files changed, 65 insertions(+), 56 deletions(-)
diff --cc debian/.git-dpm
index 0000000,0000000..ac5e202
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++f18987f0dc4358a03557bdb3c4ccfa8e65b6faa1
++f18987f0dc4358a03557bdb3c4ccfa8e65b6faa1
++af98fbee8a0b9a8aaed7b72463995b7f9ac74918
++af98fbee8a0b9a8aaed7b72463995b7f9ac74918
++python-django-treebeard_3.0+dfsg.orig.tar.gz
++689adc2d5f399b63124e32ae32527cb0a78a146a
++73991
diff --cc debian/patches/0001-Remove-unneeded-pytest-idmaker-hack.-Using-a-support.patch
index 97707d2,0000000..b6e3c97
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-unneeded-pytest-idmaker-hack.-Using-a-support.patch
+++ b/debian/patches/0001-Remove-unneeded-pytest-idmaker-hack.-Using-a-support.patch
@@@ -1,106 -1,0 +1,115 @@@
- Description: Remove unneeded pytest idmaker hack. Using a supportd ids=arg instead.
++From 191fc59ae83f170acc32756ad05c4d30e159938d Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <fladi at debian.org>
++Date: Wed, 30 Dec 2015 19:37:25 +0100
++Subject: Remove unneeded pytest idmaker hack. Using a supportd ids=arg
++ instead.
++
+Origin: https://github.com/tabo/django-treebeard/commit/4228f3e118c2bc85666edf11708404d7a830d1c0
+Last-Update: 2015-09-08
++---
++ treebeard/tests/conftest.py | 19 -------------------
++ treebeard/tests/test_treebeard.py | 24 ++++++++++++++----------
++ 2 files changed, 14 insertions(+), 29 deletions(-)
+
+diff --git a/treebeard/tests/conftest.py b/treebeard/tests/conftest.py
+index 073a9cc..d6f2876 100644
+--- a/treebeard/tests/conftest.py
++++ b/treebeard/tests/conftest.py
- @@ -13,25 +13,6 @@
++@@ -13,25 +13,6 @@ from django.test.client import Client
+ from django.core.management import call_command
+ from django.core import mail
+ from django.db import connection
+-from django.db.models.base import ModelBase
+-from _pytest import python as _pytest_python
+-
+-
+-def idmaker(argnames, argvalues):
+- idlist = []
+- for valindex, valset in enumerate(argvalues):
+- this_id = []
+- for nameindex, val in enumerate(valset):
+- argname = argnames[nameindex]
+- if isinstance(val, (float, int, str)):
+- this_id.append(str(val))
+- elif isinstance(val, ModelBase):
+- this_id.append(val.__name__)
+- else:
+- this_id.append("{0}-{1}={2!s}".format(argname, valindex))
+- idlist.append("][".join(this_id))
+- return idlist
+-_pytest_python.idmaker = idmaker
+
+
+ def pytest_report_header(config):
+diff --git a/treebeard/tests/test_treebeard.py b/treebeard/tests/test_treebeard.py
- index e1144be..65c9bb5 100644
++index e0bf0d9..7f65239 100644
+--- a/treebeard/tests/test_treebeard.py
++++ b/treebeard/tests/test_treebeard.py
+@@ -62,53 +62,57 @@ def _prepare_db_test(request):
+ return request.param
+
+
++def idfn(fixture_value):
++ return fixture_value.__name__
++
+ @pytest.fixture(scope='function',
+- params=models.BASE_MODELS + models.PROXY_MODELS)
++ params=models.BASE_MODELS + models.PROXY_MODELS,
++ ids=idfn)
+ def model(request):
+ return _prepare_db_test(request)
+
+
+- at pytest.fixture(scope='function', params=models.BASE_MODELS)
++ at pytest.fixture(scope='function', params=models.BASE_MODELS, ids=idfn)
+ def model_without_proxy(request):
+ return _prepare_db_test(request)
+
+
+- at pytest.fixture(scope='function', params=models.UNICODE_MODELS)
++ at pytest.fixture(scope='function', params=models.UNICODE_MODELS, ids=idfn)
+ def model_with_unicode(request):
+ return _prepare_db_test(request)
+
+
+- at pytest.fixture(scope='function', params=models.SORTED_MODELS)
++ at pytest.fixture(scope='function', params=models.SORTED_MODELS, ids=idfn)
+ def sorted_model(request):
+ return _prepare_db_test(request)
+
+
+- at pytest.fixture(scope='function', params=models.RELATED_MODELS)
++ at pytest.fixture(scope='function', params=models.RELATED_MODELS, ids=idfn)
+ def related_model(request):
+ return _prepare_db_test(request)
+
+
+- at pytest.fixture(scope='function', params=models.INHERITED_MODELS)
++ at pytest.fixture(scope='function', params=models.INHERITED_MODELS, ids=idfn)
+ def inherited_model(request):
+ return _prepare_db_test(request)
+
+
+- at pytest.fixture(scope='function', params=models.MP_SHORTPATH_MODELS)
++ at pytest.fixture(scope='function', params=models.MP_SHORTPATH_MODELS, ids=idfn)
+ def mpshort_model(request):
+ return _prepare_db_test(request)
+
+
+- at pytest.fixture(scope='function', params=[models.MP_TestNodeShortPath])
++ at pytest.fixture(scope='function', params=[models.MP_TestNodeShortPath], ids=idfn)
+ def mpshortnotsorted_model(request):
+ return _prepare_db_test(request)
+
+
+- at pytest.fixture(scope='function', params=[models.MP_TestNodeAlphabet])
++ at pytest.fixture(scope='function', params=[models.MP_TestNodeAlphabet], ids=idfn)
+ def mpalphabet_model(request):
+ return _prepare_db_test(request)
+
+
+- at pytest.fixture(scope='function', params=[models.MP_TestNodeSortedAutoNow])
++ at pytest.fixture(scope='function', params=[models.MP_TestNodeSortedAutoNow], ids=idfn)
+ def mpsortedautonow_model(request):
+ return _prepare_db_test(request)
+
diff --cc debian/patches/0002-Remove-version-infromation-from-jquery-ui-filename.patch
index dd234d9,0000000..b9b1d0e
mode 100644,000000..100644
--- a/debian/patches/0002-Remove-version-infromation-from-jquery-ui-filename.patch
+++ b/debian/patches/0002-Remove-version-infromation-from-jquery-ui-filename.patch
@@@ -1,36 -1,0 +1,43 @@@
- Description: Remove version infromation from jquery-ui filename
++From f18987f0dc4358a03557bdb3c4ccfa8e65b6faa1 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <fladi at debian.org>
++Date: Wed, 30 Dec 2015 19:37:26 +0100
++Subject: Remove version infromation from jquery-ui filename
++
+ This package uses a symlink to the jquery-ui.min.js file provided by the
+ libjs-jquery-ui package. Removing the version information from the filename
+ makes it clearer that a system library is used and avoids confusion if the
+ version in the filename would diverge from the actual file version maintained
+ by the package.
- Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2015-09-08
+Forwarded: not-needed
++---
++ treebeard/templatetags/admin_tree.py | 2 +-
++ treebeard/tests/test_treebeard.py | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
+
- Index: python-django-treebeard/treebeard/tests/test_treebeard.py
- ===================================================================
- --- python-django-treebeard.orig/treebeard/tests/test_treebeard.py 2015-09-08 11:43:40.617437003 +0200
- +++ python-django-treebeard/treebeard/tests/test_treebeard.py 2015-09-08 12:20:30.174511561 +0200
- @@ -2315,7 +2315,7 @@
- 'jQuery = $.noConflict(true);'
- '})(django.jQuery);</script>'
- '<script type="text/javascript" '
- - 'src="/treebeard/jquery-ui-1.8.5.custom.min.js"></script>')
- + 'src="/treebeard/jquery-ui.min.js"></script>')
- assert expected == rendered
-
- def test_get_static_url(self):
- Index: python-django-treebeard/treebeard/templatetags/admin_tree.py
- ===================================================================
- --- python-django-treebeard.orig/treebeard/templatetags/admin_tree.py 2015-09-08 10:55:01.709891827 +0200
- +++ python-django-treebeard/treebeard/templatetags/admin_tree.py 2015-09-08 12:37:29.743310576 +0200
- @@ -275,7 +275,7 @@
++diff --git a/treebeard/templatetags/admin_tree.py b/treebeard/templatetags/admin_tree.py
++index eee38b7..e8ede12 100644
++--- a/treebeard/templatetags/admin_tree.py
+++++ b/treebeard/templatetags/admin_tree.py
++@@ -275,7 +275,7 @@ def treebeard_js():
+ "(function($){jQuery = $.noConflict(true);})(django.jQuery);"
+ "</script>"
+ "<script type=\"text/javascript\" src=\"%s\"></script>")
+- jquery_ui = urljoin(path, 'treebeard/jquery-ui-1.8.5.custom.min.js')
++ jquery_ui = urljoin(path, 'treebeard/jquery-ui.min.js')
+
+ scripts = [SCRIPT_HTML % 'jsi18n',
+ SCRIPT_HTML % js_file,
++diff --git a/treebeard/tests/test_treebeard.py b/treebeard/tests/test_treebeard.py
++index 7f65239..fabef7e 100644
++--- a/treebeard/tests/test_treebeard.py
+++++ b/treebeard/tests/test_treebeard.py
++@@ -2315,7 +2315,7 @@ class TestAdminTreeTemplateTags(TestCase):
++ 'jQuery = $.noConflict(true);'
++ '})(django.jQuery);</script>'
++ '<script type="text/javascript" '
++- 'src="/treebeard/jquery-ui-1.8.5.custom.min.js"></script>')
+++ 'src="/treebeard/jquery-ui.min.js"></script>')
++ assert expected == rendered
++
++ def test_get_static_url(self):
diff --cc debian/patches/series
index 8a89c0b,0000000..68ddc0a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
- pytest_idmaker.patch
- unversion_jquery-ui.patch
++0001-Remove-unneeded-pytest-idmaker-hack.-Using-a-support.patch
++0002-Remove-version-infromation-from-jquery-ui-filename.patch
--
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