From 13fc15ad99c6cebf93155f3b0ddf1251963eb79751ef46e23c4c2707fd46bea6 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Thu, 8 Jul 2021 10:08:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sortinghat?expand=0&rev=20 --- python-sortinghat.changes | 62 +++++++++++++++++++ python-sortinghat.spec | 122 ++++++++++++++++++++++++++++---------- sortinghat-0.4.3.tar.gz | 3 - sortinghat-0.7.15.tar.gz | 3 + 4 files changed, 155 insertions(+), 35 deletions(-) delete mode 100644 sortinghat-0.4.3.tar.gz create mode 100644 sortinghat-0.7.15.tar.gz diff --git a/python-sortinghat.changes b/python-sortinghat.changes index 440ff0c..8f78b52 100644 --- a/python-sortinghat.changes +++ b/python-sortinghat.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Thu May 27 12:39:34 UTC 2021 - Matej Cepl + +- Upgrade 0.7.15 +- Remove upstreamed python-sortinghat-gh-121-workaround.patch + +------------------------------------------------------------------- +Fri Apr 23 21:42:58 UTC 2021 - Matej Cepl + +- Don't build python36-* package (missing pandas) + +------------------------------------------------------------------- +Thu Jun 4 07:19:33 UTC 2020 - pgajdos@suse.com + +- specify database name trough %mysql_testserver_start parameter +- alternatives in loop + +------------------------------------------------------------------- +Tue May 19 09:28:07 UTC 2020 - Petr Gajdos + +- %python3_only -> %python_alternative + +------------------------------------------------------------------- +Tue Mar 17 14:11:53 UTC 2020 - pgajdos@suse.com + +- version update to 0.7.7 + * no minor version changelog found + +------------------------------------------------------------------- +Tue Feb 11 15:58:25 UTC 2020 - pgajdos@suse.com + +- %check: choose better database user name + +------------------------------------------------------------------- +Fri Dec 6 18:01:12 UTC 2019 - pgajdos@suse.com + +- run the testsuite against test mysqld server + +------------------------------------------------------------------- +Mon Sep 23 13:57:05 UTC 2019 - pgajdos@suse.com + +- version update to 0.7.6 + **NOTICE: Database schema generated by SortingHat < 0.7.0 is still + compatible but older versions can have problems inserting UTF-8 + characters of 4 bytes. + **Python 2.7 is no longer supported. + **NOTICE: Database schema generated by SortingHat < 0.6.0 are no longer + compatible. Please check "Compatibility between versions" section from + README.md file** + **NOTICE: Database schema generated by SortingHat < 0.5.0 are no longer + compatible. Please check "Compatibility between versions" section from + README.md file** +- added patches + https://github.com/chaoss/grimoirelab-sortinghat/issues/121 + + python-sortinghat-gh-121-workaround.patch +- python3-only package + +------------------------------------------------------------------- +Tue Dec 4 12:54:29 UTC 2018 - Matej Cepl + +- Remove superfluous devel dependency for noarch package + ------------------------------------------------------------------- Thu Nov 9 21:01:40 UTC 2017 - sebix+novell.com@sebix.at diff --git a/python-sortinghat.spec b/python-sortinghat.spec index 220b723..fadbfc7 100644 --- a/python-sortinghat.spec +++ b/python-sortinghat.spec @@ -1,7 +1,7 @@ # # spec file for package python-sortinghat # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -12,39 +12,50 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# +%define binaries stackalytics2sh mozilla2sh mailmap2sh grimoirelab2sh gitdm2sh eclipse2sh sortinghat sh2mg mg2sh + %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without test +%define skip_python2 1 +%define skip_python36 1 Name: python-sortinghat -Version: 0.4.3 +Version: 0.7.15 Release: 0 -License: GPL-3.0 Summary: A tool to manage identities -Url: https://github.com/grimoirelab/sortinghat +License: GPL-3.0-only Group: Development/Languages/Python -Source: https://files.pythonhosted.org/packages/source/s/sortinghat/sortinghat-%{version}.tar.gz -BuildRequires: python-rpm-macros -BuildRequires: %{python_module devel} +URL: https://github.com/grimoirelab/sortinghat +Source0: https://files.pythonhosted.org/packages/source/s/sortinghat/sortinghat-%{version}.tar.gz BuildRequires: %{python_module setuptools} -%if %{with test} -BuildRequires: %{python_module Jinja2} -BuildRequires: %{python_module pandas >= 0.17} -BuildRequires: %{python_module PyMySQL} -BuildRequires: %{python_module python-dateutil >= 2.6.0} -BuildRequires: %{python_module PyYAML >= 3.12} -BuildRequires: %{python_module SQLAlchemy >= 1.0.0} -%endif BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-Jinja2 -Requires: python-pandas >= 0.17 -Requires: python-PyMySQL -Requires: python-python-dateutil >= 2.6.0 +Requires: python-PyMySQL >= 0.7.0 Requires: python-PyYAML >= 3.12 -Requires: python-SQLAlchemy >= 1.0.0 +Requires: python-SQLAlchemy >= 1.2 +Requires: python-pandas >= 0.18.1 +Requires: python-python-dateutil >= 2.6.0 +Requires: python-requests >= 2.9 +Requires: python-urllib3 >= 1.22 +Requires(post): update-alternatives +Requires(postun):update-alternatives BuildArch: noarch - +# SECTION test requirements +BuildRequires: %{python_module Jinja2} +BuildRequires: %{python_module PyMySQL >= 0.7.0} +BuildRequires: %{python_module PyYAML >= 3.12} +BuildRequires: %{python_module SQLAlchemy >= 1.2} +BuildRequires: %{python_module httpretty >= 0.9.5} +BuildRequires: %{python_module mock} +BuildRequires: %{python_module pandas >= 0.17} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module python-dateutil >= 2.6.0} +BuildRequires: %{python_module requests >= 2.9} +BuildRequires: mariadb-rpm-macros +# /SECTION %python_subpackages %description @@ -73,26 +84,73 @@ to store the identities obtained into its database, and later merge them into unique identities (and maybe affiliate them). %prep -%setup -q -n sortinghat-%{version} +%autosetup -p1 -n sortinghat-%{version} + +sed -i -e "s/\('pandoc'\|'wheel',\)//" -e 's/==/>=/' setup.py %build %python_build %install %python_install +for b in %{binaries}; do + %python_clone -a %{buildroot}%{_bindir}/$b +done %python_expand %fdupes %{buildroot}%{$python_sitelib} +%check +exit_code=0 +user=auth_db_user +pass=auth_db_pass +port=63306 +dbname=testhat +run_dir=/tmp/mysql +# +# start the mariadb server +# +%mysql_testserver_start -u $user -p $pass -t $port -d $dbname +# +# running the test +# +# this is read by TestDatabaseCaseBase.setUpClass +cat << EOF > tests/tests.conf +[Database] +name=$dbname +host=127.0.0.1 +port=$port +user=$user +password=$pass +create=False +EOF +sed -i -e "s/'3306'/self.kwargs['port']/" tests/test_cmd_init.py +%pyunittest discover -b -v || exit_code=1 +# +# stopping mariadb +# +%mysql_testserver_stop +exit $exit_code + +%post +for b in %{binaries}; do + %python_install_alternative $b +done + +%postun +for b in %{binaries}; do + %python_uninstall_alternative stackalytics2sh +done + %files %{python_files} %doc NEWS README.md -%python3_only %{_bindir}/mg2sh -%python3_only %{_bindir}/sh2mg -%python3_only %{_bindir}/sortinghat -%python3_only %{_bindir}/eclipse2sh -%python3_only %{_bindir}/gitdm2sh -%python3_only %{_bindir}/grimoirelab2sh -%python3_only %{_bindir}/mailmap2sh -%python3_only %{_bindir}/mozilla2sh -%python3_only %{_bindir}/stackalytics2sh +%python_alternative %{_bindir}/mg2sh +%python_alternative %{_bindir}/sh2mg +%python_alternative %{_bindir}/sortinghat +%python_alternative %{_bindir}/eclipse2sh +%python_alternative %{_bindir}/gitdm2sh +%python_alternative %{_bindir}/grimoirelab2sh +%python_alternative %{_bindir}/mailmap2sh +%python_alternative %{_bindir}/mozilla2sh +%python_alternative %{_bindir}/stackalytics2sh %{python_sitelib}/* %changelog diff --git a/sortinghat-0.4.3.tar.gz b/sortinghat-0.4.3.tar.gz deleted file mode 100644 index c3c7b95..0000000 --- a/sortinghat-0.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:207caf1b5185fe999df7751e6ac8b89108c0e1f16cd00d6d2b9c7a57efb4ea52 -size 74043 diff --git a/sortinghat-0.7.15.tar.gz b/sortinghat-0.7.15.tar.gz new file mode 100644 index 0000000..4d297bc --- /dev/null +++ b/sortinghat-0.7.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ee1696ddc726f8ca3a2c6554d7673409a23b9297ce1ea5ace98f1518fd092f2 +size 190520