Bug#860390: unblock: django-assets/0.12-2
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: python-modules-team@lists.alioth.debian.org
Dear release team,
Please consider unblocking django-assets/0.12-2 for stretch. The
relevant debian/changelog entry is:
django-assets (0.12-2) unstable; urgency=medium
* Patch pytest plugin to check whether we are running in a Django context,
otherwise we can break unrelated testsuites. (Closes: #859916)
* Add myself to uploaders.
diffstat is:
.git-dpm | 4 -
changelog | 8 +++
control | 2
patches/0003-Patch-pytest-plugin-to-check-whether-we-are-running-.patch | 24 ++++++++++
patches/series | 1
5 files changed, 36 insertions(+), 3 deletions(-)
Debdiff attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org / chris-lamb.co.uk
`-
diffstat for django-assets-0.12 django-assets-0.12
.git-dpm | 4 -
changelog | 8 +++
control | 2
patches/0003-Patch-pytest-plugin-to-check-whether-we-are-running-.patch | 24 ++++++++++
patches/series | 1
5 files changed, 36 insertions(+), 3 deletions(-)
diff -Nru django-assets-0.12/debian/changelog django-assets-0.12/debian/changelog
--- django-assets-0.12/debian/changelog 2016-08-29 11:12:46.000000000 +0100
+++ django-assets-0.12/debian/changelog 2017-04-15 17:25:04.000000000 +0100
@@ -1,3 +1,11 @@
+django-assets (0.12-2) unstable; urgency=medium
+
+ * Patch pytest plugin to check whether we are running in a Django context,
+ otherwise we can break unrelated testsuites. (Closes: #859916)
+ * Add myself to uploaders.
+
+ -- Chris Lamb <lamby@debian.org> Sat, 15 Apr 2017 17:25:04 +0100
+
django-assets (0.12-1) unstable; urgency=low
[ OndÅ?ej Nový ]
diff -Nru django-assets-0.12/debian/control django-assets-0.12/debian/control
--- django-assets-0.12/debian/control 2016-08-29 11:12:46.000000000 +0100
+++ django-assets-0.12/debian/control 2017-04-15 17:25:04.000000000 +0100
@@ -2,7 +2,7 @@
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Uploaders: Michael Fladischer <fladi@debian.org>,
+Uploaders: Michael Fladischer <fladi@debian.org>, Chris Lamb <lamby@debian.org>
Build-Depends: debhelper (>= 9),
dh-python,
python-all,
diff -Nru django-assets-0.12/debian/.git-dpm django-assets-0.12/debian/.git-dpm
--- django-assets-0.12/debian/.git-dpm 2016-08-29 11:12:46.000000000 +0100
+++ django-assets-0.12/debian/.git-dpm 2017-04-15 17:25:04.000000000 +0100
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-e2a0303b2786633d25c2010766a5ae8c0c6aaf64
-e2a0303b2786633d25c2010766a5ae8c0c6aaf64
+67d288aa950f9eeefe7b02c4143cde80a569d24a
+67d288aa950f9eeefe7b02c4143cde80a569d24a
60ed4cc3289f12435e7dd78cbf4c67f01735bb17
60ed4cc3289f12435e7dd78cbf4c67f01735bb17
django-assets_0.12.orig.tar.gz
diff -Nru django-assets-0.12/debian/patches/0003-Patch-pytest-plugin-to-check-whether-we-are-running-.patch django-assets-0.12/debian/patches/0003-Patch-pytest-plugin-to-check-whether-we-are-running-.patch
--- django-assets-0.12/debian/patches/0003-Patch-pytest-plugin-to-check-whether-we-are-running-.patch 1970-01-01 01:00:00.000000000 +0100
+++ django-assets-0.12/debian/patches/0003-Patch-pytest-plugin-to-check-whether-we-are-running-.patch 2017-04-15 17:25:04.000000000 +0100
@@ -0,0 +1,24 @@
+From 67d288aa950f9eeefe7b02c4143cde80a569d24a Mon Sep 17 00:00:00 2001
+From: Chris Lamb <lamby@debian.org>
+Date: Sat, 15 Apr 2017 17:22:59 +0100
+Subject: Patch pytest plugin to check whether we are running in a Django
+ context, otherwise we can break unrelated testsuites. (Closes: #859916)
+
+---
+ django_assets/pytest_plugin.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/django_assets/pytest_plugin.py b/django_assets/pytest_plugin.py
+index 7736a6f..847f357 100644
+--- a/django_assets/pytest_plugin.py
++++ b/django_assets/pytest_plugin.py
+@@ -1,6 +1,8 @@
++import os
+ import pytest
+ import django_assets.env
+
+ @pytest.fixture(autouse=True)
+ def set_django_assets_env():
+- django_assets.env.get_env() # initialise django-assets settings
++ if 'DJANGO_SETTINGS_MODULE' in os.environ:
++ django_assets.env.get_env() # initialise django-assets settings
diff -Nru django-assets-0.12/debian/patches/series django-assets-0.12/debian/patches/series
--- django-assets-0.12/debian/patches/series 2016-08-29 11:12:46.000000000 +0100
+++ django-assets-0.12/debian/patches/series 2017-04-15 17:25:04.000000000 +0100
@@ -1,2 +1,3 @@
01-webassets_version.patch
02-intersphinx.patch
+0003-Patch-pytest-plugin-to-check-whether-we-are-running-.patch
Reply to: