Skip to content

Commit

Permalink
Don't break plugins using _getresolvedeps but raise warning of will b…
Browse files Browse the repository at this point in the history
…e removed
  • Loading branch information
gaborbernat committed Jun 26, 2018
1 parent 5cf62cb commit 6115452
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions src/tox/venv.py
Expand Up @@ -4,6 +4,7 @@
import pipes
import re
import sys
import warnings

import py

Expand Down Expand Up @@ -184,13 +185,20 @@ def _getliveconfig(self):
develop = self.envconfig.usedevelop
alwayscopy = self.envconfig.alwayscopy
deps = []
for dep in self._get_resolved_dependencies():
for dep in self.get_resolved_dependencies():
raw_dep = dep.name
md5 = getdigest(raw_dep)
deps.append((md5, raw_dep))
return CreationConfig(md5, python, version, sitepackages, develop, deps, alwayscopy)

def _get_resolved_dependencies(self):
def _getresolvedeps(self):
warnings.warn(
"that's a private function there, use get_resolved_dependencies, will be removed in 3.2",
category=DeprecationWarning,
)
return self.get_resolved_dependencies()

def get_resolved_dependencies(self):
dependencies = []
for dependency in self.envconfig.deps:
if dependency.indexserver is None:
Expand Down Expand Up @@ -469,7 +477,7 @@ def tox_testenv_create(venv, action):

@tox.hookimpl
def tox_testenv_install_deps(venv, action):
deps = venv._get_resolved_dependencies()
deps = venv.get_resolved_dependencies()
if deps:
depinfo = ", ".join(map(str, deps))
action.setactivity("installdeps", depinfo)
Expand Down

0 comments on commit 6115452

Please sign in to comment.