From 44e4e8be92878eacd8dd8f7724b14c8a10e332c7536cf3fc55f280aaf5c998ac Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 17 Jan 2021 22:51:55 +0000 Subject: [PATCH] Accepting request 863918 from home:bnavigator:branches:devel:languages:python - Fix test call (the old non-macro pytest call did conflict with _build directories from other python3 flavors) - Fix line endings and remove interpreter lines in sitelib OBS-URL: https://build.opensuse.org/request/show/863918 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-scrypt?expand=0&rev=11 --- python-scrypt.changes | 7 +++++++ python-scrypt.spec | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/python-scrypt.changes b/python-scrypt.changes index 79bc612..e4501cc 100644 --- a/python-scrypt.changes +++ b/python-scrypt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jan 17 21:50:47 UTC 2021 - Benjamin Greiner + +- Fix test call (the old non-macro pytest call did conflict with + _build directories from other python3 flavors) +- Fix line endings and remove interpreter lines in sitelib + ------------------------------------------------------------------- Tue Dec 1 14:31:41 UTC 2020 - Dirk Mueller diff --git a/python-scrypt.spec b/python-scrypt.spec index 8893da5..5c66a1f 100644 --- a/python-scrypt.spec +++ b/python-scrypt.spec @@ -1,7 +1,7 @@ # # spec file for package python-scrypt # -# 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 @@ -22,18 +22,16 @@ Version: 0.8.17 Release: 0 Summary: Bindings for scrypt License: BSD-2-Clause -URL: https://bitbucket.org/mhallin/py-scrypt +URL: https://github.com/holgern/py-scrypt Source0: https://files.pythonhosted.org/packages/source/s/scrypt/scrypt-%{version}.tar.gz BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} +BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: pkgconfig(openssl) -# SECTION test requires -BuildRequires: %{python_module pytest} -# /SECTION %python_subpackages %description @@ -41,6 +39,8 @@ Bindings for the scrypt key derivation function library. %prep %setup -q -n scrypt-%{version} +dos2unix -R README.rst scrypt/*.py +sed -i '1{/^#!/ d}' scrypt/*.py %build %python_build @@ -50,7 +50,7 @@ Bindings for the scrypt key derivation function library. %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -mpytest +%pyunittest_arch discover -s scrypt/tests -v %files %{python_files} %doc README.rst