Compare commits

...
Sign in to create a new pull request.

119 commits

Author SHA1 Message Date
Orion Poplawski
5867b044fe Update to 25.11.1 2025-12-12 07:54:53 -07:00
Orion Poplawski
c81db4c15e Re-enable dep on conda-libmamba-solver 2025-12-07 10:51:37 -07:00
Orion Poplawski
3d686dc69a Fix dependencies and bundled versions 2025-11-27 12:01:55 -07:00
Orion Poplawski
dd5dca4cb9 Update to 25.11.0 (rhbz#2356170) 2025-11-26 08:45:35 -07:00
Python Maint
0884a0436b Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 12:11:41 +02:00
Python Maint
14d9eba336 Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 12:42:31 +02:00
Fedora Release Engineering
1b5bb91b02 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 18:36:22 +00:00
Python Maint
76ff27954e Unbootstrap for Python 3.14 2025-07-21 11:29:50 +02:00
Python Maint
b7b10a0b9b Bootstrap for Python 3.14.0b3 bytecode 2025-06-18 15:50:46 +02:00
Python Maint
d7c8539d8c Bootstrap for Python 3.14 2025-06-06 16:44:31 +02:00
Orion Poplawski
5f82b139a5 Update to 24.11.3 2025-01-20 17:14:43 -07:00
Fedora Release Engineering
021e812451 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 14:23:14 +00:00
Orion Poplawski
ba451f3238 Update to 24.11.2 2024-12-20 22:01:51 -07:00
Orion Poplawski
983031fe72 Update to 24.11.1 2024-12-11 20:33:50 -07:00
Orion Poplawski
f8dda64679 Update to 24.11.0 2024-11-30 13:54:57 -07:00
Orion Poplawski
66a66b0a76 Update to 24.9.2 2024-10-17 07:47:42 -06:00
Orion Poplawski
c03d4ab444 Set default channel to conda-forge (rhbz#2279958) 2024-10-08 21:05:19 -06:00
Orion Poplawski
f349058d4f Update to 24.9.1 2024-10-08 20:00:16 -06:00
Orion Poplawski
5095af4c04 Update to 24.7.1
- Add patch to support python 3.13
2024-08-03 17:02:48 -06:00
Fedora Release Engineering
c2c4383abe Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 19:52:48 +00:00
Python Maint
fc7da1f8ec Rebuilt for Python 3.13 2024-06-29 23:36:55 +02:00
Python Maint
dd6335a03e Bootstrap for Python 3.13 2024-06-09 02:47:14 +02:00
Orion Poplawski
5925ee3a61 Update to 24.4.0 2024-04-26 17:02:51 -06:00
Orion Poplawski
1abcd0c13a Update to 24.3.0 2024-03-19 18:54:18 -06:00
Orion Poplawski
e5e74076ca
Update to 24.1.2 2024-02-20 19:53:45 -07:00
Orion Poplawski
0a64905122 Update to 24.1.1 2024-02-15 19:20:07 -07:00
Fedora Release Engineering
78bf0073f1 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 07:55:14 +00:00
Fedora Release Engineering
f6bec6937d Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 16:04:24 +00:00
Karolina Surma
38bdf2c17d Avoid circular dependency on python3-conda-libmamba-solver 2023-12-24 04:06:41 +00:00
Orion Poplawski
beff4ff623 Preserve hook_source_path as a Path object 2023-12-23 20:48:14 -07:00
Orion Poplawski
d51b3ca326 Update to 23.11.0 2023-12-08 07:46:21 -07:00
Orion Poplawski
5d67702950 Update to 23.10
- Use vendor_conf.d for fish
2023-12-06 18:11:58 -07:00
Orion Poplawski
4f44ec26f1 Use proper entry point for conda-env 2023-12-04 06:52:51 -07:00
Orion Poplawski
f48b2e379f Ship tests sub-package 2023-12-02 11:59:15 -07:00
Orion Poplawski
d6bd3ebed6 Use automatic BuildRequires/Requires, cleanup deps.
Relax ruamel.yaml upper bound (bz#2246608)
2023-10-27 18:59:41 -06:00
Orion Poplawski
2a5edff621 Use main entry point for conda and re-add conda-env entry point, no need to run conda init (partial fix for bz#2242585) 2023-10-08 20:01:24 -06:00
Orion Poplawski
d288339a2e Update to 23.9.0 2023-10-08 08:17:12 -06:00
Orion Poplawski
ccc45b8c77 Update to 23.7.4 2023-09-13 21:47:51 -06:00
Orion Poplawski
f512f6086d Update to 23.7.3 2023-08-23 12:44:15 -06:00
Orion Poplawski
b39e038d74 Update to 23.7.2 2023-07-30 16:18:49 -06:00
Fedora Release Engineering
07ddfb5c29 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 16:15:51 +00:00
Orion Poplawski
f443f948ad Update to 23.5.2 2023-07-18 08:40:47 -06:00
Python Maint
8a2e41454d Rebuilt for Python 3.12 2023-07-04 12:25:56 +02:00
Orion Poplawski
0c6ca773a8 Update to 23.3.1 2023-04-05 20:12:38 -06:00
Orion Poplawski
51a2a1966d Add BR on python flask 2023-03-16 19:45:38 -06:00
Orion Poplawski
d3264fcda5 Update to 23.3.0 2023-03-16 19:24:12 -06:00
Orion Poplawski
2c30bc9319 Add requirement on pluggy >= 1.0.0 2023-01-21 22:01:37 -07:00
Orion Poplawski
a56955c152 Update to 23.1.0 2023-01-21 21:05:38 -07:00
Fedora Release Engineering
66f60a75ed Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 00:24:13 +00:00
Orion Poplawski
a3e9a773e8 Fix /etc/profile.d/conda.sh 2022-12-15 20:27:16 -07:00
Orion Poplawski
026f7b9c2f Update to 22.11.1 2022-12-07 21:51:11 -07:00
Orion Poplawski
cc586cc6eb test_notices_appear_once_when_running_decorated_commands fails due to a fixture that we remove 2022-12-05 07:54:28 -07:00
Orion Poplawski
1b65af4df7 Set av_dir to /etc/conda; Do not add /usr/condabin to PATH 2022-12-04 13:55:41 -07:00
Orion Poplawski
34903a8f9c Update to 22.11.0 (Fixes FTBFS bz#135403)
Update licensing, use SPDX
Cleanup bundled provides
2022-12-04 10:53:24 -07:00
Orion Poplawski
b97864cf23 Update to 4.14.0 2022-08-05 18:31:58 -06:00
Fedora Release Engineering
81e7a35c1a Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 23:28:29 +00:00
Orion Poplawski
d4dc86856b Add patch to use new (0.15) ruamel-yaml API 2022-07-17 21:15:25 -06:00
Python Maint
caf664805d Rebuilt for Python 3.11 2022-06-21 00:53:10 +02:00
Orion Poplawski
608afc8bf8 Ship and own %{_sysconfdir}/conda/condard.c 2022-05-20 16:38:08 -06:00
Orion Poplawski
7133dfe685 local build 2022-05-19 20:13:37 -06:00
Orion Poplawski
a4af2ad2be Update to 4.12.0 2022-03-10 20:42:23 -07:00
Orion Poplawski
bfeb5e5e00 Do not run coverage tests; Fix mock import 2022-02-08 20:08:14 -07:00
Fedora Release Engineering
fcfb159283 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 23:44:07 +00:00
Orion Poplawski
33083815ea Update to 4.11.0 2021-11-29 20:58:32 -07:00
Orion Poplawski
a2c598f820 Remove unused patch 2021-10-11 20:38:31 -06:00
Zbigniew Jędrzejewski-Szmek
d8bc1af66e Version 4.10.3 (#1977150)
New --dry-run option for conda env create and other bugfixes.
2021-09-12 21:47:11 +02:00
Zbigniew Jędrzejewski-Szmek
4020096a13 Add --without tests option for quicker builds
Also drop unused define for bootstrap.
2021-09-12 21:47:11 +02:00
Zbigniew Jędrzejewski-Szmek
33ff6c759d Convert to rpmautospec 2021-09-12 09:56:36 +02:00
Fedora Release Engineering
2bf0751bf4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 19:56:48 +00:00
Fedora Release Engineering
0f49319fd5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 14:58:23 +00:00
Python Maint
65e5d0f0c8 Rebuilt for Python 3.10 2021-06-04 20:01:56 +02:00
Orion Poplawski
ef08a6a3dd Update to 4.10.1 2021-04-15 08:13:24 -06:00
Orion Poplawski
479f1e2603 Update to 4.10.0 2021-04-01 22:06:34 -06:00
Orion Poplawski
ed6597db80 Add patch to support python 3.10 2021-01-25 21:36:09 -07:00
Fedora Release Engineering
70a9934fe0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 02:27:08 +00:00
Orion Poplawski
f1252b56e0 Update to 4.9.2 2020-11-11 08:13:43 -07:00
Orion Poplawski
40ac1af881 Use %python3_platform for test names; Run conda info in %check 2020-10-31 11:03:13 -06:00
Orion Poplawski
148f0cad5a Use %{_host_cpu} 2020-10-27 22:14:05 -06:00
Orion Poplawski
b119cc23fe Fix arch macro 2020-10-27 21:56:20 -06:00
Orion Poplawski
5950abbbbd Try to fix tests on non-x86_64 2020-10-27 21:46:36 -06:00
Orion Poplawski
b31022a357 Try to fix tests on 32-bit 2020-10-27 21:37:33 -06:00
Orion Poplawski
4b1160713c Update to 4.9.1 2020-10-27 20:39:57 -06:00
Orion Poplawski
6442fbd7cf Add BR python-unversioned-command for tests 2020-10-18 16:43:11 -06:00
Orion Poplawski
e5e79115a1 Update to 4.9.0 2020-10-18 15:50:54 -06:00
Orion Poplawski
ca6146294f Add note to description about base environment 2020-09-21 20:09:51 -06:00
Orion Poplawski
4b76b76b60 Update to 4.8.5
Install conda.fish (bz#1878306)
2020-09-14 20:50:45 -06:00
Orion Poplawski
c2fd136fc3 Fix changelog date 2020-08-07 21:33:32 -06:00
Orion Poplawski
117bbaa6d5 Cleanup test exclusions 2020-08-07 21:19:08 -06:00
Orion Poplawski
8d367458b1 Update to 4.8.4 2020-08-07 19:26:58 -06:00
Fedora Release Engineering
c00a49b865 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 00:26:30 +00:00
Fedora Release Engineering
b4d646a4b0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 14:28:03 +00:00
Miro Hrončok
0fdb3c7dad Rebuilt for Python 3.9 2020-05-26 02:43:01 +02:00
Orion Poplawski
f8c51ee124 Update to 4.8.3 2020-03-15 11:48:31 -06:00
Zbigniew Jędrzejewski-Szmek
14bfdb235e Fix import for python3.9 compatiblity 2020-02-04 14:17:17 +01:00
Zbigniew Jędrzejewski-Szmek
f1e9ffddd1 Remove obsolete patch 2020-01-28 14:27:46 +01:00
Zbigniew Jędrzejewski-Szmek
ca7791a739 Remove unnecessary mkdirs
install -D is enough.
2020-01-28 11:03:44 +01:00
Orion Poplawski
7850a7ca7e Update to 4.8.2
Obtain bash completion file from github - tartansandal/conda-bash-completion
2020-01-27 20:36:19 -07:00
Orion Poplawski
7a8aa112ed Install bash completion file (bz#1791068) 2020-01-19 20:41:53 -07:00
Orion Poplawski
999f1f9a97 Update to 4.8.0
Make "conda shell.bash hook" work (bz#1737165)
Unbundle more libraries
2019-12-15 10:29:23 -07:00
Orion Poplawski
8102747c3c Fixup patch 2019-09-14 21:07:17 -06:00
Orion Poplawski
4705de7e9e upload source 2019-09-14 21:02:29 -06:00
Orion Poplawski
d444d1426e Update to 4.7.12 2019-09-14 21:02:00 -06:00
Miro Hrončok
677e6595fc Rebuilt for Python 3.8 2019-08-19 10:11:55 +02:00
Orion Poplawski
8bac080496 Update to 4.7.11
Use system py-cpuinfo
2019-08-16 21:44:13 -06:00
Orion Poplawski
bdae222982 Cleanup requires some (drop crypto, yaml; add pyOpenSSL;
add versions for requests and ruamel-yaml
2019-08-16 17:22:21 -06:00
Zbigniew Jędrzejewski-Szmek
c0d92a18c9 Change pytest -k syntax, attempt 3 2019-08-05 09:14:31 +02:00
Zbigniew Jędrzejewski-Szmek
6b36b5affb Change pytest -k syntax, attempt 2 2019-08-04 20:22:46 +02:00
Zbigniew Jędrzejewski-Szmek
7cbe90b11c Change pytest -k syntax
Why does this have to be so hard to use? What is wrong with simple
--exclude/--include patterns?
2019-08-04 17:57:33 +02:00
Zbigniew Jędrzejewski-Szmek
fb5c7aecbf Add bundled(cpuinfo) and ignore failing tests 2019-08-03 15:01:42 +02:00
Zbigniew Jędrzejewski-Szmek
b95d49d2ba Revert "Unbundle cpuinfo"
This reverts commit 8619deb4ab.

I forgot that the new cpuinfo errors out on unsupported architectures.
2019-08-03 14:19:32 +02:00
Zbigniew Jędrzejewski-Szmek
eddb4ebd79 Use %{expand} and re-wrap %description 2019-08-03 14:03:24 +02:00
Zbigniew Jędrzejewski-Szmek
8619deb4ab Unbundle cpuinfo 2019-08-03 14:03:24 +02:00
Zbigniew Jędrzejewski-Szmek
fd9a929617 Fix 'conda shell.* hook' invocations 2019-08-03 14:03:14 +02:00
Orion Poplawski
8bb5f9f8a6 Update to 4.7.10 2019-07-31 20:48:44 -06:00
Zbigniew Jędrzejewski-Szmek
41ace6b229 Update to 4.7.6 2019-07-29 10:50:11 +02:00
Fedora Release Engineering
ceb2b72543 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 20:53:02 +00:00
Orion Poplawski
a02fd430ee Require conda-package-handling 1.3.0 or greater 2019-06-11 09:41:17 -06:00
Orion Poplawski
876dfabafd Update to 4.7.2 2019-06-11 09:14:35 -06:00
Orion Poplawski
e32dd05a0b Update to 4.7.1 2019-06-09 21:04:54 -06:00
16 changed files with 939 additions and 531 deletions

View file

@ -1,84 +0,0 @@
commit 013faf85bb376f031f438ad6d9584be0254a76d2
Author: rpm-build <rpm-build>
Date: Sat Mar 30 20:53:32 2019 -0600
[PATCH] Fix toolz imports
conda._vendor.toolz.__init__.py now does the dispatch to either
the real thing or the vendored copy. But the package structure is
flattened, so the subpackage names should not be used. Without that,
the vendored copy was always imported.
diff --git a/conda_env/env.py b/conda_env/env.py
index b8129b1..7670b90 100644
--- a/conda_env/env.py
+++ b/conda_env/env.py
@@ -14,15 +14,10 @@ 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
-try:
- from cytoolz.itertoolz import concatv, groupby
-except ImportError: # pragma: no cover
- from conda._vendor.toolz.itertoolz 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 a0b7660..d54df02 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
from conda._vendor.auxlib.ish import dals
-from conda._vendor.toolz.itertoolz import concat
+from conda._vendor.toolz import concat
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 0c726c9..c3ba3c4 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
from conda._vendor.auxlib.collection import AttrDict
-from conda._vendor.toolz.itertoolz import groupby
+from conda._vendor.toolz import groupby
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 980edd3..9ed4872 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
diff --git a/tests/test_create.py b/tests/test_create.py
index 8428fd2..b5b62f6 100644
--- a/tests/test_create.py
+++ b/tests/test_create.py
@@ -6,7 +6,7 @@ from datetime import datetime
from glob import glob
from conda._vendor.auxlib.compat import Utf8NamedTemporaryFile
-from conda._vendor.toolz.itertoolz import groupby
+from conda._vendor.toolz import groupby
from conda.gateways.disk.permissions import make_read_only
from conda.models.channel import Channel
from conda.resolve import Resolve

View file

@ -0,0 +1,25 @@
From 7eeb6a32d2004bc20a156dd8920964c107e99321 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 30 Jul 2024 18:00:00 -0600
Subject: [PATCH 1/2] conda_sys_prefix.patch
---
conda/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conda/__init__.py b/conda/__init__.py
index 4245cae..a436b1d 100644
--- a/conda/__init__.py
+++ b/conda/__init__.py
@@ -54,7 +54,7 @@ __summary__ = __doc__
__url__ = "https://github.com/conda/conda"
if os.getenv("CONDA_ROOT") is None:
- os.environ["CONDA_ROOT"] = sys.prefix
+ os.environ["CONDA_ROOT"] = '/usr/share/conda'
#: The conda package directory.
CONDA_PACKAGE_ROOT = abspath(dirname(__file__))
--
2.45.2

View file

@ -1,38 +0,0 @@
commit 40a3c3c80c78a1086c376b71e1e4c352f9a1d244
Author: rpm-build <rpm-build>
Date: Sat Mar 30 20:56:58 2019 -0600
[PATCH] Adjust ruamel.yaml imports
This is how it's called in Fedora.
diff --git a/conda/common/configuration.py b/conda/common/configuration.py
index 87c36ef..cda042f 100644
--- a/conda/common/configuration.py
+++ b/conda/common/configuration.py
@@ -47,9 +47,9 @@ from .._vendor.boltons.setutils import IndexedSet
from .._vendor.toolz import concat, concatv, excepts, merge, unique
try: # pragma: no cover
- from ruamel_yaml.comments import CommentedSeq, CommentedMap
- from ruamel_yaml.reader import ReaderError
- from ruamel_yaml.scanner import ScannerError
+ from ruamel.yaml.comments import CommentedSeq, CommentedMap
+ from ruamel.yaml.reader import ReaderError
+ from ruamel.yaml.scanner import ScannerError
except ImportError: # pragma: no cover
from ruamel.yaml.comments import CommentedSeq, CommentedMap # pragma: no cover
from ruamel.yaml.reader import ReaderError
diff --git a/conda/common/serialize.py b/conda/common/serialize.py
index 479521e..6411c6c 100644
--- a/conda/common/serialize.py
+++ b/conda/common/serialize.py
@@ -16,7 +16,7 @@ log = getLogger(__name__)
@memoize
def get_yaml():
try:
- import ruamel_yaml as yaml
+ import ruamel.yaml as yaml
except ImportError: # pragma: no cover
try:
import ruamel.yaml as yaml

View file

@ -0,0 +1,26 @@
From f8f9a23a2a7540ec39cab9606f8b95aa8b346b65 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Mon, 24 Nov 2025 17:30:20 -0700
Subject: [PATCH 2/2] Use main entry point for conda and re-add conda-env entry
---
pyproject.toml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index 7c8f24f..049859b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,7 +51,8 @@ readme = "README.md"
requires-python = ">=3.10"
[project.scripts]
-conda = "conda.cli.main_pip:main"
+conda = "conda.cli.main:main"
+conda-env = "conda_env.cli.main:main"
[project.urls]
changelog = "https://github.com/conda/conda/blob/main/CHANGELOG.md"
--
2.51.1

View file

@ -1,23 +0,0 @@
commit 1f21cf4dd33e4d62f3dca93294bfa5508a2591ab
Author: rpm-build <rpm-build>
Date: Sat Mar 30 20:59:05 2019 -0600
[PATCH] Drop fs path encoding manipulation under python2
diff --git a/conda/activate.py b/conda/activate.py
index e515c0e..3632a61 100644
--- a/conda/activate.py
+++ b/conda/activate.py
@@ -63,11 +63,7 @@ class _Activator(object):
def __init__(self, arguments=None):
self._raw_arguments = arguments
- if PY2:
- self.environ = {ensure_fs_path_encoding(k): ensure_fs_path_encoding(v)
- for k, v in iteritems(os.environ)}
- else:
- self.environ = os.environ.copy()
+ self.environ = os.environ.copy()
# Once Python2 dies odargs can become kwargs again since dicts are ordered since 3.6.
def get_export_unset_vars(self, odargs):

View file

@ -1,42 +1,25 @@
From cccc709c085890633be767a44465229d049d5941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 13 Feb 2019 13:06:36 +0100
Subject: [PATCH] Do not try to run /usr/bin/python
On modern linux distros, /usr/bin/python will usually either
refer to python2 or not exists at all. Use sys.executable to
run subprocess calls with the same python executable as the
parent process.
---
conda/common/path.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/conda/common/path.py b/conda/common/path.py
index b51f7f272d..06e0b4bc9a 100644
--- a/conda/common/path.py
+++ b/conda/common/path.py
@@ -6,6 +6,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
from functools import reduce
from logging import getLogger
import os
+import sys
from os.path import abspath, basename, expanduser, expandvars, join, normcase, split, splitext
diff -up conda-24.9.1/conda/common/path/python.py.python conda-24.9.1/conda/common/path/python.py
--- conda-24.9.1/conda/common/path/python.py.python 2024-10-01 15:11:32.000000000 -0600
+++ conda-24.9.1/conda/common/path/python.py 2024-10-07 21:43:44.951895698 -0600
@@ -5,6 +5,7 @@
from __future__ import annotations
import re
import subprocess
@@ -155,9 +156,11 @@ def parse_entry_point_def(ep_definition):
+import sys
from logging import getLogger
from os.path import join, split, splitext
@@ -52,9 +53,11 @@ def parse_entry_point_def(ep_definition)
def get_python_short_path(python_version=None):
if on_win:
return "python.exe"
- if python_version and '.' not in python_version:
- if python_version and "." not in python_version:
+ if not python_version:
+ return sys.executable
+ if '.' not in python_version:
python_version = '.'.join(python_version)
- return join("bin", "python%s" % (python_version or ''))
python_version = ".".join(python_version)
- return join("bin", "python%s" % (python_version or ""))
+ return join("bin", "python" + python_version)
def get_python_site_packages_short_path(python_version):
--
2.19.2

View file

@ -1,21 +1,5 @@
From 4bc8b4ec9579e7c015a6ad5b41031c850596e0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 21 Sep 2018 10:23:39 +0200
Subject: [PATCH] Fix failing tests in test_api.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Based on commit 0722e2edc93ae818bddd18f23be5b18c3a2a1d55 by
Kale Franz <kfranz@continuum.io>.
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
---
tests/test_api.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/tests/test_api.py b/tests/test_api.py
index 3ca97be734..e866e82fd3 100644
index dd6a7b9..c60d1a1 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -224,7 +224,7 @@ def test_PackageCacheData_return_value_contract():
@ -27,7 +11,7 @@ index 3ca97be734..e866e82fd3 100644
first_writable_result = PackageCacheData.first_writable()
assert isinstance(first_writable_result, PackageCacheData)
@@ -269,20 +269,21 @@ def test_PrefixData_contract():
@@ -265,13 +265,14 @@ def test_PrefixData_contract():
def test_PrefixData_return_value_contract():
pd = PrefixData(context.conda_prefix)
@ -39,16 +23,17 @@ index 3ca97be734..e866e82fd3 100644
+ get_result = pd.get(PackageRecord.from_objects(single_prefix_rec))
+ assert isinstance(get_result, PrefixRecord)
- query_result = pd.query('openssl')
- query_result = pd.query("openssl")
- assert isinstance(query_result, tuple)
- assert all(isinstance(prefix_rec, PrefixRecord) for prefix_rec in query_result)
+ query_result = pd.query('openssl')
+ query_result = pd.query("openssl")
+ assert isinstance(query_result, tuple)
+ assert all(isinstance(prefix_rec, PrefixRecord) for prefix_rec in query_result)
iter_records_result = pd.iter_records()
assert isiterable(iter_records_result)
assert all(isinstance(prefix_rec, PrefixRecord) for prefix_rec in iter_records_result)
@@ -280,7 +281,7 @@ def test_PrefixData_return_value_contract():
)
is_writable_result = pd.is_writable
- assert is_writable_result is True or is_writable_result is False
@ -56,6 +41,3 @@ index 3ca97be734..e866e82fd3 100644
reload_result = pd.reload()
assert isinstance(reload_result, PrefixData)
--
2.19.2

View file

@ -0,0 +1,72 @@
diff --git a/conda/activate.py b/conda/activate.py
index f79a03f..951bed4 100644
--- a/conda/activate.py
+++ b/conda/activate.py
@@ -914,13 +914,7 @@ class PosixActivator(_Activator):
set_var_tmpl = "%s='%s'"
run_script_tmpl = ". \"`cygpath '%s'`\"" if on_win else '. "%s"'
- hook_source_path = Path(
- CONDA_PACKAGE_ROOT,
- "shell",
- "etc",
- "profile.d",
- "conda.sh",
- )
+ hook_source_path = Path("/etc/profile.d/conda.sh")
inline_hook_source = True
def _update_prompt(self, set_vars, conda_prompt_modifier):
@@ -956,13 +950,7 @@ class CshActivator(_Activator):
set_var_tmpl = "set %s='%s'"
run_script_tmpl = "source \"`cygpath '%s'`\"" if on_win else 'source "%s"'
- hook_source_path = Path(
- CONDA_PACKAGE_ROOT,
- "shell",
- "etc",
- "profile.d",
- "conda.csh",
- )
+ hook_source_path = Path("/etc/profile.d/conda.csh")
# TCSH/CSH removes newlines when doing command substitution (see `man tcsh`),
# source conda.csh directly and use line terminators to separate commands
inline_hook_source = False
@@ -1001,7 +989,7 @@ class XonshActivator(_Activator):
else 'source-bash --suppress-skip-message -n "%s"'
)
- hook_source_path = Path(CONDA_PACKAGE_ROOT, "shell", "conda.xsh")
+ hook_source_path = Path("/etc/profile.d/conda.xsh")
inline_hook_source = True
def template_path_var(self, key: str, value: str) -> str:
@@ -1055,14 +1043,7 @@ class FishActivator(_Activator):
set_var_tmpl = 'set -g %s "%s"'
run_script_tmpl = 'source "%s"'
- hook_source_path = Path(
- CONDA_PACKAGE_ROOT,
- "shell",
- "etc",
- "fish",
- "conf.d",
- "conda.fish",
- )
+ hook_source_path = Path("/etc/fish/conf.d/conda.fish")
inline_hook_source = True
diff --git a/conda/base/context.py b/conda/base/context.py
index adf6d6e..612ea4a 100644
--- a/conda/base/context.py
+++ b/conda/base/context.py
@@ -848,7 +848,7 @@ class Context(Configuration):
def av_data_dir(self) -> PathType:
"""Where critical artifact verification data (e.g., various public keys) can be found."""
# TODO (AV): Find ways to make this user configurable?
- return join(self.conda_prefix, "etc", "conda")
+ return '/etc/conda'
@property
def signing_metadata_url_base(self) -> str | None:

202
changelog Normal file
View file

@ -0,0 +1,202 @@
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.10.1-2
- Rebuilt for Python 3.10
* Thu Apr 15 2021 Orion Poplawski <orion@nwra.com> - 4.10.1-1
- Update to 4.10.1
* Fri Apr 02 2021 Orion Poplawski <orion@nwra.com> - 4.10.0-1
- Update to 4.10.0
* Tue Jan 26 2021 Orion Poplawski <orion@nwra.com> - 4.9.2-3
- Add patch to support python 3.10
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Nov 11 2020 Orion Poplawski <orion@nwra.com> - 4.9.2-1
- Update to 4.9.2
* 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
* 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)
* Sat Aug 08 2020 Orion Poplawski <orion@nwra.com> - 4.8.4-1
- Update to 4.8.4
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.8.3-2
- Rebuilt for Python 3.9
* Sun Mar 15 2020 Orion Poplawski <orion@nwra.com> - 4.8.3-1
- Update to 4.8.3
* Tue Feb 4 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.8.2-2
- Fix import for python3.9 compatiblity (#1797691)
* Tue Jan 28 2020 Orion Poplawski <orion@nwra.com> - 4.8.2-1
- Update to 4.8.2 (#1785658)
- Obtain bash completion file from github - tartansandal/conda-bash-completion
* Mon Jan 20 2020 Orion Poplawski <orion@nwra.com> - 4.8.0-2
- Install bash completion file (bz#1791068)
* Sat Dec 14 2019 Orion Poplawski <orion@nwra.com> - 4.8.0-1
- Update to 4.8.0
- Make "conda shell.bash hook" work (bz#1737165)
- Unbundle more libraries
* Sat Sep 14 2019 Orion Poplawski <orion@nwra.com> - 4.7.12-1
- Update to 4.7.12
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.7.11-2
- Rebuilt for Python 3.8
* Fri Aug 16 2019 Orion Poplawski <orion@nwra.com> - 4.7.11-1
- Update to 4.7.11
- Use system py-cpuinfo
* Fri Aug 16 2019 Orion Poplawski <orion@nwra.com> - 4.7.10-2
- Cleanup requires some (drop crypto, yaml; add pyOpenSSL;
add versions for requests and ruamel-yaml
* Sat Aug 3 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.10-1
- Fix 'conda shell.* hook' invocations (#1737165)
* Wed Jul 31 2019 Orion Poplawski <orion@nwra.com> - 4.7.10-1
- Update to 4.7.10
* Mon Jul 29 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.6-1
- Update to latest version (#1678578)
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jun 11 2019 Orion Poplawski <orion@nwra.com> - 4.7.2-1
- Update to 4.7.2
* Sun Jun 9 2019 Orion Poplawski <orion@nwra.com> - 4.7.1-1
- Update to 4.7.1
* Tue Apr 16 2019 Orion Poplawski <orion@nwra.com> - 4.6.13-1
- Update to 4.6.13
* Thu Apr 4 2019 Orion Poplawski <orion@nwra.com> - 4.6.11-1
- Update to 4.6.11
* Tue Apr 2 2019 Orion Poplawski <orion@nwra.com> - 4.6.9-2
- Fix conda profile scripts
- Do not build for python2 on EPEL
- Ignore test failures on EPEL7
* Sat Mar 30 2019 Orion Poplawski <orion@nwra.com> - 4.6.9-1
- Update to 4.6.9
* Wed Feb 13 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.6.5-1
- Update to latest upstream version (#1668145)
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Dec 31 2018 Orion Poplawski <orion@nwra.com> - 4.5.12-1
- Update to 4.5.12
* Mon Dec 31 2018 Orion Poplawski <orion@nwra.com> - 4.5.11-2
- EPEL7 compatability
* Fri Sep 21 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.5.11-1
- Update to latest stable version (#1570217)
- Disable python2 subpackage on F30+
* Fri Jul 13 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.11-4
- Pull in python[23]-cytoolz to replace bundled toolz
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 4.4.11-3
- Rebuilt for Python 3.7
* Wed Apr 18 2018 Orion Poplawski <orion@nwra.com> - 4.4.11-2
- Set _CONDA_ROOT in /etc/profile.d/conda.csh
- Fix python2 requires
- Require pycosat >= 0.6.3
* Sat Apr 14 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.11-1
- Update to latest upstream version in the 4.4.x branch (#1544046)
* Wed Feb 7 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.9-1
- Update to v4.4.9 (#1542874)
- conda-activate binary rpm is retired. The new way to activate the environment
is to say 'conda activate'. See
https://github.com/conda/conda/releases/tag/4.4.0 for more information.
* Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 4.3.24-5
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.24-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-3
- Install just one version of the executables (python 2 or 3)
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-2
- Add all licenses to the License tag
- Add Provides: bundled(...) for all the "vendored" dependencies
- Update descriptions and simplify the spec file a bit
- Move condarc.d directory under /usr/share/conda
* Thu Aug 3 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-1
- Update to latest version
- Switch /usr/bin/conda to python3
* Thu Jul 21 2016 Orion Poplawski <orion@cora.nwra.com> - 4.1.6-1
- Update to 4.1.6
* Thu Dec 31 2015 Orion Poplawski <orion@cora.nwra.com> - 3.19.0-1
- Update to 3.19.0
* Thu Dec 31 2015 Orion Poplawski <orion@cora.nwra.com> - 3.18.8-2
- Add python 3 version
* Mon Dec 7 2015 Orion Poplawski <orion@cora.nwra.com> - 3.18.8-1
- Update to 3.18.8
* Thu Sep 24 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-6
- Do not create broken symlinks if activate/deactivate are not installed
- Do not create /usr/conda-meta to prevent accidental installs into system
* Thu Sep 24 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-5
- Non-bootstrap build
* Wed Sep 23 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-4
- Add patch to support rootless mode
- Require python-crypto
- Create /usr/conda-meta, /usr/.condarc, /var/cache/conda
* Tue Sep 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-3
- Require python-requests, python-yaml
* Tue Sep 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-2
- Add patch to allow overriding pkgs_dirs in .condarc
* Mon Sep 21 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-1
- Initial package

218
conda Normal file
View file

@ -0,0 +1,218 @@
# bash_completion for conda.
#
# This was initially based on completion support for `fish`, but later extended
# complete options for subcommands and files/dirs/paths as appropriate.
#
# Dynamic option lookup uses a cache that persists for the duration of the shell.
# Updates to the conda command options are relatively rare, but there is a small chance
# that this cache will hold incorrect/incomplete values. A restart of your shell will
# fix this.
# If this completion file is 'installed' under
#
# /etc/bash_completion.d/,
# /usr/share/bash-completion/completions/, or
# ~/.local/share/bash-completion/completions/,
#
# rather than being managed via the `conda shell.bash hook`, then this file may
# be sourced before conda is setup. To support this we allow for a potential
# late initialization of the CONDA_ROOT and CONDA_SOURCE environment
# variables.
# The extglob option is set by the bash_completion library anyway,
# Setting it here to work around some rare edge cases.
shopt -s extglob
function __comp_conda_ensure_root() {
if [[ -z "${CONDA_SOURCE-}" && -n "${CONDA_EXE-}" ]] ; then
if [[ -n "${_CE_CONDA-}" && -n "${WINDIR-}" ]]; then
CONDA_ROOT=$(\dirname "${CONDA_EXE}")
else
CONDA_ROOT=$(\dirname "${CONDA_EXE}")
CONDA_ROOT=$(\dirname "${CONDA_ROOT}")
fi
\local script="
: from __future__ import print_function
: import os
: import conda
: print(os.path.dirname(conda.__file__))
"
script="${script// : /}"
# don't assume an active base environment
CONDA_SOURCE=$(conda activate base; python -c "$script")
fi
}
function __comp_conda_commands () {
# default core commands
echo clean config create help info init install list package
echo remove uninstall run search update upgrade
# implied by conda shell function
echo activate deactivate
# check commands from full anaconda install
for f in "$CONDA_SOURCE"/cli/main_*.py
do
# skip pip -- not a sub-command
[[ "$f" == */main_pip.py ]] && continue
if [[ "$f" =~ .*_([a-z]+)\.py$ ]]; then
echo "${BASH_REMATCH[1]}"
fi
done
# check extra pluggins
for f in "$CONDA_ROOT"/bin/conda-*
do
if [[ -x "$f" && ! -d "$f" ]]
then
if [[ "$f" =~ .*/conda-(.*) ]]; then
echo "${BASH_REMATCH[1]}"
fi
fi
done
}
function __comp_conda_env_commands() {
for f in "$CONDA_SOURCE"/../conda_env/cli/main_*.py
do
[[ "$f" == */main_vars.py ]] && continue
if [[ "$f" =~ .*_([a-z]+)\.py$ ]]; then
echo "${BASH_REMATCH[1]}"
fi
done
}
function __comp_conda_envs() {
\local script="
: from __future__ import print_function
: import json, os, sys
: from os.path import isdir, join
: print('\n'.join(
: d for ed in json.load(sys.stdin)['envs_dirs'] if isdir(ed)
: for d in os.listdir(ed) if isdir(join(ed, d)))
: )
"
script="${script// : /}"
conda config --json --show envs_dirs | $CONDA_PYTHON_EXE -c "$script"
}
function __comp_conda_packages() {
conda list | awk 'NR > 3 {print $1}'
}
function __comp_conda_cmds_str() {
# get a list of commands, skipping options
\local cmd
\local -a cmds
for cmd in "$@"; do
case "$cmd" in
-*) continue ;;
*) cmds+=("$cmd") ;;
esac
done
echo "${cmds[@]}"
}
# helper for debugging issues with the cache
function __comp_conda_cache_dump() {
for k in "${!__comp_conda_cache[@]}"; do
printf "%s:\n" "$k"
for w in ${__comp_conda_cache[$k]}; do
printf "\t%s\n" "$w"
done
done
}
function __comp_conda_option_lookup() {
\local word_list cmd_str cmd_key
cmd_str=$1
# make a key to look up the cached result of the command help
# (We should be able to just use $cmd_str, since spaces in an array key are fine,
# but this produces an error with an empty cache. I'm not sure why though)
cmd_key=${cmd_str// /_}
if [[ -z "${__comp_conda_cache[$cmd_key]}" ]]; then
# parse the output of command help to get completions
word_list=$($cmd_str --help 2>&1 | _parse_help -)
if [[ ${PIPESTATUS[0]} -eq 0 && -n $word_list ]]; then
__comp_conda_cache[$cmd_key]=$word_list
else
# something went wrong, so abort completion attempt
return 1
fi
else
word_list=${__comp_conda_cache[$cmd_key]}
fi
echo "$word_list"
}
# cache conda subcommand help lookups for the duration of the shell
unset __comp_conda_cache
declare -A __comp_conda_cache
# If conda has not been fully setup/activated yet, some of the above functions may fail
# and print error messages. This is not helpful during normal usage, so we discard all
# error output by default.
__comp_conda_ensure_root 2>/dev/null || :
_comp_conda()
{
# shellcheck disable=SC2034
\local cur prev words cword
_init_completion || return
__comp_conda_ensure_root 2>/dev/null
\local word_list cmd_str
if [[ $cur == -* ]]; then
# get the current list of commands as a string sans options
cmd_str=$(__comp_conda_cmds_str "${words[@]}")
word_list=$(__comp_conda_option_lookup "$cmd_str")
else
case "$prev" in
conda)
word_list=$(__comp_conda_commands 2>/dev/null)
;;
env)
word_list=$(__comp_conda_env_commands 2>/dev/null)
;;
activate)
if [[ $cur == */* ]]
then
_filedir -d # environment directories
else
word_list=$(__comp_conda_envs 2>/dev/null)
fi
;;
remove|uninstall|upgrade|update)
word_list=$(__comp_conda_packages 2>/dev/null)
;;
--name|--clone)
word_list=$(__comp_conda_envs 2>/dev/null)
;;
--*-file|--file|--which|convert)
_filedir # filenames
;;
--*-dir|--*-folder|--subdir|--prefix|--cwd|index)
_filedir -d # directories
;;
verify|debug)
_filedir 'tar.bz2' # package paths and directories
;;
build)
_filedir 'tar.bz2' # package paths and directories
word_list='purge purge-all' # special keywords
;;
esac
fi
if [[ -n $word_list ]]; then
# append completion suggestions to COMPREPLY
mapfile -t -O "${#COMPREPLY[@]}" COMPREPLY < \
<(compgen -W "$word_list" -- "$cur")
fi
} &&
complete -F _comp_conda conda
# vim: ft=sh

View file

@ -1,13 +0,0 @@
diff --git a/tests/test_link_order.py b/tests/test_link_order.py
index 7021065..55b7de0 100644
--- a/tests/test_link_order.py
+++ b/tests/test_link_order.py
@@ -10,8 +10,6 @@ import tempfile
from .test_create import run_command, Commands
-from conda_build import api
-
try:
from unittest.mock import patch
except ImportError:

View file

@ -1,345 +1,454 @@
%{!?_with_bootstrap: %global bootstrap 0}
%global with_python2 0%{?fedora} && 0%{?fedora} < 30
%bcond_without tests
Name: conda
Version: 4.6.13
Release: 1%{?dist}
Version: 25.11.1
Release: %autorelease
Summary: Cross-platform, Python-agnostic binary package manager
License: BSD and ASL 2.0 and LGPLv2+ and MIT
# The conda code is BSD
# progressbar is LGPLv2+
# six is MIT/X11
# adapters/ftp.py is ASL 2.0
License: BSD-3-Clause AND Apache-2.0
# The conda code is BSD-3-Clause
# adapters/ftp.py is Apache-2.0
URL: http://conda.pydata.org/docs/
Source0: https://github.com/conda/conda/archive/%{version}/%{name}-%{version}.tar.gz
# Source0: https://pypi.io/packages/source/c/%%{name}/%%{name}-%%{version}.tar.gz
Patch0: conda_sys_prefix.patch
Patch1: conda_gateways_disk_create.patch
Patch2: setup.patch
Patch3: conda-tests.patch
# bash completion script moved to a separate project
Source1: https://raw.githubusercontent.com/tartansandal/conda-bash-completion/1.7/conda
Patch0: 0001-conda_sys_prefix.patch.patch
# Use main entry point for conda and re-add conda-env entry point, no need to run conda init
Patch1: 0002-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch
Patch10001: 0001-Fix-toolz-imports.patch
Patch10002: 0002-Adjust-ruamel.yaml-imports.patch
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
BuildArch: noarch
BuildRequires: pkgconfig(bash-completion)
%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '/etc/bash_completion.d')
BuildRequires: sed
# For man pages
BuildRequires: python-conda-sphinx-theme
Requires: python%{python3_pkgversion}-conda = %{version}-%{release}
# Removed upstream in favour of calling "conda activate" in version 4.4.0
Obsoletes: conda-activate < 4.4
Obsoletes: conda-activate < 4.4
%?python_enable_dependency_generator
BuildRequires: sed
%global _description %{expand:
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.
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.}
%global _description \
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.
%description %_description
%global _py2_reqs \
python2-crypto \
python2-pycosat >= 0.6.3 \
python2-ruamel-yaml \
python2-mock \
python2-responses
%global _py2_bund \
bundled(python2-appdirs) = 1.2.0 \
bundled(python2-auxlib) \
bundled(python2-boltons) = 16.5.1 \
bundled(python2-six) = 1.10.0 \
bundled(python2-toolz) = 0.8.2 \
bundled(python2-urllib3) = 1.19.1
%package tests
Summary: conda tests
%global py2_reqs %(c="%_py2_reqs"; echo "$c" | xargs)
%global py3_reqs %(c="%_py2_reqs"; echo "$c" | sed s/python2/python%{python3_pkgversion}/ | xargs)
%description tests
Data for conda tests. Set CONDA_TEST_DATA_DIR to
%{_datadir}/conda/tests/data.
%global py2_bund %(c="%_py2_bund"; echo "$c" | xargs)
%global py3_bund %(c="%_py2_bund"; echo "$c" | sed s/python2/python%{python3_pkgversion}/ | xargs)
%if %with_python2
%package -n python2-conda
Summary: %{summary}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: %py2_reqs
BuildRequires: python2-requests
# When this is present, vendored toolz should not be used
%if 0%{?fedora}
# EPEL does not have new enough cytoolz
BuildRequires: python2-cytoolz
%endif
# For tests
BuildRequires: python2-enum34
BuildRequires: python2-futures
BuildRequires: python2-pytest-cov
# Keep manual Requires for now:
# automatically generated Requires are missing a few modules.
# Having both is still useful because the automatic ones have
# version requirements.
Requires: %py2_reqs
Requires: python2-enum34
Requires: python2-futures
%if 0%{?fedora}
# EPEL does not have new enough cytoolz
Requires: python2-cytoolz
%endif
Provides: %py2_bund
%{?python_provide:%python_provide python2-conda}
%description -n python2-conda %_description
%endif
%package -n python%{python3_pkgversion}-conda
Summary: %{summary}
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: %py3_reqs
BuildRequires: python%{python3_pkgversion}-requests
BuildRequires: python%{python3_pkgversion}-yaml
# When this is present, vendored toolz should not be used
%if 0%{?fedora}
# EPEL does not have new enough cytoolz
BuildRequires: python%{python3_pkgversion}-cytoolz >= 0.8.2
%endif
# For tests
BuildRequires: python%{python3_pkgversion}-pytest-cov
BuildRequires: python-unversioned-command
BuildRequires: python%{python3_pkgversion}-boltons
BuildRequires: python%{python3_pkgversion}-boto3
BuildRequires: python%{python3_pkgversion}-conda-libmamba-solver
BuildRequires: python%{python3_pkgversion}-flask
BuildRequires: python%{python3_pkgversion}-jsonpatch
BuildRequires: python%{python3_pkgversion}-libmambapy
BuildRequires: python%{python3_pkgversion}-pexpect
BuildRequires: python%{python3_pkgversion}-pytest-mock
BuildRequires: python%{python3_pkgversion}-pytest-rerunfailures
BuildRequires: python%{python3_pkgversion}-pytest-split
BuildRequires: python%{python3_pkgversion}-pytest-timeout
BuildRequires: python%{python3_pkgversion}-pytest-xprocess
BuildRequires: python%{python3_pkgversion}-responses
Requires: %py3_reqs
Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-yaml
%if 0%{?fedora}
# EPEL does not have new enough cytoolz
Requires: python%{python3_pkgversion}-cytoolz >= 0.8.2
%endif
Provides: %py3_bund
%{?python_provide:%python_provide python%{python3_pkgversion}-conda}
# conda uses a modified version of auxlib
Provides: bundled(python%{python3_pkgversion}-auxlib) = 0.0.43
%description -n python%{python3_pkgversion}-conda %_description
%prep
%autosetup -p1
sed -r -i 's/^(__version__ = ).*/\1"%{version}"/' conda/__init__.py
# Re-enable dep on conda-libmamba-solver
sed -i -e '/"conda-libmamba-solver/s/# *//' pyproject.toml
# disable some stupid tests which fail with EXDEV
sed -r -i 's/test_trash_outside_prefix/_disabled_\0/' tests/test_install.py
sed -r -i 's/test_move_to_trash|test_move_path_to_trash_couldnt/_disabled_\0/' tests/gateways/disk/test_delete.py
# Do not restrict upper bound of ruamel-yaml
sed -i -e '/ruamel.yaml/s/,<[0-9.]*//' pyproject.toml
# Skip TestJson.test_list which wants to muck around with /usr.
sed -r -i 's/\btest_list\b/_disabled_\0/' tests/test_cli.py
# pytest-split/xdoctest not packaged, store-duration not needed
sed -i -e '/splitting-algorithm/d' -e '/store-durations/d' -e '/xdoctest/d' pyproject.toml
# delete interpreter line, the user can always call the file
# explicitly as python3 /usr/lib/python3.6/site-packages/conda/_vendor/appdirs.py
# or so.
sed -r -i '1 {/#![/]usr[/]bin[/]env/d}' conda/_vendor/appdirs.py
# Unpackaged - really only applicable for macOS/Windows?
sed -i -e '/"truststore *>/d' pyproject.toml
# Replaced by cytools, byte compilation fails under python3.7
%if 0%{?fedora}
# EPEL does not have new enough cytoolz
# We need to keep __init__.py which does the dispatch between vendored and non-vendored
rm conda/_vendor/toolz/[a-zA-Z]*
%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,%{python3_platform}}
sed -i -e s/linux-64/%{python3_platform}/ tests/data/conda_format_repo/%{python3_platform}/*json
%endif
# Do not run coverage in pytest
sed -i -e '/"--cov/d' pyproject.toml
%generate_buildrequires
# When not testing, we don't need runtime dependencies.
# Normally, we would still BuildRequire them to not accidentally build an uninstallable package,
# but there is a runtime dependency loop with python3-conda-libmamba-solver.
%pyproject_buildrequires %{!?with_tests:-R}
%build
# build conda executable
%define py_setup utils/setup-testing.py
%if %with_python2
%py2_build
%endif
%py3_build
%pyproject_wheel
%install
# install conda executable
%define py_setup utils/setup-testing.py
%if 0%{?fedora}
%if %with_python2
%py2_install
%endif
%py3_install
%else
%py3_install
%if %with_python2
%py2_install
%endif
%endif
%pyproject_install
#py3_shebang_fix %{buildroot}%{python3_sitelib}/conda/shell/bin/conda
%pyproject_save_files conda*
mkdir -p %{buildroot}%{_sysconfdir}/conda/condarc.d
mkdir -p %{buildroot}%{_datadir}/conda/condarc.d
cat >%{buildroot}%{_datadir}/conda/condarc.d/defaults.yaml <<EOF
channels:
- https://conda.anaconda.org/conda-forge
pkgs_dirs:
- /var/cache/conda/pkgs
- ~/.conda/pkgs
EOF
mv %{buildroot}%{python3_sitelib}/tests %{buildroot}%{_datadir}/conda/
cp -rp tests/data %{buildroot}%{_datadir}/conda/tests/
mkdir -p %{buildroot}%{_localstatedir}/cache/conda/pkgs/cache
# install does not create the directory on EL7
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
install -m 0644 -Dt %{buildroot}/etc/profile.d/ conda/shell/etc/profile.d/conda.{sh,csh}
sed -r -i '1i CONDA_EXE=%{_bindir}/conda' %{buildroot}/etc/profile.d/conda.sh
sed -r -i -e '1i [ -z "$CONDA_EXE" ] && CONDA_EXE=%{_bindir}/conda' \
-e '/PATH=.*condabin/s|PATH=|[ -d $(dirname "$CONDA_EXE")/condabin ] \&\& PATH=|' %{buildroot}/etc/profile.d/conda.sh
sed -r -i -e '1i set _CONDA_EXE=%{_bindir}/conda\nset _CONDA_ROOT=' \
-e 's/CONDA_PFX=.*/CONDA_PFX=/' %{buildroot}/etc/profile.d/conda.csh
install -m 0644 -Dt %{buildroot}%{_datadir}/fish/vendor_conf.d/ conda/shell/etc/fish/conf.d/conda.fish
sed -r -i -e '1i set -gx CONDA_EXE "/usr/bin/conda"\nset _CONDA_ROOT "/usr"\nset _CONDA_EXE "/usr/bin/conda"\nset -gx CONDA_PYTHON_EXE "/usr/bin/python3"' \
%{buildroot}%{_datadir}/fish/vendor_conf.d/conda.fish
# Install bash completion script
install -m 0644 -Dt %{buildroot}%{bash_completionsdir}/ %SOURCE1
%check
%if %{with tests}
export PATH=%{buildroot}%{_bindir}:$PATH
PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
# Integration tests generally require network, so skip them.
# tests/core/test_initialize.py tries to unlink /usr/bin/python3
# test_create_advanced_pip connects to pypi
py.test-%{python3_version} -vv -m "not integration" \
-k 'not test_create_advanced_pip' \
--ignore tests/core/test_initialize.py %{?el7:|| :}
%if %with_python2
# Run python2 tests later, since they are more likely to fail stupidly.
# Some tests fail because py2 does not default to utf-8.
py.test-%{python2_version} -vv -m "not integration" -k "not test_unicode"
# TestJson.test_list does not recognize /usr as a conda environment
# These fail on koji with PackageNotFound errors likely due to network issues
# test_cli.py::TestRun.test_run_returns_int
# test_cli.py::TestRun.test_run_returns_nonzero_errorlevel
# test_cli.py::TestRun.test_run_returns_zero_errorlevel
# test_ProgressiveFetchExtract_prefers_conda_v2_format, test_subdir_data_prefers_conda_to_tar_bz2,
# test_use_only_tar_bz2 fail in F31 koji, but not with mock --enablerepo=local. Let's disable
# them for now.
# tests/base/test_context.py::test_default_activation_prefix - conda.exceptions.CondaHTTPError
# tests/cli/test_all_commands.py::test_denylist_channels - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
# tests/cli/test_cli_install.py::test_frozen_env_cep22[libmamba] - conda.exceptions.CondaHTTPError
# tests/cli/test_cli_install.py::test_frozen_env_cep22[classic] - conda.exceptions.CondaHTTPError
# Unsure - but perhaps config does not has a subdir?
# tests/cli/test_common.py::test_validate_subdir_config - TypeError: expected str, bytes or os.PathLike object, not NoneType
# tests/cli/test_common.py::test_validate_subdir_config_invalid_subdir - TypeError: argument should be a str or an os.PathLike object where __fspath__ returns a str, not 'NoneType'
# Would need an installed conda to test
# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[bash-expected_patterns0] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/profile.d/conda.sh'
# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[zsh-expected_patterns1] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/profile.d/conda.sh'
# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[fish-expected_patterns2] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/fish/conf.d/conda.fish'
# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[xonsh-expected_patterns5] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/profile.d/conda.xsh'
# tests/cli/test_main_export.py::test_export_preserves_channels_from_installed_packages - AssertionError: Expected to find conda-forge or defaults in channels: ['https://conda.anaconda.org/conda-forge']
# tests/cli/test_main_export.py::test_export_package_alphabetical_ordering - AssertionError: Should have multiple packages for ordering test
# tests/cli/test_main_export.py::test_export_no_builds_format - AssertionError: Should have conda packages to test
# tests/cli/test_main_export.py::test_export_regular_format_consistency - AssertionError: Should have conda packages to test
# tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-yaml-yaml_safe_load] - AssertionError: Should have conda dependencies
# tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-json-loads] - AssertionError: Should have conda dependencies
# tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[YAML--yaml_safe_load] - conda.exceptions.CondaHTTPError
# tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[JSON---format=json-loads] - conda.exceptions.CondaHTTPError
# tests/cli/test_main_export.py::test_export_explicit_format_validation_errors - conda.exceptions.CondaHTTPError
# tests/cli/test_main_export.py::test_export_multiple_platforms - conda.exceptions.CondaHTTPError
# tests/cli/test_main_export.py::test_export_single_platform_different_platform - conda.exceptions.CondaHTTPError
# The /usr base env does not have last_modified
# tests/cli/test_main_info.py::test_info_json - AssertionError: assert False
# tests/cli/test_main_install.py::test_build_version_shows_as_changed - conda.exceptions.CondaHTTPError
# tests/cli/test_main_list.py::test_fields_all - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
# tests/cli/test_main_list.py::test_fields_invalid - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
# tests/cli/test_main_list.py::test_exit_codes - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
# tests/cli/test_main_update.py::test_update - conda.exceptions.CondaHTTPError
# tests/cli/test_main_update.py::test_dont_update_packages_with_version_constraints - conda.exceptions.NoBaseEnvironmentError: This conda installation has no default base environment. Use
# tests/core/test_prefix_data.py::test_get_packages_behavior_with_interoperability - conda.exceptions.CondaHTTPError
# tests/core/test_prefix_data.py::test_empty_environment_package_methods - conda.exceptions.CondaHTTPError
# tests/core/test_prefix_data.py::test_pinned_specs_conda_meta_pinned - conda.exceptions.CondaHTTPError
# tests/core/test_solve.py::test_pinned_specs_conda_meta_pinned[libmamba] - conda.exceptions.CondaHTTPError
# tests/core/test_solve.py::test_pinned_specs_condarc[libmamba] - conda.exceptions.CondaHTTPError
# tests/core/test_solve.py::test_pinned_specs_all[libmamba] - conda.exceptions.CondaHTTPError
# These are HTTP errors
# tests/env/installers/test_conda_installer_explicit.py::test_installer_installs_explicit - conda.CondaMultiError
# tests/env/specs/test_explicit.py::test_environment - conda.CondaMultiError
# tests/env/test_create.py::test_create_env_from_non_existent_plugin - conda.exceptions.CondaHTTPError
# tests/models/test_environment.py::test_extrapolate - conda.exceptions.CondaHTTPError
# tests/models/test_environment.py::test_explicit_packages - conda.CondaMultiError
# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[-\u2705] - conda.exceptions.CondaHTTPError
# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[conda 1.11-\u2705] - conda.exceptions.CondaHTTPError
# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[conda 1.11, otherpackages==1-\u274c] - conda.exceptions.CondaHTTPError
# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check["conda"-\u274c] - conda.exceptions.CondaHTTPError
# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[imnotinstalledyet-\u274c] - conda.exceptions.CondaHTTPError
# tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[True] - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
# tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[False] - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
# tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_not_supported - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
# tests/plugins/test_transaction_hooks.py::test_transaction_hooks_invoked - conda.exceptions.CondaHTTPError
# These are network errors
# tests/plugins/test_transaction_hooks.py::test_pre_transaction_raises_exception - AssertionError: Regex pattern did not match.
# tests/plugins/test_transaction_hooks.py::test_post_transaction_raises_exception - AssertionError: Regex pattern did not match.
# tests/cli/test_conda_argparse.py::test_list_through_python_api does not recognize /usr as a conda environment
# tests/cli/test_main_{clean,info,install,list,list_reverse,rename}.py tests require network access
# tests/cli/test_main_notices.py::test_notices_appear_once_when_running_decorated_commands needs a conda_build fixture that we remove
# tests/cli/test_main_notices.py::test_notices_cannot_read_cache_files - TypeError: '<' not supported between instances of 'MagicMock' and 'int'
# tests/cli/test_main_run.py require /usr/bin/conda to be installed
# tests/cli/test_subcommands.py tests require network access
# tests/cli/test_subcommands.py::test_doctor- conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
# tests/cli/test_subcommands.py::test_rename seems to need an active environment
# tests/env/test_create.py::test_create_env_json requires network access
# tests/env/test_create.py::test_create_update_remote_env_file requires network access
# tests/env/test_create.py::test_protected_dirs_error_for_env_create - requires network access
# tests/test_activate.py::test_activate_same_environment - requries network
# tests/test_activate.py::test_build_activate_dont_activate_unset_var - requires network
# tests/test_activate.py::test_build_activate_restore_unset_env_vars - requries network
# tests/test_activate.py::test_build_activate_shlvl_warn_clobber_vars - requries network
# tests/test_activate.py::test_build_activate_shlvl_0 - requries network
# tests/test_activate.py::test_build_activate_shlvl_1 - requries network
# tests/test_activate.py::test_build_deactivate_shlvl_2_from_stack - requries network
# tests/test_activate.py::test_build_deactivate_shlvl_2_from_activate - requries network
# tests/test_activate.py::test_build_deactivate_shlvl_1 - requries network
# tests/test_activate.py::test_build_stack_shlvl_1 - requries network
# tests/test_activate.py::test_get_env_vars_big_whitespace/test_get_env_vars_empty_file require network access
# tests/test_activate.py::test_pre_post_command_invoked[hook] - requires conda to be installed
# tests/test_activate.py::test_pre_post_command_raises[hook] - requires conda to be installed
# tests/test_misc.py::test_explicit_missing_cache_entries requires network access
# tests/core/test_initialize.py tries to unlink /usr/bin/python3 and fails when python is a release candidate
# tests/core/test_solve.py::test_cuda_fail_1 fails on non-x86_64
# tests/core/test_solve.py libmamba - some depsolving differences - TODO
# tests/core/test_solve.py libmamba - some depsolving differences - TODO
# tests/core/test_prefix_graph.py libmamba - some depsolving differences - TODO
# tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
# tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path_verbose - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
# tests/plugins/test_health_checks.py::test_health_check_ran - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
# tests/plugins/test_subcommands.py::test_help - Difference in whitespace
# tests/testing/test_fixtures.py::test_tmp_env - requires network access
# tests/testing/test_fixtures.py::test_session_tmp_env - requires network access
# tests/testing/test_fixtures.py::test_env - requires network tests to succeed
# tests/testing/test_fixtures.py::test_tmp_channel - requires network access
# tests/trust/test_signature_verification.py requires conda_content_trust - not yet packaged
py.test-%{python3_version} -vv -rfs -m "not integration" \
--deselect=tests/test_activate.py::test_activate_same_environment \
--deselect=tests/test_activate.py::test_build_activate_dont_activate_unset_var \
--deselect=tests/test_activate.py::test_build_activate_dont_use_PATH \
--deselect=tests/test_activate.py::test_build_activate_restore_unset_env_vars \
--deselect=tests/test_activate.py::test_build_activate_shlvl_warn_clobber_vars \
--deselect=tests/test_activate.py::test_build_activate_shlvl_0 \
--deselect=tests/test_activate.py::test_build_activate_shlvl_1 \
--deselect=tests/test_activate.py::test_build_deactivate_dont_use_PATH \
--deselect=tests/test_activate.py::test_build_deactivate_shlvl_2_from_stack \
--deselect=tests/test_activate.py::test_build_deactivate_shlvl_2_from_activate \
--deselect=tests/test_activate.py::test_build_deactivate_shlvl_1 \
--deselect=tests/test_activate.py::test_build_stack_shlvl_1 \
--deselect=tests/test_activate.py::test_get_env_vars_big_whitespace \
--deselect=tests/test_activate.py::test_get_env_vars_empty_file \
--deselect=tests/test_activate.py::test_pre_post_command_invoked[hook] \
--deselect=tests/test_activate.py::test_pre_post_command_raises[hook] \
--deselect=tests/test_cli.py::TestJson::test_list \
--deselect=tests/test_cli.py::test_run_returns_int \
--deselect=tests/test_cli.py::test_run_returns_nonzero_errorlevel \
--deselect=tests/test_cli.py::test_run_returns_zero_errorlevel \
--deselect=tests/test_cli.py::test_run_readonly_env \
--deselect=tests/test_install.py::test_conda_pip_interop_dependency_satisfied_by_pip \
--deselect=tests/test_install.py::test_install_from_extracted_package \
--deselect=tests/test_install.py::test_install_mkdir \
--deselect=tests/test_misc.py::test_explicit_missing_cache_entries \
--ignore=tests/env/specs/test_binstar.py \
--deselect=tests/base/test_context.py::test_default_activation_prefix \
--deselect=tests/cli/test_cli_install.py::test_frozen_env_cep22[libmamba] \
--deselect=tests/cli/test_cli_install.py::test_frozen_env_cep22[classic] \
--deselect=tests/cli/test_common.py::test_validate_subdir_config \
--deselect=tests/cli/test_common.py::test_validate_subdir_config_invalid_subdir \
--deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[bash-expected_patterns0] \
--deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[zsh-expected_patterns1] \
--deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[fish-expected_patterns2] \
--deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[xonsh-expected_patterns5] \
--deselect=tests/cli/test_main_export.py::test_export_preserves_channels_from_installed_packages \
--deselect=tests/cli/test_main_export.py::test_export_package_alphabetical_ordering \
--deselect=tests/cli/test_main_export.py::test_export_no_builds_format \
--deselect=tests/cli/test_main_export.py::test_export_regular_format_consistency \
--deselect=tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-yaml-yaml_safe_load] \
--deselect=tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-json-loads] \
--deselect=tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[YAML--yaml_safe_load] \
--deselect=tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[JSON---format=json-loads] \
--deselect=tests/cli/test_main_export.py::test_export_explicit_format_validation_errors \
--deselect=tests/cli/test_main_export.py::test_export_multiple_platforms \
--deselect=tests/cli/test_main_export.py::test_export_single_platform_different_platform \
--deselect=tests/cli/test_main_install.py::test_build_version_shows_as_changed \
--deselect=tests/cli/test_main_list.py::test_fields_all \
--deselect=tests/cli/test_main_list.py::test_fields_invalid \
--deselect=tests/cli/test_main_list.py::test_exit_codes \
--deselect=tests/cli/test_main_update.py::test_update \
--deselect=tests/cli/test_main_update.py::test_dont_update_packages_with_version_constraints \
--deselect=tests/core/test_prefix_data.py::test_get_packages_behavior_with_interoperability \
--deselect=tests/core/test_prefix_data.py::test_empty_environment_package_methods \
--deselect=tests/core/test_prefix_data.py::test_pinned_specs_conda_meta_pinned \
--deselect=tests/core/test_prefix_data.py::test_unset_reserved_env_vars \
--deselect=tests/core/test_prefix_data.py::test_warn_setting_reserved_env_vars \
--deselect=tests/core/test_solve.py::test_pinned_specs_conda_meta_pinned[libmamba] \
--deselect=tests/core/test_solve.py::test_pinned_specs_condarc[libmamba] \
--deselect=tests/core/test_solve.py::test_pinned_specs_all[libmamba] \
--deselect=tests/env/installers/test_conda_installer_explicit.py::test_installer_installs_explicit \
--deselect=tests/env/specs/test_explicit.py::test_environment \
--deselect=tests/env/test_create.py::test_create_env_from_non_existent_plugin \
--deselect=tests/models/test_environment.py::test_extrapolate \
--deselect=tests/models/test_environment.py::test_explicit_packages \
--deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check \
--deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[True] \
--deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[False] \
--deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_not_supported \
--deselect=tests/plugins/test_transaction_hooks.py::test_transaction_hooks_invoked \
--deselect=tests/plugins/test_transaction_hooks.py::test_pre_transaction_raises_exception \
--deselect=tests/plugins/test_transaction_hooks.py::test_post_transaction_raises_exception \
--deselect=tests/cli/test_all_commands.py::test_denylist_channels \
--deselect='tests/cli/test_common.py::test_is_active_prefix[active_prefix-True]' \
--deselect=tests/cli/test_config.py::test_conda_config_describe \
--deselect=tests/cli/test_config.py::test_conda_config_validate \
--deselect=tests/cli/test_config.py::test_conda_config_validate_sslverify_truststore \
--deselect=tests/cli/test_conda_argparse.py::test_list_through_python_api \
--deselect=tests/cli/test_main_clean.py \
--deselect=tests/cli/test_main_info.py::test_info_python_output \
--deselect=tests/cli/test_main_info.py::test_info_conda_json \
--deselect=tests/cli/test_main_info.py::test_info_json \
--deselect=tests/cli/test_main_install.py::test_conda_pip_interop_dependency_satisfied_by_pip \
--deselect=tests/cli/test_main_install.py::test_install_from_extracted_package \
--deselect=tests/cli/test_main_install.py::test_install_mkdir \
--deselect=tests/cli/test_main_list.py::test_list \
--deselect=tests/cli/test_main_list.py::test_list_reverse \
--deselect=tests/cli/test_main_notices.py::test_notices_appear_once_when_running_decorated_commands \
--deselect=tests/cli/test_main_notices.py::test_notices_cannot_read_cache_files \
--deselect=tests/cli/test_main_remove.py::test_remove_all \
--deselect=tests/cli/test_main_remove.py::test_remove_all_keep_env \
--deselect=tests/cli/test_main_rename.py \
--deselect=tests/cli/test_main_run.py \
--deselect=tests/cli/test_subcommands.py::test_create[libmamba] \
--deselect=tests/cli/test_subcommands.py::test_doctor \
--deselect=tests/cli/test_subcommands.py::test_env_create \
--deselect=tests/cli/test_subcommands.py::test_env_update \
--deselect=tests/cli/test_subcommands.py::test_init \
--deselect=tests/cli/test_subcommands.py::test_install \
--deselect=tests/cli/test_subcommands.py::test_list \
--deselect=tests/cli/test_subcommands.py::test_notices \
--deselect=tests/cli/test_subcommands.py::test_remove_all_json[remove] \
--deselect=tests/cli/test_subcommands.py::test_remove_all_json[uninstall] \
--deselect=tests/cli/test_subcommands.py::test_rename \
--deselect=tests/cli/test_subcommands.py::test_run \
--deselect=tests/cli/test_subcommands.py::test_search \
--deselect=tests/cli/test_subcommands.py::test_update[libmamba-update] \
--deselect=tests/cli/test_subcommands.py::test_update[libmamba-upgrade] \
--deselect=tests/cli/test_subcommands.py::test_update[update] \
--deselect=tests/cli/test_subcommands.py::test_update[upgrade] \
--deselect=tests/core/test_package_cache_data.py::test_ProgressiveFetchExtract_prefers_conda_v2_format \
--deselect=tests/core/test_subdir_data.py::test_subdir_data_prefers_conda_to_tar_bz2 \
--deselect=tests/core/test_subdir_data.py::test_use_only_tar_bz2 \
--deselect=tests/core/test_initialize.py \
--deselect=tests/core/test_solve.py::test_cuda_fail_1 \
--deselect=tests/core/test_solve.py::test_conda_downgrade[libmamba] \
--deselect=tests/core/test_solve.py::test_python2_update[libmamba] \
--deselect=tests/core/test_solve.py::test_update_deps_2[libmamba] \
--deselect=tests/core/test_solve.py::test_fast_update_with_update_modifier_not_set[libmamba] \
--deselect=tests/core/test_solve.py::test_timestamps_1[libmamba] \
--deselect=tests/core/test_solve.py::test_remove_with_constrained_dependencies[libmamba] \
--deselect=tests/env/test_create.py::test_create_env_json[example/environment.yml] \
--deselect=tests/env/test_create.py::test_create_env_json[example/environment_with_pip.yml] \
--deselect=tests/env/test_create.py::test_create_update_remote_env_file \
--deselect=tests/env/test_create.py::test_protected_dirs_error_for_env_create \
--deselect=tests/gateways/test_jlap.py::test_download_and_hash \
--deselect=tests/gateways/test_jlap.py::test_jlap_fetch_ssl[True] \
--deselect=tests/gateways/test_jlap.py::test_jlap_fetch_ssl[False] \
--deselect=tests/test_plan.py::test_pinned_specs_conda_meta_pinned \
--deselect=tests/test_plan.py::test_pinned_specs_condarc \
--deselect=tests/test_plan.py::test_pinned_specs_all \
--deselect=tests/cli/test_subcommands.py::test_compare[libmamba] \
--deselect=tests/cli/test_subcommands.py::test_package[libmamba] \
--deselect=tests/cli/test_subcommands.py::test_remove[libmamba-remove] \
--deselect=tests/cli/test_subcommands.py::test_remove[libmamba-uninstall] \
--deselect=tests/cli/test_subcommands.py::test_remove_all_json[libmamba-remove] \
--deselect=tests/cli/test_subcommands.py::test_remove_all_json[libmamba-uninstall] \
--deselect=tests/cli/test_subcommands.py::test_remove_all_json[classic-remove] \
--deselect=tests/cli/test_subcommands.py::test_remove_all_json[classic-uninstall] \
--deselect=tests/cli/test_subcommands.py::test_update[classic-update] \
--deselect=tests/cli/test_subcommands.py::test_update[classic-upgrade] \
--deselect=tests/cli/test_subcommands.py::test_env_remove[libmamba] \
--deselect=tests/cli/test_subcommands.py::test_env_config_vars[libmamba] \
--deselect=tests/core/test_subdir_data.py::test_subdir_data_coverage \
--deselect=tests/models/test_prefix_graph.py::test_prefix_graph_1[libmamba] \
--deselect=tests/models/test_prefix_graph.py::test_prefix_graph_2[libmamba] \
--deselect=tests/models/test_prefix_graph.py::test_remove_youngest_descendant_nodes_with_specs[libmamba] \
--deselect=tests/models/test_prefix_graph.py::test_deep_cyclical_dependency[libmamba] \
--deselect=tests/plugins/test_pre_solves.py::test_pre_solve_invoked \
--deselect=tests/plugins/test_post_solves.py::test_post_solve_action_raises_exception \
--deselect=tests/plugins/test_post_solves.py::test_post_solve_invoked \
--deselect=tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path \
--deselect=tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path_verbose \
--deselect=tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_with_test_environment \
--deselect=tests/plugins/test_health_checks.py::test_health_check_ran \
--deselect=tests/plugins/test_subcommands.py::test_help \
--deselect=tests/core/test_prefix_data.py::test_get_environment_env_vars \
--deselect=tests/core/test_prefix_data.py::test_set_unset_environment_env_vars \
--deselect=tests/core/test_prefix_data.py::test_set_unset_environment_env_vars_no_exist \
--deselect=tests/testing/test_fixtures.py::test_tmp_env \
--deselect=tests/testing/test_fixtures.py::test_session_tmp_env \
--deselect=tests/testing/test_fixtures.py::test_env \
--deselect=tests/testing/test_fixtures.py::test_tmp_channel \
--ignore=tests/trust \
conda tests
%endif
%files
%{_sysconfdir}/conda/
%{_bindir}/conda
%{_bindir}/conda-env
%{bash_completionsdir}/conda
# TODO - better ownership for fish/vendor_conf.d
%dir %{_datadir}/fish/vendor_conf.d
%{_datadir}/fish/vendor_conf.d/conda.fish
/etc/profile.d/conda.sh
/etc/profile.d/conda.csh
%if %with_python2
%files -n python2-conda
%license LICENSE.txt
%doc CHANGELOG.md README.rst
%{python2_sitelib}/conda/
%{python2_sitelib}/conda_env/
%{python2_sitelib}/*.egg-info
%exclude %{python2_sitelib}/test_data/
%{_localstatedir}/cache/conda/
%{_datadir}/conda/
%endif
%files tests
%{_datadir}/conda/tests/
%files -n python%{python3_pkgversion}-conda
%license LICENSE.txt
%doc CHANGELOG.md README.rst
%{python3_sitelib}/conda/
%{python3_sitelib}/conda_env/
%{python3_sitelib}/*.egg-info
%exclude %{python3_sitelib}/test_data/
%files -n python%{python3_pkgversion}-conda -f %pyproject_files
%doc CHANGELOG.md README.md
%{_localstatedir}/cache/conda/
%{_datadir}/conda/
%dir %{_datadir}/conda/
%{_datadir}/conda/condarc.d/
%changelog
* Tue Apr 16 2019 Orion Poplawski <orion@nwra.com> - 4.6.13-1
- Update to 4.6.13
* Thu Apr 4 2019 Orion Poplawski <orion@nwra.com> - 4.6.11-1
- Update to 4.6.11
* Tue Apr 2 2019 Orion Poplawski <orion@nwra.com> - 4.6.9-2
- Fix conda profile scripts
- Do not build for python2 on EPEL
- Ignore test failures on EPEL7
* Sat Mar 30 2019 Orion Poplawski <orion@nwra.com> - 4.6.9-1
- Update to 4.6.9
* Wed Feb 13 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.6.5-1
- Update to latest upstream version (#1668145)
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Dec 31 2018 Orion Poplawski <orion@nwra.com> - 4.5.12-1
- Update to 4.5.12
* Mon Dec 31 2018 Orion Poplawski <orion@nwra.com> - 4.5.11-2
- EPEL7 compatability
* Fri Sep 21 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.5.11-1
- Update to latest stable version (#1570217)
- Disable python2 subpackage on F30+
* Fri Jul 13 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.11-4
- Pull in python[23]-cytoolz to replace bundled toolz
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 4.4.11-3
- Rebuilt for Python 3.7
* Wed Apr 18 2018 Orion Poplawski <orion@nwra.com> - 4.4.11-2
- Set _CONDA_ROOT in /etc/profile.d/conda.csh
- Fix python2 requires
- Require pycosat >= 0.6.3
* Sat Apr 14 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.11-1
- Update to latest upstream version in the 4.4.x branch (#1544046)
* Wed Feb 7 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.9-1
- Update to v4.4.9 (#1542874)
- conda-activate binary rpm is retired. The new way to activate the environment
is to say 'conda activate'. See
https://github.com/conda/conda/releases/tag/4.4.0 for more information.
* Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 4.3.24-5
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.24-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-3
- Install just one version of the executables (python 2 or 3)
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-2
- Add all licenses to the License tag
- Add Provides: bundled(...) for all the "vendored" dependencies
- Update descriptions and simplify the spec file a bit
- Move condarc.d directory under /usr/share/conda
* Thu Aug 3 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-1
- Update to latest version
- Switch /usr/bin/conda to python3
* Thu Jul 21 2016 Orion Poplawski <orion@cora.nwra.com> - 4.1.6-1
- Update to 4.1.6
* Thu Dec 31 2015 Orion Poplawski <orion@cora.nwra.com> - 3.19.0-1
- Update to 3.19.0
* Thu Dec 31 2015 Orion Poplawski <orion@cora.nwra.com> - 3.18.8-2
- Add python 3 version
* Mon Dec 7 2015 Orion Poplawski <orion@cora.nwra.com> - 3.18.8-1
- Update to 3.18.8
* Thu Sep 24 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-6
- Do not create broken symlinks if activate/deactivate are not installed
- Do not create /usr/conda-meta to prevent accidental installs into system
* Thu Sep 24 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-5
- Non-bootstrap build
* Wed Sep 23 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-4
- Add patch to support rootless mode
- Require python-crypto
- Create /usr/conda-meta, /usr/.condarc, /var/cache/conda
* Tue Sep 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-3
- Require python-requests, python-yaml
* Tue Sep 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-2
- Add patch to allow overriding pkgs_dirs in .condarc
* Mon Sep 21 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-1
- Initial package
%autochangelog

View file

@ -1,21 +0,0 @@
--- conda-4.6.9/conda/gateways/disk/create.py.orig 2019-03-29 19:33:49.000000000 -0600
+++ conda-4.6.9/conda/gateways/disk/create.py 2019-03-30 20:40:49.522977470 -0600
@@ -27,7 +27,7 @@
from ...common.path import ensure_pad, expand, win_path_double_escape, win_path_ok
from ...common.serialize import json_dump
from ...exceptions import (BasicClobberError, CaseInsensitiveFileSystemError, CondaOSError,
- maybe_raise, CondaFileIOError)
+ maybe_raise, CondaFileIOError, NotWritableError)
from ...models.enums import FileMode, LinkType
log = getLogger(__name__)
@@ -407,6 +407,9 @@
sudo_safe = expand(pkgs_dir).startswith(expand('~'))
touch(join(pkgs_dir, PACKAGE_CACHE_MAGIC_FILE), mkdir=True, sudo_safe=sudo_safe)
touch(join(pkgs_dir, 'urls'), sudo_safe=sudo_safe)
+ except NotWritableError:
+ log.trace("cannot create package cache directory '%s'", pkgs_dir)
+ return False
except (IOError, OSError) as e:
if e.errno in (EACCES, EPERM):
log.trace("cannot create package cache directory '%s'", pkgs_dir)

View file

@ -1,14 +0,0 @@
diff --git a/conda/__init__.py b/conda/__init__.py
index 342f3ce..debf943 100644
--- a/conda/__init__.py
+++ b/conda/__init__.py
@@ -35,8 +35,7 @@ __copyright__ = "Copyright (c) 2012, Anaconda, Inc."
__summary__ = __doc__
__url__ = "https://github.com/conda/conda"
-if os.getenv('CONDA_ROOT') is None:
- os.environ[str('CONDA_ROOT')] = sys.prefix
+os.environ['CONDA_ROOT'] = '/usr/share/conda'
CONDA_PACKAGE_ROOT = abspath(dirname(__file__))

View file

@ -1,16 +0,0 @@
diff --git a/utils/setup-testing.py b/utils/setup-testing.py
index 7036d44..19793f8 100755
--- a/utils/setup-testing.py
+++ b/utils/setup-testing.py
@@ -3,10 +3,7 @@
from __future__ import absolute_import, division, print_function, unicode_literals
import os
import sys
-if 'develop' in sys.argv:
- from setuptools import setup
-else:
- from distutils.core import setup
+from setuptools import setup
if not (sys.version_info[:2] == (2, 7) or sys.version_info[:2] >= (3, 3)):
sys.exit("conda is only meant for Python 2.7 or 3.3 and up. "

View file

@ -1 +1 @@
SHA512 (conda-4.6.13.tar.gz) = 8f0ad3cac26e88740ffc94f980546827388151746d8fad133b131dc893d8bb4a2840fb4f08e6c98759b1d919e8d24b05c93acd76bfc16ae5d487f699ea5ce20d
SHA512 (conda-25.11.1.tar.gz) = ce04c8805ca51047cf1e1ebb945fcce1fbb559fe472d4f5fb4217d49b93b67c8e38baf735c6a9244b31d559247ec10d46e1e33caf8ac7fedc105ce3645121609