diff options
author | holger krekel <holger@merlinux.eu> | 2015-04-20 21:51:46 +0200 |
---|---|---|
committer | holger krekel <holger@merlinux.eu> | 2015-04-20 21:51:46 +0200 |
commit | 5460ace40a08b880ebce23cee9d62f2d4999790f (patch) | |
tree | 34fc4948097489ba6df6834665640dd85d127ea0 /tox | |
parent | 406d45d0ef7a5c7baab6db6621dadc5c2c6822a3 (diff) | |
download | tox-5460ace40a08b880ebce23cee9d62f2d4999790f.tar.gz |
introduce new "platform" setting for tox
(XXX) consider using environment marker syntax
Diffstat (limited to 'tox')
-rw-r--r-- | tox/_cmdline.py | 6 | ||||
-rw-r--r-- | tox/_config.py | 18 | ||||
-rw-r--r-- | tox/_venv.py | 4 | ||||
-rw-r--r-- | tox/interpreters.py | 6 |
4 files changed, 28 insertions, 6 deletions
diff --git a/tox/_cmdline.py b/tox/_cmdline.py index 14eb685..4037283 100644 --- a/tox/_cmdline.py +++ b/tox/_cmdline.py @@ -474,6 +474,9 @@ class Session: if self.config.option.sdistonly: return for venv in self.venvlist: + if not venv.matching_platform(): + venv.status = "platform mismatch" + continue # we simply omit non-matching platforms if self.setupenv(venv): if venv.envconfig.develop: self.developpkg(venv, self.config.setupdir) @@ -505,6 +508,9 @@ class Session: else: retcode = 1 self.report.error(msg) + elif status == "platform mismatch": + msg = " %s: %s" %(venv.envconfig.envname, str(status)) + self.report.verbosity1(msg) elif status and status != "skipped tests": msg = " %s: %s" %(venv.envconfig.envname, str(status)) self.report.error(msg) diff --git a/tox/_config.py b/tox/_config.py index 3d26686..b9ffc62 100644 --- a/tox/_config.py +++ b/tox/_config.py @@ -151,9 +151,11 @@ class Config(object): homedir = self.toxinidir # XXX good idea? return homedir + class VenvConfig: - def __init__(self, **kw): - self.__dict__.update(kw) + def __init__(self, envname, config): + self.envname = envname + self.config = config @property def envbindir(self): @@ -195,6 +197,8 @@ class VenvConfig: "python2.5 is not supported anymore, sorry") return info.executable + + testenvprefix = "testenv:" def get_homedir(): @@ -321,8 +325,7 @@ class parseini: return factors def _makeenvconfig(self, name, section, subs, config): - vc = VenvConfig(envname=name) - vc.config = config + vc = VenvConfig(config=config, envname=name) factors = set(name.split('-')) reader = IniReader(self._cfg, fallbacksections=["testenv"], factors=factors) @@ -381,6 +384,13 @@ class parseini: ixserver = None name = self._replace_forced_dep(name, config) vc.deps.append(DepConfig(name, ixserver)) + + platform = "" + for platform in reader.getlist(section, "platform"): + if platform.strip(): + break + vc.platform = platform + vc.distribute = reader.getbool(section, "distribute", False) vc.sitepackages = self.config.option.sitepackages or \ reader.getbool(section, "sitepackages", False) diff --git a/tox/_venv.py b/tox/_venv.py index 65eb73b..eff932d 100644 --- a/tox/_venv.py +++ b/tox/_venv.py @@ -1,5 +1,6 @@ from __future__ import with_statement import sys, os +import re import codecs import py import tox @@ -171,6 +172,9 @@ class VirtualEnv(object): def getsupportedinterpreter(self): return self.envconfig.getsupportedinterpreter() + def matching_platform(self): + return re.match(self.envconfig.platform, sys.platform) + def create(self, action=None): #if self.getcommandpath("activate").dirpath().check(): # return diff --git a/tox/interpreters.py b/tox/interpreters.py index 75318c5..241651f 100644 --- a/tox/interpreters.py +++ b/tox/interpreters.py @@ -90,11 +90,12 @@ class ExecFailed(Exception): class InterpreterInfo: runnable = True - def __init__(self, name, executable, version_info): + def __init__(self, name, executable, version_info, sysplatform): assert executable and version_info self.name = name self.executable = executable self.version_info = version_info + self.sysplatform = sysplatform def __str__(self): return "<executable at %s, version_info %s>" % ( @@ -163,7 +164,8 @@ else: def pyinfo(): import sys - return dict(version_info=tuple(sys.version_info)) + return dict(version_info=tuple(sys.version_info), + sysplatform=sys.platform) def sitepackagesdir(envdir): from distutils.sysconfig import get_python_lib |