这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
9f16472
Add `win-arm64` as a recognized platform (#11778)
chenghlee Sep 1, 2022
7c5e2cd
Rename `conda.recipe` to `recipe` (#11774)
kenodegard Sep 6, 2022
6519f43
Update canary-release action version (#11799)
kenodegard Sep 7, 2022
1d44ac0
Updated conda CLI help to be better for users. (#11708)
kathatherine Sep 7, 2022
6f76e4c
🔄 Synced file(s) with conda/infra (#11827)
conda-bot Sep 9, 2022
16f4c40
Fix pypy win (#11734)
isuruf Sep 12, 2022
9e7f893
[pre-commit.ci] pre-commit autoupdate (#11833)
pre-commit-ci[bot] Sep 12, 2022
c25cdbb
Fixes an issue that we are having with carnary builds (#11803)
travishathaway Sep 12, 2022
de3db7f
Update CONTRIBUTING.md (#11816)
scdub Sep 12, 2022
60e11b4
Release 22.9.0 (#11844)
travishathaway Sep 20, 2022
dcf517e
Expose --mach and --arch to devenv script (#11851)
kenodegard Sep 21, 2022
f39113e
[pre-commit.ci] pre-commit autoupdate (#11859)
pre-commit-ci[bot] Sep 22, 2022
264a59f
🔄 Synced file(s) with conda/infra (#11853)
conda-bot Sep 22, 2022
9cb366e
Require `ruamel.yaml` (#11868)
kenodegard Sep 22, 2022
0ccdfa5
Update requirements.txt (#11842)
ittakestwins Sep 23, 2022
cfc7c02
Grammatical correction in docs (#11870)
SatyamVyas04 Sep 23, 2022
b83abc2
Removed allow_other_channels from conda docs. (#11866)
kathatherine Sep 23, 2022
dbf08f0
Use maintained `ruamel.yaml` (#11837)
kenodegard Sep 26, 2022
6918d6f
document conda-build: pkg_format: 2 (#11881)
dholth Sep 27, 2022
6ea6a2d
Extract script building into helper functions for `conda init --dev` …
kenodegard Sep 28, 2022
c217038
🔄 Synced file(s) with conda/infra (#11896)
conda-bot Sep 29, 2022
bfcbbf6
Refactor conda init shells as argparse choices (#11897)
kenodegard Sep 29, 2022
a8ba678
remove encoding pragma (not needed in Python 3) (#11880)
dholth Sep 29, 2022
eb3e6a7
Fail with a readable error message if PackageCacheRecords are missing…
timhoffm Sep 29, 2022
07e9fb5
Avoid a specific case where `conda env update` hangs. (#11818)
fragmede Sep 29, 2022
7ffe442
Download packages in parallel (#11841)
dholth Sep 30, 2022
579cdf2
Removed ref left behind from removing allow_other_channels docs. (#11…
kathatherine Sep 30, 2022
91fe7f7
Enable one single test for linux-{aarch64, ppc64le} (#11911)
dbast Oct 4, 2022
8730563
Fixed broken URL in conda docs (#11902)
kathatherine Oct 4, 2022
cbabfbb
Update xprocess minio pattern (#11924)
jezdez Oct 4, 2022
e665f5e
Updated conda cheatsheet for 4.14.0 release. (#11768)
kathatherine Oct 5, 2022
16c9f87
Fix for conda update and install issue related to notices (#11852)
travishathaway Oct 5, 2022
fc92ea3
Add pyupgrade to pre-commit (#11909)
dbast Oct 5, 2022
5035d26
[pre-commit.ci] auto fixes from pre-commit.com hooks (#11928)
kenodegard Oct 6, 2022
f1381ba
Introduce git-blame-ignore-revs file, add pyupgrade commit to it (#11…
dbast Oct 6, 2022
ebcb097
Update ci-skip workflow. (#11935)
jezdez Oct 6, 2022
a651c88
Check for conda before calling shell hook (#11374)
wulmer Oct 7, 2022
c8c7738
Removing an outdated piece of documentation (#11943)
travishathaway Oct 7, 2022
80ab6ba
Fix bullet point list formatting (#11945)
beeankha Oct 7, 2022
7461fdb
Change `metadata_signature_status`'s default value (#11944)
kenodegard Oct 7, 2022
d61887b
Fix CI workflows to always run (#11941)
jezdez Oct 7, 2022
14f95c4
add LD_PRELOAD (#11926)
ForgottenProgramme Oct 7, 2022
6bf297d
restore CondaMultiError from package downloads (#11959)
dholth Oct 12, 2022
526d5c1
Merge remote-tracking branch 'origin/main' into feature/plugins
jezdez Oct 13, 2022
f28107e
Merge branch 'feature/plugins' of github.com:conda/conda into feature…
jezdez Oct 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 0 additions & 61 deletions .github/workflows/ci-skip.yml

This file was deleted.

11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,10 @@ on:
push:
branches:
- main
paths-ignore:
- 'docs/**'

# NOTE: github.event context is pull_request payload:
# https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#pull_request
pull_request:
paths-ignore:
- 'docs/**'

concurrency:
# Concurrency group that uses the workflow name and PR number if available
Expand Down Expand Up @@ -244,6 +240,7 @@ jobs:
steps:
- name: Download test results
uses: actions/download-artifact@v3

- name: Upload combined test results
# provides one downloadable archive of all .coverage/test-report.xml files
# of all matrix runs for further analysis.
Expand All @@ -252,7 +249,13 @@ jobs:
name: test-results-${{ github.sha }}-all
path: test-results-${{ github.sha }}-*
retention-days: 90 # default: 90

- name: Test Summary
uses: test-summary/action@v1
with:
paths: ./test-results-${{ github.sha }}-**/test-report*.xml

- name: Decide whether the needed jobs succeeded or failed
uses: re-actors/alls-green@release/v1
with:
jobs: ${{ toJSON(needs) }}
5 changes: 0 additions & 5 deletions conda/base/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,6 @@ def __init__(self, search_path=None, argparse_args=None):
# Add plugin support
self._plugin_manager = get_plugin_manager()

@property
@functools.lru_cache(maxsize=None) # FUTURE: Python 3.9+, replace w/ functools.cache
def plugin_manager(self):
return self._plugin_manager

def post_build_validation(self):
errors = []
if self.client_ssl_cert_key and not self.client_ssl_cert:
Expand Down
1 change: 0 additions & 1 deletion conda/cli/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

conda <command> -h
"""

from .conda_argparse import generate_parser

import sys
Expand Down
9 changes: 5 additions & 4 deletions conda/cli/main_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,11 @@ def get_info_dict(system=False):
info_dict['GID'] = os.getegid()

env_var_keys = {
'CIO_TEST',
'CURL_CA_BUNDLE',
'REQUESTS_CA_BUNDLE',
'SSL_CERT_FILE',
"CIO_TEST",
"CURL_CA_BUNDLE",
"REQUESTS_CA_BUNDLE",
"SSL_CERT_FILE",
"LD_PRELOAD",
}

# add all relevant env vars, e.g. startswith('CONDA') or endswith('PATH')
Expand Down
31 changes: 19 additions & 12 deletions conda/core/initialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,9 @@ def _config_fish_content(conda_prefix):
conda_initialize_content = dals("""
# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
eval %(conda_exe)s "shell.fish" "hook" $argv | source
if test -f %(conda_exe)s
eval %(conda_exe)s "shell.fish" "hook" $argv | source
end
# <<< conda initialize <<<
""") % {
'conda_exe': conda_exe,
Expand Down Expand Up @@ -1122,15 +1124,16 @@ def _config_xonsh_content(conda_prefix):
conda_initialize_content = dals("""
# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
import sys as _sys
from types import ModuleType as _ModuleType
_mod = _ModuleType("xontrib.conda",
"Autogenerated from $({conda_exe} shell.xonsh hook)")
__xonsh__.execer.exec($("{conda_exe}" "shell.xonsh" "hook"),
glbs=_mod.__dict__,
filename="$({conda_exe} shell.xonsh hook)")
_sys.modules["xontrib.conda"] = _mod
del _sys, _mod, _ModuleType
if !(test -f "{conda_exe}"):
import sys as _sys
from types import ModuleType as _ModuleType
_mod = _ModuleType("xontrib.conda",
"Autogenerated from $({conda_exe} shell.xonsh hook)")
__xonsh__.execer.exec($("{conda_exe}" "shell.xonsh" "hook"),
glbs=_mod.__dict__,
filename="$({conda_exe} shell.xonsh hook)")
_sys.modules["xontrib.conda"] = _mod
del _sys, _mod, _ModuleType
# <<< conda initialize <<<
""").format(conda_exe=conda_exe)
return conda_initialize_content
Expand Down Expand Up @@ -1205,7 +1208,9 @@ def _bashrc_content(conda_prefix, shell):
conda_initialize_content = dals("""
# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
eval "$('%(conda_exe)s' 'shell.%(shell)s' 'hook')"
if [ -f '%(conda_exe)s' ]; then
eval "$('%(conda_exe)s' 'shell.%(shell)s' 'hook')"
fi
# <<< conda initialize <<<
""") % {
'conda_exe': conda_exe,
Expand Down Expand Up @@ -1521,7 +1526,9 @@ def _powershell_profile_content(conda_prefix):
conda_powershell_module = dals("""
#region conda initialize
# !! Contents within this block are managed by 'conda init' !!
(& "{conda_exe}" "shell.powershell" "hook") | Out-String | Invoke-Expression
If (Test-Path "{conda_exe}") {{
(& "{conda_exe}" "shell.powershell" "hook") | Out-String | ?{{$_}} | Invoke-Expression
}}
#endregion
""".format(conda_exe=conda_exe))

Expand Down
47 changes: 25 additions & 22 deletions conda/core/package_cache_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -761,30 +761,32 @@ def execute(self):
for completed_future in as_completed(futures):
try:
prec_or_spec = completed_future.result()
cache_action, extract_action = self.paired_actions[prec_or_spec]
extract_future = extract_executor.submit(
do_extract_action,
prec_or_spec,
extract_action,
progress_bars[prec_or_spec],
)
extract_future.add_done_callback(
partial(
done_callback,
actions=(cache_action, extract_action),
exceptions=exceptions,
progress_bar=progress_bars[prec_or_spec],
finish=True,
)
)

except Exception as exc:
log.debug(b"%r", exc, exc_info=True)
# done_callback saves exc in exceptions[]
# cancel any download that has not been started
except Exception:
# Special handling for exceptions thrown inside future, not
# by futures handling code. Cancel any download that has not
# been started. In-progress futures will continue.
for future in futures:
future.cancel()
raise

# break, not raise. CondaMultiError() raised if exceptions.
break

cache_action, extract_action = self.paired_actions[prec_or_spec]
extract_future = extract_executor.submit(
do_extract_action,
prec_or_spec,
extract_action,
progress_bars[prec_or_spec],
)
extract_future.add_done_callback(
partial(
done_callback,
actions=(cache_action, extract_action),
exceptions=exceptions,
progress_bar=progress_bars[prec_or_spec],
finish=True,
)
)

for bar in progress_bars.values():
bar.close()
Expand All @@ -794,6 +796,7 @@ def execute(self):

if exceptions:
raise CondaMultiError(exceptions)

self._executed = True

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion conda/models/records.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class PackageRecord(DictSafeMixin, Entity):
sha256 = StringField(default=None, required=False, nullable=True, default_in_dump=False)

metadata_signature_status = StringField(
default=None, required=False, nullable=True, default_in_dump=False
default="", required=False, nullable=True, default_in_dump=False
)

@property
Expand Down
1 change: 0 additions & 1 deletion docs/source/redirects.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Redirects
test-drive
travis
troubleshooting
winxp-proxy
help/conda-pip-virtualenv-translator
help/silent
install/central
Expand Down
1 change: 0 additions & 1 deletion docs/source/user-guide/configuration/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ Configuration
admin-multi-user-install
enable-tab-completion
pip-interoperability
use-winxp-with-proxy
disable-ssl-verification
non-standard-certs
98 changes: 0 additions & 98 deletions docs/source/user-guide/configuration/use-winxp-with-proxy.rst

This file was deleted.

Loading