1 new commit in tox:
https://bitbucket.org/hpk42/tox/commits/40797cc09b79/
changeset: 40797cc09b79
user: hpk42
date: 2013-02-19 14:43:50
summary: add -l to changelog, lukasz to contributors and some refinements
affected #: 6 files
diff -r fa9fb217e45e25cd688ce39ad05d6ce36f0a6d27 -r
40797cc09b794bc4052486d2f878b994407ecc59 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
1.4.3.dev
-----------------
+- introduce -l|--listenv option to list configured environments
+ (thanks Lukasz Balcerzak)
+
- fix downloadcache determination to work according to docs: Only
make pip use a download cache if PIP_DOWNLOAD_CACHE or a
downloadcache=PATH testenv setting is present. (The ENV setting
diff -r fa9fb217e45e25cd688ce39ad05d6ce36f0a6d27 -r
40797cc09b794bc4052486d2f878b994407ecc59 CONTRIBUTORS
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -5,3 +5,5 @@
Sridhar Ratnakumar
Chris Rose
Jannis Leidl
+Ronny Pfannschmidt
+Lukasz Balcerzak
diff -r fa9fb217e45e25cd688ce39ad05d6ce36f0a6d27 -r
40797cc09b794bc4052486d2f878b994407ecc59 setup.py
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@
def main():
version = sys.version_info[:2]
- install_requires = ['virtualenv==1.8.4', 'py>=1.4.9', ]
+ install_requires = ['virtualenv>=1.8.4', 'py>=1.4.9', ]
if version < (2, 7) or (3, 0) <= version <= (3, 1):
install_requires += ['argparse']
setup(
@@ -77,4 +77,4 @@
)
if __name__ == '__main__':
- main()
\ No newline at end of file
+ main()
diff -r fa9fb217e45e25cd688ce39ad05d6ce36f0a6d27 -r
40797cc09b794bc4052486d2f878b994407ecc59 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -786,19 +786,21 @@
[tox]
envlist=py26,py27,py33,pypy,docs
+ [testenv:notincluded]
+ changedir = whatever
+
[testenv:docs]
changedir = docs
''',
})
result = cmd.run("tox", "-l")
- stdout = result.stdout.str()
- assert stdout.splitlines() == [
- ' * py26',
- ' * py27',
- ' * py33',
- ' * pypy',
- ' * docs',
- ]
+ result.stdout.fnmatch_lines("""
+ *py26*
+ *py27*
+ *py33*
+ *pypy*
+ *docs*
+ """)
@py.test.mark.xfail("sys.version_info < (2,6)",
reason="virtualenv3 cannot be imported")
diff -r fa9fb217e45e25cd688ce39ad05d6ce36f0a6d27 -r
40797cc09b794bc4052486d2f878b994407ecc59 tox/_cmdline.py
--- a/tox/_cmdline.py
+++ b/tox/_cmdline.py
@@ -271,7 +271,7 @@
raise SystemExit(1)
if self.config.option.showconfig:
self.showconfig()
- elif self.config.option.list_envs:
+ elif self.config.option.listenvs:
self.showenvs()
else:
return self.subcommand_test()
@@ -419,7 +419,7 @@
def showenvs(self):
for env in self.config.envlist:
- self.report.line(" * %s" % env)
+ self.report.line("%s" % env)
def info_versions(self):
versions = ['tox-%s' % tox.__version__]
diff -r fa9fb217e45e25cd688ce39ad05d6ce36f0a6d27 -r
40797cc09b794bc4052486d2f878b994407ecc59 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -77,6 +77,8 @@
help="increase verbosity of reporting output.")
parser.add_argument("--showconfig", action="store_true", dest="showconfig",
help="show configuration information. ")
+ parser.add_argument("-l", "--listenvs", action="store_true",
+ dest="listenvs", help="show list of test environments")
parser.add_argument("-c", action="store", default="tox.ini",
dest="configfile",
help="use the specified config file name.")
@@ -98,8 +100,6 @@
help="force recreation of virtual environments")
parser.add_argument("args", nargs="*",
help="additional arguments available to command positional substition")
- parser.add_argument("-l", "--list", action="store_true", dest="list_envs",
- help="show default envlist")
return parser
class Config:
Repository URL: https://bitbucket.org/hpk42/tox/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pytest-commit
