[arch-commits] Commit in python-pytest-django/trunk (2 files)

[Felix Yan]

    Date: Tuesday, October 6, 2015 @ 15:07:11
  Author: fyan
Revision: 143050

upgpkg: python-pytest-django 2.8.1.20151006-1

Modified:
  python-pytest-django/trunk/PKGBUILD
Deleted:
  python-pytest-django/trunk/remove-assertion-in-django_settings_is_configured.patch

---------------------------------------------------------+
 PKGBUILD                                                |   18 +++------
 remove-assertion-in-django_settings_is_configured.patch |   27 --------------
 2 files changed, 7 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-06 13:03:53 UTC (rev 143049)
+++ PKGBUILD	2015-10-06 13:07:11 UTC (rev 143050)
@@ -3,8 +3,9 @@
 
 pkgbase=python-pytest-django
 pkgname=('python-pytest-django' 'python2-pytest-django')
-pkgver=2.8.0
-pkgrel=3
+pkgver=2.8.1.20151006
+_commit=78258372191e6f95169cf05aafb35b06dafa6404
+pkgrel=1
 pkgdesc="A Django plugin for py.test"
 arch=('any')
 license=('BSD')
@@ -12,15 +13,11 @@
 makedepends=('python-pytest' 'python2-pytest' 'git')
 checkdepends=('python-django' 'python2-django' 'python-pytest-xdist' 'python2-pytest-xdist'
               'twine' 'python2-twine' 'python-south' 'python2-south')
-source=("git+https://github.com/pytest-dev/pytest-django.git#tag=v$pkgver"
-        remove-assertion-in-django_settings_is_configured.patch)
-sha512sums=('SKIP'
-            '3f94b06e83c31a949b0bee5ec9220d137ee4c594e4428f6b22f9e73bb2dbdeb6c2e92561343b940acfda4408b5dc756d3d4c5828818f3554bca644b9bdca9781')
+#source=("git+https://github.com/pytest-dev/pytest-django.git#tag=v$pkgver")
+source=("git+https://github.com/pytest-dev/pytest-django.git#commit=$_commit")
+sha512sums=('SKIP')
 
 prepare() {
-  # https://github.com/pytest-dev/pytest-django/issues/146
-  (cd pytest-django; patch -p1 -i ../remove-assertion-in-django_settings_is_configured.patch)
-
   cp -a pytest-django{,-py2}
 }
 
@@ -45,8 +42,7 @@
   python2 setup.py install --root="$PWD/tmp_install" --optimize=1
   PYTHONPATH="$PWD/tmp_install/usr/lib/python2.7/site-packages:$PYTHONPATH:$PWD" \
   DJANGO_SETTINGS_MODULE=pytest_django_test.settings_sqlite \
-    py.test2 tests || warning "Tests failed"
-  # failed with pytest 2.8, skipping for now.
+    py.test2 tests
 }
 
 package_python-pytest-django() {

Deleted: remove-assertion-in-django_settings_is_configured.patch
===================================================================
--- remove-assertion-in-django_settings_is_configured.patch	2015-10-06 13:03:53 UTC (rev 143049)
+++ remove-assertion-in-django_settings_is_configured.patch	2015-10-06 13:07:11 UTC (rev 143050)
@@ -1,27 +0,0 @@
-From 963e04688a19e125b86ba026d3ef09e4afe17f69 Mon Sep 17 00:00:00 2001
-From: Daniel Hahler <git at thequod.de>
-Date: Mon, 2 Mar 2015 19:38:22 +0100
-Subject: [PATCH] Remove assertion in django_settings_is_configured
-
-django.conf.settings.configured is not necessarily True, in case DSM
-wasn't set during `pytest_load_initial_conftests`, but gets set in the
-project's conftest (via `pytest_configure`).
-
-Fixes https://github.com/pytest-dev/pytest-django/issues/146
----
- pytest_django/lazy_django.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/pytest_django/lazy_django.py b/pytest_django/lazy_django.py
-index 8458040..4ba4d5a 100644
---- a/pytest_django/lazy_django.py
-+++ b/pytest_django/lazy_django.py
-@@ -22,8 +22,6 @@ def django_settings_is_configured():
- 
-     # If DJANGO_SETTINGS_MODULE is defined at this point, Django is assumed to
-     # always be loaded.
--    from django.conf import settings
--    assert settings.configured is True
-     return True
- 
-