15
0

Accepting request 978712 from home:pgajdos:python

- do not require python-mock for build
- added patches
  fix https://github.com/elastic/elasticsearch-dsl-py/issues/1596
  + python-elasticsearch-dsl-no-mock.patch

OBS-URL: https://build.opensuse.org/request/show/978712
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-elasticsearch-dsl?expand=0&rev=5
This commit is contained in:
2022-05-23 13:52:28 +00:00
committed by Git OBS Bridge
parent 67c3b3f722
commit b4d76310bb
3 changed files with 24 additions and 2 deletions

View File

@@ -0,0 +1,12 @@
diff -upr elasticsearch-dsl-py-7.2.1.orig/test_elasticsearch_dsl/conftest.py elasticsearch-dsl-py-7.2.1/test_elasticsearch_dsl/conftest.py
--- elasticsearch-dsl-py-7.2.1.orig/test_elasticsearch_dsl/conftest.py 2022-05-23 13:59:46.128193973 +0200
+++ elasticsearch-dsl-py-7.2.1/test_elasticsearch_dsl/conftest.py 2022-05-23 13:59:46.152194107 +0200
@@ -5,7 +5,7 @@ from datetime import datetime
from elasticsearch.helpers import bulk
from elasticsearch.helpers.test import SkipTest, get_test_client
-from mock import Mock
+from unittest.mock import Mock
from pytest import fixture, skip
from elasticsearch_dsl.connections import connections, add_connection

View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon May 23 12:07:23 UTC 2022 - pgajdos@suse.com
- do not require python-mock for build
- added patches
fix https://github.com/elastic/elasticsearch-dsl-py/issues/1596
+ python-elasticsearch-dsl-no-mock.patch
-------------------------------------------------------------------
Fri Nov 27 05:34:09 UTC 2020 - John Vandenberg <jayvdb@gmail.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-elasticsearch-dsl
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@ License: Apache-2.0
Group: Development/Languages/Python
URL: https://github.com/elasticsearch/elasticsearch-dsl-py
Source: https://github.com/elastic/elasticsearch-dsl-py/archive/%{version}.tar.gz#/elasticsearch-dsl-%{version}.tar.gz
# https://github.com/elastic/elasticsearch-dsl-py/issues/1596
Patch0: python-elasticsearch-dsl-no-mock.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -35,7 +37,6 @@ Suggests: python-pytz
BuildArch: noarch
# SECTION test requirements
BuildRequires: %{python_module elasticsearch >= 7.0.0}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module pytest >= 3.0.0}
BuildRequires: %{python_module python-dateutil}
BuildRequires: %{python_module pytz}
@@ -48,6 +49,7 @@ Python client for Elasticsearch.
%prep
%setup -q -n elasticsearch-dsl-py-%{version}
%patch0 -p1
%build
%python_build