From a8a3bac26eab1e8efdd536165f09c5eb77fc7de7c2cd6839bfd57a459eb8dbef Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 16 Nov 2021 14:21:51 +0000 Subject: [PATCH 1/2] - Remove creation of the unnecessary __init__py, which breaks the test suite (gh#calmjs/calmjs#61). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-calmjs?expand=0&rev=10 --- python-calmjs.changes | 6 ++++++ python-calmjs.spec | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/python-calmjs.changes b/python-calmjs.changes index 59424cc..82a694b 100644 --- a/python-calmjs.changes +++ b/python-calmjs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 16 14:18:02 UTC 2021 - Matej Cepl + +- Remove creation of the unnecessary __init__py, which breaks the test + suite (gh#calmjs/calmjs#61). + ------------------------------------------------------------------- Thu Nov 11 22:29:55 UTC 2021 - Matej Cepl diff --git a/python-calmjs.spec b/python-calmjs.spec index 9c0d411..07b503a 100644 --- a/python-calmjs.spec +++ b/python-calmjs.spec @@ -60,15 +60,13 @@ export LANG=en_US.UTF-8 %python_clone -a %{buildroot}%{_bindir}/calmjs # %%python_expand rm -r %%{buildroot}%%{$python_sitelib}/calmjs/testing # %%python_expand rm -r %%{buildroot}%%{$python_sitelib}/calmjs/tests -%{python_expand touch %{buildroot}%{$python_sitelib}/calmjs/__init__.py -%fdupes %{buildroot}%{$python_sitelib} -} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check export LANG=en_US.UTF-8 # gh#calmjs/calmjs#61 -%python_expand rm -v %{buildroot}%{$python_sitelib}/calmjs/tests/test_argparse.py -%pyunittest discover -v -s %{buildroot}%{$python_sitelib}/calmjs/ +# %%python_expand rm -v %%{buildroot}%%{$python_sitelib}/calmjs/tests/test_argparse.py +%pyunittest -v calmjs.tests.make_suite %post %python_install_alternative calmjs From b0ddc4762751d2bf2f4a48c0f5a87278bf6de68654b5e03b0fd3c7e77a3de714 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 16 Nov 2021 14:29:08 +0000 Subject: [PATCH 2/2] Don't build with Python 2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-calmjs?expand=0&rev=11 --- python-calmjs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-calmjs.spec b/python-calmjs.spec index 07b503a..1dd54ac 100644 --- a/python-calmjs.spec +++ b/python-calmjs.spec @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-calmjs Version: 3.4.2 Release: 0