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

Don't load binstar_client until needed. Part 2. #10692

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 4 commits into from
Jun 7, 2021
Merged

Don't load binstar_client until needed. Part 2. #10692

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c00c50c
Don't load binstar_client until needed.
cgranade May 9, 2021
c48eb7f
Fix flake8 issues.
cgranade May 9, 2021
5e6dd91
Use importlib for programmatic loading of binstar.
jezdez May 26, 2021
e60463d
Actually call get_server_api.
jezdez May 27, 2021
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
23 changes: 13 additions & 10 deletions conda_env/specs/binstar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2012 Anaconda, Inc
# SPDX-License-Identifier: BSD-3-Clause
import importlib
import re

from conda.models.version import normalized_version
from .. import env
from ..exceptions import EnvironmentFileNotDownloaded

try:
from binstar_client import errors
from binstar_client.utils import get_server_api
except ImportError:
get_server_api = None

ENVIRONMENT_TYPE = 'env'
# TODO: isolate binstar related code into conda_env.utils.binstar
Expand All @@ -31,15 +27,12 @@ class BinstarSpec(object):
_packagename = None
_package = None
_file_data = None
_binstar = None
msg = None

def __init__(self, name=None, **kwargs):
self.name = name
self.quiet = False
if get_server_api is not None:
self.binstar = get_server_api()
else:
self.binstar = None

def can_handle(self):
result = self._can_handle()
Expand Down Expand Up @@ -80,6 +73,16 @@ def valid_package(self):
"""
return len(self.file_data) > 0

@property
def binstar(self):
if self._binstar is None:
try:
binstar_utils = importlib.import_module("binstar_client.utils")
self._binstar = binstar_utils.get_server_api()
except (AttributeError, ModuleNotFoundError):
pass
return self._binstar

@property
def file_data(self):
if self._file_data is None:
Expand Down Expand Up @@ -112,7 +115,7 @@ def package(self):
if self._package is None:
try:
self._package = self.binstar.package(self.username, self.packagename)
except errors.NotFound:
except IndexError:
Copy link
Member Author

@jezdez jezdez May 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NotFound is using IndexError as one parent class.

self.msg = "{} was not found on anaconda.org.\n"\
"You may need to be logged in. Try running:\n"\
" anaconda login".format(self.name)
Expand Down