The package rpms/conda.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/conda.git/commit/?id=40ac1af88132f43....
Change: +%ifnarch x86_64
Thanks.
Full change: ============
commit 40ac1af88132f43e80ee1a34088510c6750031a9 Author: Orion Poplawski orion@nwra.com Date: Sat Oct 31 11:03:13 2020 -0600
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.
commit 148f0cad5a16c67717104d257f1d34c7da13e5c1 Author: Orion Poplawski orion@nwra.com Date: Tue Oct 27 22:14:05 2020 -0600
Use %{_host_cpu}
diff --git a/conda.spec b/conda.spec index ad12571..09f2a1d 100644 --- a/conda.spec +++ b/conda.spec @@ -134,8 +134,8 @@ find conda -name *.py | xargs sed -i -e 's/^( *)from .*_vendor.((distro|f 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,%{_arch}} -sed -i -e s/linux-64/linux-%{_arch}/ tests/data/conda_format_repo/linux-%{_arch}/*json +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
%build
commit b119cc23fe096b56f7b0500ccb9610c7f7d14c26 Author: Orion Poplawski orion@nwra.com Date: Tue Oct 27 21:56:20 2020 -0600
Fix arch macro
diff --git a/conda.spec b/conda.spec index c6137e6..ad12571 100644 --- a/conda.spec +++ b/conda.spec @@ -134,8 +134,8 @@ find conda -name *.py | xargs sed -i -e 's/^( *)from .*_vendor.((distro|f 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,%{build_arch}} -sed -i -e s/linux-64/linux-%{build_arch}/ tests/data/conda_format_repo/linux-%{build_arch}/*json +cp -a tests/data/conda_format_repo/linux-{64,%{_arch}} +sed -i -e s/linux-64/linux-%{_arch}/ tests/data/conda_format_repo/linux-%{_arch}/*json
%build
commit 5950abbbbdf96035507c4a19966b8f54b856f079 Author: Orion Poplawski orion@nwra.com Date: Tue Oct 27 21:46:36 2020 -0600
Try to fix tests on non-x86_64
diff --git a/conda.spec b/conda.spec index f5e0655..c6137e6 100644 --- a/conda.spec +++ b/conda.spec @@ -133,6 +133,9 @@ find conda -name *.py | xargs sed -i -e 's/^( *)from .*_vendor.((distro|f # 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,%{build_arch}} +sed -i -e s/linux-64/linux-%{build_arch}/ tests/data/conda_format_repo/linux-%{build_arch}/*json
%build
commit b31022a357849f58b9f3c0b205eca6f47242d5bc Author: Orion Poplawski orion@nwra.com Date: Tue Oct 27 21:37:33 2020 -0600
Try to fix tests on 32-bit
diff --git a/conda.spec b/conda.spec index 611f5b1..f5e0655 100644 --- a/conda.spec +++ b/conda.spec @@ -130,6 +130,10 @@ 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/'
+# 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 +
%build # build conda executable
commit 4b1160713cbdfa7924dacfb6851c69817d22453b Author: Orion Poplawski orion@nwra.com Date: Tue Oct 27 20:39:57 2020 -0600
Update to 4.9.1
diff --git a/conda.spec b/conda.spec index 87e41e7..611f5b1 100644 --- a/conda.spec +++ b/conda.spec @@ -1,7 +1,7 @@ %{!?_with_bootstrap: %global bootstrap 0}
Name: conda -Version: 4.9.0 +Version: 4.9.1 Release: 1%{?dist} Summary: Cross-platform, Python-agnostic binary package manager
@@ -214,6 +214,9 @@ py.test-%{python3_version} -vv -m "not integration" \
%changelog +* Tue Oct 27 2020 Orion Poplawski orion@nwra.com - 4.9.1-1 +- Update to 4.9.1 + * Sun Oct 18 2020 Orion Poplawski orion@nwra.com - 4.9.0-1 - Update to 4.9.0
diff --git a/sources b/sources index be8d48d..fe97aad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (conda-4.9.0.tar.gz) = a4100d6a50e1c48294f3737d593aed85de83a28d44eb2e842455fc2b47cca257ee3e14b847bb5bc2217d293b9dd5210850eb3fe857ec9bb837e90095ccf54229 +SHA512 (conda-4.9.1.tar.gz) = 40be24067aad1b50aecc33fd11aff55c5a28de5a67683341c296be2da6c9f90353ef21ff7c4a6e57a1f19ac3a5d7702ef0fd40273775ecf4fe39f2428cb4b0a0
commit 6442fbd7cfed91f6260ba6e6e7bddb31d54f58ec Author: Orion Poplawski orion@nwra.com Date: Sun Oct 18 16:43:11 2020 -0600
Add BR python-unversioned-command for tests
diff --git a/conda.spec b/conda.spec index 1002ece..87e41e7 100644 --- a/conda.spec +++ b/conda.spec @@ -83,6 +83,7 @@ BuildRequires: %py3_reqs BuildRequires: python%{python3_pkgversion}-cytoolz >= 0.8.2 %endif # For tests +BuildRequires: python-unversioned-command BuildRequires: python%{python3_pkgversion}-mock BuildRequires: python%{python3_pkgversion}-pytest-cov BuildRequires: python%{python3_pkgversion}-responses
commit e5e79115a14fa277b661fe380441d4b98c66d06b Author: Orion Poplawski orion@nwra.com Date: Sun Oct 18 15:50:54 2020 -0600
Update to 4.9.0
diff --git a/0001-Fix-toolz-imports.patch b/0001-Fix-toolz-imports.patch index 115e7ae..c4b288f 100644 --- a/0001-Fix-toolz-imports.patch +++ b/0001-Fix-toolz-imports.patch @@ -1,7 +1,35 @@ -diff -up conda-4.8.4/conda_env/env.py.toolz conda-4.8.4/conda_env/env.py ---- conda-4.8.4/conda_env/env.py.toolz 2020-08-06 15:02:52.000000000 -0600 -+++ conda-4.8.4/conda_env/env.py 2020-08-07 19:15:32.665971754 -0600 -@@ -22,10 +22,7 @@ from conda.models.prefix_graph import Pr +From 5115316f1cb11b2e5fcc687361b0c9a04dfe62fb Mon Sep 17 00:00:00 2001 +From: rpm-build <rpm-build> +Date: Sun, 18 Oct 2020 15:43:33 -0600 +Subject: [PATCH] Fix toolz imports + +--- + conda/plan.py | 2 +- + conda_env/env.py | 5 +---- + tests/base/test_context.py | 2 +- + tests/core/test_path_actions.py | 2 +- + tests/test_activate.py | 2 +- + tests/test_create.py | 2 +- + 6 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/conda/plan.py b/conda/plan.py +index e0c2ec6..b87c9dc 100644 +--- a/conda/plan.py ++++ b/conda/plan.py +@@ -371,7 +371,7 @@ def _plan_from_actions(actions, index): # pragma: no cover + def _inject_UNLINKLINKTRANSACTION(plan, index, prefix, axn, specs): # pragma: no cover + from os.path import isdir + from .models.dist import Dist +- from ._vendor.toolz.itertoolz import groupby ++ from ._vendor.toolz import groupby + from .instructions import LINK, PROGRESSIVEFETCHEXTRACT, UNLINK, UNLINKLINKTRANSACTION + from .core.package_cache_data import ProgressiveFetchExtract + from .core.link import PrefixSetup, UnlinkLinkTransaction +diff --git a/conda_env/env.py b/conda_env/env.py +index 4e83f88..09eb1a1 100644 +--- a/conda_env/env.py ++++ b/conda_env/env.py +@@ -22,10 +22,7 @@ from conda.models.prefix_graph import PrefixGraph from . import compat, exceptions from conda.history import History
@@ -12,34 +40,11 @@ diff -up conda-4.8.4/conda_env/env.py.toolz conda-4.8.4/conda_env/env.py +from conda._vendor.toolz import concatv, groupby # NOQA
- VALID_KEYS = ('name', 'dependencies', 'prefix', 'channels') -diff -up conda-4.8.4/tests/test_activate.py.toolz conda-4.8.4/tests/test_activate.py ---- conda-4.8.4/tests/test_activate.py.toolz 2020-08-06 15:02:52.000000000 -0600 -+++ conda-4.8.4/tests/test_activate.py 2020-08-07 19:14:33.242033514 -0600 -@@ -16,7 +16,7 @@ import json - from conda import __version__ as conda_version - from conda import CONDA_PACKAGE_ROOT - from conda._vendor.auxlib.ish import dals --from conda._vendor.toolz.itertoolz import concatv -+from conda._vendor.toolz import concatv - from conda.activate import CmdExeActivator, CshActivator, FishActivator, PosixActivator, \ - PowerShellActivator, XonshActivator, activator_map, _build_activator_cls, \ - main as activate_main, native_path_to_unix -diff -up conda-4.8.4/conda/plan.py.toolz conda-4.8.4/conda/plan.py ---- conda-4.8.4/conda/plan.py.toolz 2020-08-07 19:18:38.055645342 -0600 -+++ conda-4.8.4/conda/plan.py 2020-08-07 19:19:35.437559525 -0600 -@@ -371,7 +371,7 @@ def _plan_from_actions(actions, index): - def _inject_UNLINKLINKTRANSACTION(plan, index, prefix, axn, specs): # pragma: no cover - from os.path import isdir - from .models.dist import Dist -- from ._vendor.toolz.itertoolz import groupby -+ from ._vendor.toolz import groupby - from .instructions import LINK, PROGRESSIVEFETCHEXTRACT, UNLINK, UNLINKLINKTRANSACTION - from .core.package_cache_data import ProgressiveFetchExtract - from .core.link import PrefixSetup, UnlinkLinkTransaction -diff -up conda-4.8.4/tests/base/test_context.py.toolz conda-4.8.4/tests/base/test_context.py ---- conda-4.8.4/tests/base/test_context.py.toolz 2020-08-06 15:02:52.000000000 -0600 -+++ conda-4.8.4/tests/base/test_context.py 2020-08-07 19:19:51.541567204 -0600 + VALID_KEYS = ('name', 'dependencies', 'prefix', 'channels', 'variables') +diff --git a/tests/base/test_context.py b/tests/base/test_context.py +index 264e2dc..ae0e256 100644 +--- a/tests/base/test_context.py ++++ b/tests/base/test_context.py @@ -11,7 +11,7 @@ import pytest
from conda._vendor.auxlib.collection import AttrDict @@ -49,9 +54,10 @@ diff -up conda-4.8.4/tests/base/test_context.py.toolz conda-4.8.4/tests/base/tes from conda.base.constants import PathConflict, ChannelPriority from conda.base.context import context, reset_context, conda_tests_ctxt_mgmt_def_pol from conda.common.compat import odict, iteritems -diff -up conda-4.8.4/tests/core/test_path_actions.py.toolz conda-4.8.4/tests/core/test_path_actions.py ---- conda-4.8.4/tests/core/test_path_actions.py.toolz 2020-08-06 15:02:52.000000000 -0600 -+++ conda-4.8.4/tests/core/test_path_actions.py 2020-08-07 19:20:13.387588336 -0600 +diff --git a/tests/core/test_path_actions.py b/tests/core/test_path_actions.py +index 02b5c5f..c9e55ba 100644 +--- a/tests/core/test_path_actions.py ++++ b/tests/core/test_path_actions.py @@ -11,7 +11,7 @@ from uuid import uuid4 import pytest
@@ -61,9 +67,23 @@ diff -up conda-4.8.4/tests/core/test_path_actions.py.toolz conda-4.8.4/tests/cor from conda.base.context import context from conda.common.compat import PY2, on_win from conda.common.path import get_bin_directory_short_path, get_python_noarch_target_path, \ -diff -up conda-4.8.4/tests/test_create.py.toolz conda-4.8.4/tests/test_create.py ---- conda-4.8.4/tests/test_create.py.toolz 2020-08-06 15:02:52.000000000 -0600 -+++ conda-4.8.4/tests/test_create.py 2020-08-07 19:20:05.486574208 -0600 +diff --git a/tests/test_activate.py b/tests/test_activate.py +index d319cd0..99658d4 100644 +--- a/tests/test_activate.py ++++ b/tests/test_activate.py +@@ -16,7 +16,7 @@ import json + from conda import __version__ as conda_version + from conda import CONDA_PACKAGE_ROOT + from conda._vendor.auxlib.ish import dals +-from conda._vendor.toolz.itertoolz import concatv ++from conda._vendor.toolz import concatv + from conda.activate import CmdExeActivator, CshActivator, FishActivator, PosixActivator, \ + PowerShellActivator, XonshActivator, activator_map, _build_activator_cls, \ + main as activate_main, native_path_to_unix +diff --git a/tests/test_create.py b/tests/test_create.py +index 2d230dc..3265623 100644 +--- a/tests/test_create.py ++++ b/tests/test_create.py @@ -6,7 +6,7 @@ from datetime import datetime from glob import glob
@@ -73,3 +93,6 @@ diff -up conda-4.8.4/tests/test_create.py.toolz conda-4.8.4/tests/test_create.py from conda.gateways.disk.permissions import make_read_only from conda.models.channel import Channel from conda.resolve import Resolve +-- +2.29.0.rc2 + diff --git a/conda.spec b/conda.spec index 36559fa..1002ece 100644 --- a/conda.spec +++ b/conda.spec @@ -1,8 +1,8 @@ %{!?_with_bootstrap: %global bootstrap 0}
Name: conda -Version: 4.8.5 -Release: 2%{?dist} +Version: 4.9.0 +Release: 1%{?dist} Summary: Cross-platform, Python-agnostic binary package manager
License: BSD and ASL 2.0 and LGPLv2+ and MIT @@ -213,6 +213,9 @@ py.test-%{python3_version} -vv -m "not integration" \
%changelog +* Sun Oct 18 2020 Orion Poplawski orion@nwra.com - 4.9.0-1 +- Update to 4.9.0 + * Mon Sep 21 2020 Orion Poplawski orion@nwra.com - 4.8.5-2 - Add note to description about base environment
diff --git a/sources b/sources index 53ee79d..be8d48d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (conda-4.8.5.tar.gz) = f8ad1c42d612f86ec67f6f3dc78758d63635ee0c2126caf09cdfa5606395a3e5ce5a919f67c4544327afddfa656afea5a2f67dc21e0fe382c3b08ad2831287a4 +SHA512 (conda-4.9.0.tar.gz) = a4100d6a50e1c48294f3737d593aed85de83a28d44eb2e842455fc2b47cca257ee3e14b847bb5bc2217d293b9dd5210850eb3fe857ec9bb837e90095ccf54229
commit ca6146294f46dbcf083e800f54be305ec84b8d5a Author: Orion Poplawski orion@nwra.com Date: Mon Sep 21 20:09:51 2020 -0600
Add note to description about base environment
diff --git a/conda.spec b/conda.spec index 7a1ef73..36559fa 100644 --- a/conda.spec +++ b/conda.spec @@ -2,7 +2,7 @@
Name: conda Version: 4.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform, Python-agnostic binary package manager
License: BSD and ASL 2.0 and LGPLv2+ and MIT @@ -48,7 +48,12 @@ Conda is a cross-platform, Python-agnostic binary package manager. It is the package manager used by Anaconda installations, but it may be used for other systems as well. Conda makes environments first-class citizens, making it easy to create independent environments even for -C libraries. Conda is written entirely in Python.} +C libraries. Conda is written entirely in Python. + +The Fedora conda base environment is special. Unlike a standard +anaconda install base environment it is essentially read-only. You +can only use conda to create and manage new environments.} +
%description %_description
@@ -208,6 +213,9 @@ py.test-%{python3_version} -vv -m "not integration" \
%changelog +* Mon Sep 21 2020 Orion Poplawski orion@nwra.com - 4.8.5-2 +- Add note to description about base environment + * Mon Sep 14 2020 Orion Poplawski orion@nwra.com - 4.8.5-1 - Update to 4.8.5 - Install conda.fish (bz#1878306)
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org