From 40ac1af88132f43e80ee1a34088510c6750031a9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Oct 31 2020 17:03:13 +0000 Subject: Use %python3_platform for test names; Run conda info in %check --- diff --git a/conda.spec b/conda.spec index 09f2a1d..d7a84c5 100644 --- a/conda.spec +++ b/conda.spec @@ -130,12 +130,14 @@ rm conda/_vendor/toolz/[a-zA-Z]* rm -r conda/_vendor/{distro.py,frozendict.py,tqdm} find conda -name \*.py | xargs sed -i -e 's/^\( *\)from .*_vendor\.\(\(distro\|frozendict\|tqdm\).*\) import/\1from \2 import/' +%ifnarch x86_64 # Tests on 32-bit cp -a tests/data/conda_format_repo/linux-{64,32} sed -i -e s/linux-64/linux-32/ tests/data/conda_format_repo/linux-32/*json # Tests on non-x86_64 -cp -a tests/data/conda_format_repo/linux-{64,%{_host_cpu}} -sed -i -e s/linux-64/linux-%{_host_cpu}/ tests/data/conda_format_repo/linux-%{_host_cpu}/*json +cp -a tests/data/conda_format_repo/{linux-64,%{python3_platform}} +sed -i -e s/linux-64/%{python3_platform}/ tests/data/conda_format_repo/%{python3_platform}/*json +%endif %build @@ -172,6 +174,7 @@ install -m 0644 -Dt %{buildroot}%{bash_completionsdir}/ %SOURCE1 %check export PATH=%{buildroot}%{_bindir}:$PATH +PYTHONPATH=%{buildroot}%{python3_sitelib} conda info # Integration tests generally require network, so skip them.