diff --git a/ignore-warnings.patch b/ignore-warnings.patch deleted file mode 100644 index e04466f..0000000 --- a/ignore-warnings.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pytest-django-3.9.0/tests/test_fixtures.py -=================================================================== ---- pytest-django-3.9.0.orig/tests/test_fixtures.py -+++ pytest-django-3.9.0/tests/test_fixtures.py -@@ -597,7 +597,7 @@ class Migration(migrations.Migration): - ) - - result = django_testdir.runpytest_subprocess("-s") -- result.stdout.fnmatch_lines(["* 1 passed in*"]) -+ result.stdout.fnmatch_lines(["* 1 passed*"]) - assert result.ret == 0 - - diff --git a/pytest-django-3.9.0.tar.gz b/pytest-django-3.9.0.tar.gz deleted file mode 100644 index d8802bf..0000000 --- a/pytest-django-3.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:664e5f42242e5e182519388f01b9f25d824a9feb7cd17d8f863c8d776f38baf9 -size 70498 diff --git a/pytest-django-4.1.0.tar.gz b/pytest-django-4.1.0.tar.gz new file mode 100644 index 0000000..131cee2 --- /dev/null +++ b/pytest-django-4.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26f02c16d36fd4c8672390deebe3413678d89f30720c16efb8b2a6bf63b9041f +size 72780 diff --git a/pytest-django-pytest6.patch b/pytest-django-pytest6.patch deleted file mode 100644 index fc1c091..0000000 --- a/pytest-django-pytest6.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 3f03d0a7890e987086042b42db346e47398ffed3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20K=C3=A4ufl?= -Date: Sun, 2 Aug 2020 10:41:31 +0200 -Subject: [PATCH] Fix compat with pytest 6 - ---- - tests/test_manage_py_scan.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_manage_py_scan.py b/tests/test_manage_py_scan.py -index 8a0f9aad..a11f87c2 100644 ---- a/tests/test_manage_py_scan.py -+++ b/tests/test_manage_py_scan.py -@@ -116,7 +116,7 @@ def test_django_project_found_invalid_settings_version(django_testdir, monkeypat - """Invalid DSM should not cause an error with --help or --version.""" - monkeypatch.setenv("DJANGO_SETTINGS_MODULE", "DOES_NOT_EXIST") - -- result = django_testdir.runpytest_subprocess("django_project_root", "--version") -+ result = django_testdir.runpytest_subprocess("django_project_root", "--version", "--version") - assert result.ret == 0 - result.stderr.fnmatch_lines(["*This is pytest version*"]) - diff --git a/python-pytest-django.changes b/python-pytest-django.changes index 1ae1e71..71176ae 100644 --- a/python-pytest-django.changes +++ b/python-pytest-django.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Oct 28 23:58:45 UTC 2020 - John Vandenberg + +- Disable Python 2 +- Drop no longer needed patches: + * ignore-warnings.patch + * pytest-django-pytest6.patch +- Update to v4.1.0 + * Add the async_client and async_rf fixtures + * Add django_debug_mode to configure how DEBUG is set in tests + * Make admin_user work for custom user models without an email + field. +- from v4.0.0 + * Drop support for Python versions before 3.5 + * Drop support for Django versions before 2.2 + * Drop support for pytest versions before 5.4 + * Officialy support Python 3.9. + * Add pytest_django.__version__ + * Make the admin_user and admin_client fixtures compatible with + custom user models which don’t have a username field + * Change the admin_user fixture to use get_by_natural_key() + to get the user instead of directly using USERNAME_FIELD, + in case it is overridden, and to match Django + ------------------------------------------------------------------- Wed Sep 2 13:19:37 UTC 2020 - Benjamin Greiner diff --git a/python-pytest-django.spec b/python-pytest-django.spec index b9123c9..26fa03c 100644 --- a/python-pytest-django.spec +++ b/python-pytest-django.spec @@ -17,20 +17,17 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without python2 +%define skip_python2 1 Name: python-pytest-django -Version: 3.9.0 +Version: 4.1.0 Release: 0 Summary: A Django plugin for py.test License: BSD-3-Clause URL: https://github.com/pytest-dev/pytest-django Source: https://files.pythonhosted.org/packages/source/p/pytest-django/pytest-django-%{version}.tar.gz -# fix tests -Patch0: ignore-warnings.patch -# PATCH-FIX-UPSTREAM fix test failure with pytest 6, is part of https://github.com/pytest-dev/pytest-django/pull/855 -Patch1: https://github.com/pytest-dev/pytest-django/commit/3f03d0a7890e987086042b42db346e47398ffed3.patch#/pytest-django-pytest6.patch BuildRequires: %{python_module Django} -BuildRequires: %{python_module pytest} +BuildRequires: %{python_module pytest > 5.4.0} +BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module setuptools_scm >= 1.11.1} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} @@ -38,14 +35,8 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: sqlite3 Requires: python-Django -Requires: python-pytest +Requires: python-pytest > 5.4.0 BuildArch: noarch -%if %{with python2} -BuildRequires: python2-pathlib2 -%endif -%ifpython2 -Requires: python-pathlib2 -%endif %python_subpackages %description @@ -65,8 +56,6 @@ that are already present in pytest: %prep %setup -q -n pytest-django-%{version} -%patch0 -p1 -%patch1 -p1 %build %python_build