Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-django-haystack for
openSUSE:Factory checked in at 2021-12-27 16:07:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-haystack (Old)
and /work/SRC/openSUSE:Factory/.python-django-haystack.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-haystack"
Mon Dec 27 16:07:22 2021 rev:5 rq:942733 version:3.1.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-haystack/python-django-haystack.changes
2021-12-03 20:36:05.432071398 +0100
+++
/work/SRC/openSUSE:Factory/.python-django-haystack.new.2520/python-django-haystack.changes
2021-12-27 16:07:33.253707144 +0100
@@ -1,0 +2,6 @@
+Sun Dec 26 23:30:09 UTC 2021 - John Vandenberg <[email protected]>
+
+- Use django-codemod to make Django 4 compatible
+- Remove unnecessary build dependency coverage
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-haystack.spec ++++++
--- /var/tmp/diff_new_pack.dqkDpt/_old 2021-12-27 16:07:33.681707447 +0100
+++ /var/tmp/diff_new_pack.dqkDpt/_new 2021-12-27 16:07:33.689707453 +0100
@@ -25,6 +25,7 @@
License: BSD-3-Clause
URL: https://haystacksearch.org/
Source:
https://files.pythonhosted.org/packages/source/d/django-haystack/django-haystack-%{version}.tar.gz
+BuildRequires: %{python_module django-codemod}
BuildRequires: %{python_module setuptools_scm}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -37,7 +38,6 @@
# SECTION test requirements
BuildRequires: %{python_module Django >= 2.2}
BuildRequires: %{python_module Whoosh >= 2.5.4}
-BuildRequires: %{python_module coverage}
BuildRequires: %{python_module elasticsearch}
BuildRequires: %{python_module geopy >= 2.0.0}
BuildRequires: %{python_module pysolr >= 3.7.0}
@@ -54,9 +54,15 @@
%prep
%setup -q -n django-haystack-%{version}
+sed -i 's:==:>=:' setup.py
+
+djcodemod run --removed-in 4.0 haystack/{admin,forms}.py
+
+# This causes errors with pytest
+sed -i '/django.setup()/d' test_haystack/__init__.py
+echo 'import django; django.setup()' > conftest.py
%build
-sed -i 's:==:>=:' setup.py
%python_build
%install
@@ -64,13 +70,16 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
+export DJANGO_SETTINGS_MODULE=test_haystack.settings
# elasticsearch and solr tests require running services
# test_ensure_wgs84 is broken with some GDAL issues
-%pytest -k 'not (elasticsearch or solr or test_ensure_wgs84)'
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}:${PWD}
+$python -m pytest -k 'not (elasticsearch or solr or test_ensure_wgs84)'
+}
%files %{python_files}
%doc AUTHORS README.rst
%license LICENSE
-%{python_sitelib}/*
+%{python_sitelib}/*haystack*/
%changelog
