diff --git a/python-calmjs.changes b/python-calmjs.changes index a6fe645..83325be 100644 --- a/python-calmjs.changes +++ b/python-calmjs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 14 15:04:12 UTC 2020 - pgajdos@suse.com + +- fix build in SLE-15: set en_US.UTF-8 encoding +- %check the package + ------------------------------------------------------------------- Mon Jan 6 15:32:29 UTC 2020 - Tomáš Chvátal diff --git a/python-calmjs.spec b/python-calmjs.spec index c29866c..d9e2a26 100644 --- a/python-calmjs.spec +++ b/python-calmjs.spec @@ -29,6 +29,10 @@ BuildRequires: %{python_module calmjs.types} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +# SECTION test requirements +BuildRequires: %{python_module pytest} +BuildRequires: nodejs-common +# /SECTION Requires: python-calmjs.parse >= 1.0.0 Requires: python-calmjs.types Requires(post): update-alternatives @@ -48,9 +52,11 @@ rm src/calmjs/tests/test_npm.py rm src/calmjs/tests/test_yarn.py %build +LANG=en_US.UTF-8 %python_build %install +LANG=en_US.UTF-8 %python_install %python_clone -a %{buildroot}%{_bindir}/calmjs %python_expand rm -r %{buildroot}%{$python_sitelib}/calmjs/testing @@ -58,14 +64,13 @@ rm src/calmjs/tests/test_yarn.py %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -#export LANG=en_US.UTF8 -#%%{python_expand #first link the stuff for the weird layout -#ln -s %{$python_sitelib}/calmjs/types src/calmjs/ -#ln -s %{$python_sitelib}/calmjs/parse src/calmjs/ -#pushd src -#$python -m unittest calmjs.tests.make_suite -v -#popd -#} +pushd src +%if 0%{?suse_version} > 1500 +%pytest -k 'not (test_setup_egg_info or test_build_calmjs_artifact)' +%else +%python_expand $python -m pytest -k 'not (test_setup_egg_info or test_build_calmjs_artifact)' +%endif +popd %post %python_install_alternative calmjs