Skip to content

Commit

Permalink
try to fix conda-build 3
Browse files Browse the repository at this point in the history
  • Loading branch information
kalefranz committed Apr 17, 2017
1 parent 804dbb5 commit 69ba30c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ matrix:
sudo: false
language: generic
os: linux
- env: PYTHON_VERSION=3.6 CONDA_BUILD=3.0.0alpha3
sudo: false
language: generic
os: linux
allow_failures:
- os: osx

Expand Down
1 change: 1 addition & 0 deletions conda/core/solve.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from copy import copy
from genericpath import exists
from logging import getLogger
from operator import itemgetter
from os.path import basename, join

from .envs_manager import EnvsDirectory
Expand Down
23 changes: 10 additions & 13 deletions conda/plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,12 @@ def plan_from_actions(actions, index):

unlink_link_transaction = actions.get('UNLINKLINKTRANSACTION')
if unlink_link_transaction:
progressive_fetch_extract = actions.get('PROGRESSIVEFETCHEXTRACT')
if progressive_fetch_extract:
plan.append((PROGRESSIVEFETCHEXTRACT, progressive_fetch_extract))
plan.append((UNLINKLINKTRANSACTION, unlink_link_transaction))
return plan
raise RuntimeError()
# progressive_fetch_extract = actions.get('PROGRESSIVEFETCHEXTRACT')
# if progressive_fetch_extract:
# plan.append((PROGRESSIVEFETCHEXTRACT, progressive_fetch_extract))
# plan.append((UNLINKLINKTRANSACTION, unlink_link_transaction))
# return plan

axn = actions.get('ACTION') or None
specs = actions.get('SPECS', [])
Expand Down Expand Up @@ -466,14 +467,10 @@ def install_actions(prefix, index, specs, force=False, only_names=None, always_c
txn = get_install_transaction_single(prefix, index, specs, force, only_names, always_copy,
pinned, minimal_hint, update_deps, prune,
channel_priority_map, is_update)

pfe = txn.get_pfe()
actions = defaultdict(list)
actions.update({
'PREFIX': prefix,
'PROGRESSIVEFETCHEXTRACT': pfe,
'UNLINKLINKTRANSACTION': txn,
})
prefix_setup = txn.prefix_setups[prefix]
actions = get_blank_actions(prefix)
actions['UNLINK'].extend(prefix_setup.unlink_dists)
actions['LINK'].extend(prefix_setup.link_dists)
return actions


Expand Down

0 comments on commit 69ba30c

Please sign in to comment.