Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pycsw for openSUSE:Factory
checked in at 2021-04-23 17:50:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pycsw (Old)
and /work/SRC/openSUSE:Factory/.python-pycsw.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pycsw"
Fri Apr 23 17:50:44 2021 rev:4 rq:888025 version:2.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pycsw/python-pycsw.changes
2020-05-20 18:47:46.569594208 +0200
+++ /work/SRC/openSUSE:Factory/.python-pycsw.new.12324/python-pycsw.changes
2021-04-23 17:51:01.114834710 +0200
@@ -1,0 +2,21 @@
+Thu Apr 22 10:43:31 UTC 2021 - Ben Greiner <c...@bnavigator.de>
+
+- Update to 2.6.0
+ * fix GetRecords startposition empty parameter fixes
+ * update OpenSearch temporal extent query support
+ * add 12 factor support
+ * support environment variables in configuration
+ * add kubernetes and helm configurations
+ * fix quoting for PostgreSQL backends
+ * add logging switch to pycsw-admin.py CLI to stdout
+ * safeguard XML as bytes to unicode
+ * update core model xml column to Unicode on repository creation
+ * handle different formats for CRS code input
+ * add test for invalid gml:posList geometry
+ * drop all Python 2 support
+- Enable test suite
+ * Remove extra mock import in test suite
+ * Add pycsw-pr671-rm-json-encoding.patch gh#geopython/pycsw#671
+- Disable python36 build: No pyproj and OWSLib for python36 on TW
+
+-------------------------------------------------------------------
Old:
----
pycsw-2.4.1.tar.gz
New:
----
pycsw-2.6.0-gh.tar.gz
pycsw-pr671-rm-json-encoding.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pycsw.spec ++++++
--- /var/tmp/diff_new_pack.j6u10o/_old 2021-04-23 17:51:01.594835535 +0200
+++ /var/tmp/diff_new_pack.j6u10o/_new 2021-04-23 17:51:01.594835535 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pycsw
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,18 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
+%define skip_python36 1
Name: python-pycsw
-Version: 2.4.1
+Version: 2.6.0
Release: 0
Summary: OGC CSW server implementation written in Python
License: MIT
Group: Development/Languages/Python
URL: https://pycsw.org/
-Source:
https://files.pythonhosted.org/packages/source/p/pycsw/pycsw-%{version}.tar.gz
+# Use the GitHub archive instead of pypi because it has the test suite
+Source:
https://github.com/geopython/pycsw/archive/refs/tags/%{version}.tar.gz#/pycsw-%{version}-gh.tar.gz
+# PATCH-FIX-UPSTREAM pycsw-pr671-rm-json-encoding.patch --
gh#geopython/pycsw#671
+Patch0:
https://github.com/geopython/pycsw/pull/671.patch#/pycsw-pr671-rm-json-encoding.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -34,18 +38,19 @@
Requires: python-geolinks >= 0.2.0
Requires: python-lxml >= 3.6.2
Requires: python-pyproj >= 1.9.5.1
-Requires: python-six >= 1.10.0
Requires: python-xmltodict >= 0.10.2
Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
BuildArch: noarch
# SECTION test requirements
+BuildRequires: %{python_module apipkg}
+BuildRequires: %{python_module SQLAlchemy}
BuildRequires: %{python_module OWSLib >= 0.16.0}
BuildRequires: %{python_module Shapely >= 1.5.17}
BuildRequires: %{python_module geolinks >= 0.2.0}
BuildRequires: %{python_module lxml >= 3.6.2}
BuildRequires: %{python_module pyproj >= 1.9.5.1}
-BuildRequires: %{python_module six >= 1.10.0}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module xmltodict >= 0.10.2}
# /SECTION
%python_subpackages
@@ -59,7 +64,9 @@
repositories of geospatial metadata can be exposed via OGC:CSW 2.0.2.
%prep
-%setup -q -n pycsw-%{version}
+%autosetup -p1 -n pycsw-%{version}
+# remove extra mock
+sed -i 's/import mock/from unittest import mock/'
tests/unittests/test_{wsgi,util}.py
%build
%python_build
@@ -69,6 +76,15 @@
%python_clone -a %{buildroot}%{_bindir}/pycsw-admin.py
%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%check
+# online connection to demo.pycsw.org
+donttest="(GetRecords and distributedsearch)"
+# pyproj database context missing
+donttest+=" or (default_post_GetRecords-filter-bbox-reproject)"
+# many fail, not tested in upstream CI either
+donttest+=" or (functional and harvesting)"
+%pytest -ra -k "not ($donttest)"
+
%post
%python_install_alternative pycsw-admin.py
++++++ pycsw-pr671-rm-json-encoding.patch ++++++
>From f01bc40df1bbd07c0fd619a110d11b00cc777350 Mon Sep 17 00:00:00 2001
From: Ben Greiner <c...@bnavigator.de>
Date: Fri, 23 Apr 2021 13:26:09 +0200
Subject: [PATCH] remove encoding kw from json.loads
---
tests/functionaltests/test_suites_functional.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/functionaltests/test_suites_functional.py
b/tests/functionaltests/test_suites_functional.py
index d1077d9f..18643d2b 100644
--- a/tests/functionaltests/test_suites_functional.py
+++ b/tests/functionaltests/test_suites_functional.py
@@ -216,7 +216,7 @@ def _test_xml_result(result, expected, encoding="utf-8"):
return matches
-def _test_json_result(result, expected, encoding="utf-8"):
+def _test_json_result(result, expected):
"""Compare the JSON test results with an expected value.
Parameters
@@ -233,8 +233,8 @@ def _test_json_result(result, expected, encoding="utf-8"):
"""
- result_dict = json.loads(result, encoding=encoding)
- expected_dict = json.loads(expected, encoding=encoding)
+ result_dict = json.loads(result)
+ expected_dict = json.loads(expected)
return result_dict == expected_dict
