diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-26 16:31:31 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-26 16:31:31 +0200 |
| commit | df608fa858819f84924451b6a97559671303e8b0 (patch) | |
| tree | 931f0ae1302ff7d45e41a1aa4b6dbc96be174744 /QMTest/TestSCons.py | |
| parent | 9d8eae9f5bf53a4a80e29d7a3a1d2c7d7197688a (diff) | |
| parent | 78989ebb445af2c6462ae2bf05ffd588d76610e4 (diff) | |
Merge tag 'upstream/2.3.2'
Upstream version 2.3.2
Diffstat (limited to 'QMTest/TestSCons.py')
| -rw-r--r-- | QMTest/TestSCons.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index ea1cb77..24f285a 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -12,10 +12,10 @@ from those classes, as well as any overridden or additional methods or attributes defined in this subclass. """ -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation +# Copyright (c) 2001 - 2014 The SCons Foundation from __future__ import division -__revision__ = "QMTest/TestSCons.py 2014/03/02 14:18:15 garyo" +__revision__ = "QMTest/TestSCons.py 2014/07/05 09:42:21 garyo" import os import re @@ -34,7 +34,7 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '2.3.1' +default_version = '2.3.2' python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 7, 0) @@ -43,7 +43,7 @@ python_version_deprecated = (2, 7, 0) # line must remain "__ VERSION __" (without the spaces) so the built # version in build/QMTest/TestSCons.py contains the actual version # string of the packages that have been built. -SConsVersion = '2.3.1' +SConsVersion = '2.3.2' if SConsVersion == '__' + 'VERSION' + '__': SConsVersion = default_version @@ -150,7 +150,7 @@ def deprecated_python_version(version=sys.version_info): if deprecated_python_version(): msg = r""" scons: warning: Support for pre-2.7.0 Python version (%s) is deprecated. - If this will cause hardship, contact dev@scons.tigris.org. + If this will cause hardship, contact scons-dev@scons.org """ deprecated_python_expr = re_escape(msg % python_version_string()) + file_expr |