From 42ede22f1e9bc98b9c29d25d95d9f3326022d205 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 17 Mar 2016 22:01:33 -0700 Subject: [PATCH] tox: run tahoe --version for buildbot, remove update_version Our setup.cfg ensures that 'setup.py update_version' happens early enough. And doing it from tox's commands= is too late anyways (because we aren't using Versioneer, so the _version.py file must be updated before tox installs a static copy into the virtualenv). The buildbot's main run-trial-with-tox command has been updated to scan for the 'tahoe --version' output and include the version string in the buildbot results. --- tox.ini | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index c8c9289df..2e42072ac 100644 --- a/tox.ini +++ b/tox.ini @@ -9,8 +9,7 @@ envlist = py27 [testenv] passenv = USERPROFILE HOMEDRIVE HOMEPATH commands = - # remove this after we move to Versioneer - python setup.py update_version + tahoe --version trial --rterrors {posargs:allmydata} [testenv:deprecations] @@ -18,12 +17,10 @@ passenv = USERPROFILE HOMEDRIVE HOMEPATH setenv = PYTHONWARNINGS=default::DeprecationWarnings commands = - python setup.py update_version trial --rterrors {posargs:allmydata} [testenv:checkmemory] commands = - python setup.py update_version rm -rf _test_memory python src/allmydata/test/check_memory.py upload python src/allmydata/test/check_memory.py upload-self