From 8d367458b15ed5e2dd679376c59b0d4da12e85cc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Aug 08 2020 01:26:58 +0000 Subject: Update to 4.8.4 --- diff --git a/0001-Fix-toolz-imports.patch b/0001-Fix-toolz-imports.patch index 25f43f6..115e7ae 100644 --- a/0001-Fix-toolz-imports.patch +++ b/0001-Fix-toolz-imports.patch @@ -1,28 +1,45 @@ -diff --git a/conda_env/env.py b/conda_env/env.py -index 27356c4..48ebc20 100644 ---- a/conda_env/env.py -+++ b/conda_env/env.py -@@ -16,15 +16,11 @@ from conda.core.prefix_data import PrefixData - from conda.models.enums import PackageType - from conda.models.match_spec import MatchSpec - from conda.models.prefix_graph import PrefixGraph -+from conda._vendor.toolz import concatv, groupby - from conda_env.yaml import dump - from . import compat, exceptions, yaml +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 . import compat, exceptions from conda.history import History -try: - from cytoolz.itertoolz import concatv, groupby -except ImportError: # pragma: no cover - from conda._vendor.toolz.itertoolz import concatv, groupby # NOQA -- ++from conda._vendor.toolz import concatv, groupby # NOQA - VALID_KEYS = ('name', 'dependencies', 'prefix', 'channels') -diff --git a/tests/base/test_context.py b/tests/base/test_context.py -index 8ddc6fc..cafba9b 100644 ---- a/tests/base/test_context.py -+++ b/tests/base/test_context.py + 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 @@ -11,7 +11,7 @@ import pytest from conda._vendor.auxlib.collection import AttrDict @@ -32,10 +49,9 @@ index 8ddc6fc..cafba9b 100644 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 --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 +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 @@ -11,7 +11,7 @@ from uuid import uuid4 import pytest @@ -45,23 +61,9 @@ index 02b5c5f..c9e55ba 100644 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 --git a/tests/test_activate.py b/tests/test_activate.py -index 77da453..1792f1f 100644 ---- a/tests/test_activate.py -+++ b/tests/test_activate.py -@@ -14,7 +14,7 @@ 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, main as activate_main, native_path_to_unix - from conda.base.constants import ROOT_ENV_NAME, PREFIX_STATE_FILE, PACKAGE_ENV_VARS_DIR, \ -diff --git a/tests/test_create.py b/tests/test_create.py -index acb28f9..6fc5b73 100644 ---- a/tests/test_create.py -+++ b/tests/test_create.py +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 @@ -6,7 +6,7 @@ from datetime import datetime from glob import glob diff --git a/conda-32bit.patch b/conda-32bit.patch index 75b8219..b40d819 100644 --- a/conda-32bit.patch +++ b/conda-32bit.patch @@ -1,25 +1,20 @@ -diff -up conda-4.8.3/tests/core/test_solve.py.32bit conda-4.8.3/tests/core/test_solve.py ---- conda-4.8.3/tests/core/test_solve.py.32bit 2020-03-13 10:20:45.000000000 -0600 -+++ conda-4.8.3/tests/core/test_solve.py 2020-03-15 11:35:06.860949414 -0600 -@@ -4,6 +4,7 @@ from __future__ import absolute_import, - from contextlib import contextmanager - import os - from pprint import pprint -+from platform import architecture - import sys - from textwrap import dedent - import copy -@@ -273,11 +274,11 @@ def test_cuda_fail_1(tmpdir): +diff -up conda-4.8.4/tests/core/test_solve.py.32bit conda-4.8.4/tests/core/test_solve.py +--- conda-4.8.4/tests/core/test_solve.py.32bit 2020-08-06 15:02:52.000000000 -0600 ++++ conda-4.8.4/tests/core/test_solve.py 2020-08-07 19:12:28.240154100 -0600 +@@ -284,14 +284,14 @@ def test_cuda_fail_1(tmpdir): if sys.platform == "darwin": plat = "osx-64" elif sys.platform == "linux": - plat = "linux-64" -+ plat = "linux-%s" % architecture()[0][0:2] ++ plat = "linux-%s" % platform.architecture()[0][0:2] elif sys.platform == "win32": - plat = "win-64" + if platform.architecture()[0] == "32bit": + plat = "win-32" + else: + plat = "win-64" else: - plat = "linux-64" -+ plat = "linux-%s" % architecture()[0][0:2] - assert str(exc.value).strip() == dals("""The following specifications were found to be incompatible with your CUDA driver: ++ plat = "linux-%s" % platform.architecture()[0][0:2] + + assert str(exc.value).strip() == dals("""The following specifications were found to be incompatible with your system: - - feature:/{}::__cuda==8.0=0 diff --git a/conda.spec b/conda.spec index a38eb0e..ff4c803 100644 --- a/conda.spec +++ b/conda.spec @@ -1,8 +1,8 @@ %{!?_with_bootstrap: %global bootstrap 0} Name: conda -Version: 4.8.3 -Release: 4%{?dist} +Version: 4.8.4 +Release: 1%{?dist} Summary: Cross-platform, Python-agnostic binary package manager License: BSD and ASL 2.0 and LGPLv2+ and MIT @@ -29,7 +29,6 @@ Patch10003: 0003-Drop-fs-path-encoding-manipulation-under-python2.patch Patch10004: 0004-Do-not-try-to-run-usr-bin-python.patch Patch10005: 0005-Fix-failing-tests-in-test_api.py.patch Patch10006: 0006-shell-assume-shell-plugins-are-in-etc.patch -Patch10007: 0007-Fix-import-of-collections.abc.Iterable.patch BuildArch: noarch @@ -198,6 +197,9 @@ py.test-%{python3_version} -vv -m "not integration" \ %changelog +* Sat Aug 08 01:07:41 GMT 2020 Orion Poplawski - 4.8.4-1 +- Update to 4.8.4 + * Sat Aug 01 2020 Fedora Release Engineering - 4.8.3-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -208,7 +210,7 @@ py.test-%{python3_version} -vv -m "not integration" \ * Tue May 26 2020 Miro Hrončok - 4.8.3-2 - Rebuilt for Python 3.9 -* Sun Mar 14 2020 Orion Poplawski - 4.8.3-1 +* Sun Mar 15 2020 Orion Poplawski - 4.8.3-1 - Update to 4.8.3 * Tue Feb 4 2020 Zbigniew Jędrzejewski-Szmek - 4.8.2-2 diff --git a/sources b/sources index 43f5645..6e55f5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (conda-4.8.3.tar.gz) = e49036a93d14fc282443aef69b8d2f571da7d30e8255cd08081d7ed6e9c4c68e007707ac5d38105768b89c5fbdee47e4baa36037a80a27d2159513257d87c586 +SHA512 (conda-4.8.4.tar.gz) = c49e139af810a50dc54a927484191834e150dd06ffeb2ceb7308fa707c2d63c57850a1ada05295b74dcc719d0a23d8b1a2e4e7498a9e4e8ddde90f57e3f7f87b