这是indexloc提供的服务，不要输入任何密码
Skip to content

resolve #7189 progress bar improvement #7191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2018
Merged

resolve #7189 progress bar improvement #7191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc5994c
resolve #7189 progress bar improvement
kalefranz Apr 19, 2018
877f3f6
ignore PyPI failure for conda-build 2
kalefranz Apr 24, 2018
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
2 changes: 2 additions & 0 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ conda_build_test: &conda_build_test
and not cran-nmf
and not test_preferred_env
and not test_name_with_version_specified
and not test_pypi_with_setup_options
# skeleton_pypi skipped because of changes to PyPI API
# expand_globs and build_expands_wildcards fail on circleci because of list ordering discrepancies
# skipping numpy tests so circleci images don't need numpy (and mkl) installed
Expand All @@ -90,6 +91,7 @@ conda_build_test: &conda_build_test
# skipping cran-nmf because nmf was removed/archived in cran
# for test_preferred_env see https://github.com/conda/conda/issues/3912#issuecomment-374820599
# test_name_with_version_specified because of the new PyPI
# test_pypi_with_setup_options because of the new PyPI
command: |
eval "$(sudo /opt/conda/bin/python -m conda init --dev bash)"
conda info
Expand Down
8 changes: 7 additions & 1 deletion conda/core/package_cache_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from ..models.dist import Dist
from ..models.match_spec import MatchSpec
from ..models.records import PackageCacheRecord, PackageRecord, PackageRef
from ..utils import human_bytes

try:
from cytoolz.itertoolz import concat, concatv, groupby
Expand Down Expand Up @@ -625,7 +626,12 @@ def _execute_actions(prec_or_spec, actions):
if cache_axn is None and extract_axn is None:
return

desc = "%s %s" % (prec_or_spec.name, prec_or_spec.version)
desc = "%s-%s" % (prec_or_spec.name, prec_or_spec.version)
if len(desc) > 20:
desc = desc[:20]
size = getattr(prec_or_spec, 'size', None)
desc = "%-20s | %7s | " % (desc, size and human_bytes(size) or '')

progress_bar = ProgressBar(desc, not context.verbosity and not context.quiet, context.json)

download_total = 0.75 # fraction of progress for download; the rest goes to extract
Expand Down