Mailman 3 February 2011 - Python-checkins

devinabox: No longer symlinking most pages since they don't transition well.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed 254b26b740ec to devinabox: http://hg.python.org/devinabox/rev/254b26b740ec changeset: 22:254b26b740ec user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 17:14:36 2011 -0800 summary: No longer symlinking most pages since they don't transition well. files: .hgignore diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -12,9 +12,6 @@ coverage_report build coverage.html -devguide.html -peps.html -python_docs.html README # Misc .*.swp -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Rename some files.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed c7bafcc52be7 to devinabox: http://hg.python.org/devinabox/rev/c7bafcc52be7 changeset: 24:c7bafcc52be7 user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 18:00:46 2011 -0800 summary: Rename some files. files: box.py make_a_box.py run_all_tests.py run_tests.py diff --git a/box.py b/make_a_box.py rename from box.py rename to make_a_box.py --- a/box.py +++ b/make_a_box.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -"""Python-Dev In a Box: (almost) everything you need to contribute to (C)Python -in under 700 MB. +"""Python-Dev In a Box: everything you need to contribute to Python in under +700 MB. This script will clone, checkout, download, or ask you to download everything you need to contribute to (C)Python's development short of a C compiler. It @@ -24,6 +24,15 @@ import urllib.parse import webbrowser import xmlrpc.client +import run_coverage + + +def rename(new_name): + """Decorator to rename an object that defines __name__.""" + def do_rename(ob): + ob.__name__ = new_name + return ob + return do_rename @contextlib.contextmanager @@ -73,13 +82,7 @@ def create(self): """Clone an Hg repository to 'directory'.""" - subprocess.check_call(['hg', '-q', 'clone', self.url, self.directory]) - - def update(self): - """Update the Hg clone in 'directory'.""" - with change_cwd(self.directory): - subprocess.check_call(['hg', '-q', 'pull']) - subprocess.check_call(['hg', '-q', 'update']) + subprocess.check_call(['hg', 'clone', self.url, self.directory]) class SvnProvider(Provider): @@ -93,14 +96,10 @@ def create(self): """Check out the svn repository to 'directory'.""" - subprocess.check_call(['svn', 'checkout', '-q', - self.url, self.directory]) + subprocess.check_call(['svn', 'checkout', self.url, self.directory]) - def update(self): - """Update the svn checkout in 'directory'.""" - subprocess.check_call(['svn', 'update', '-q', self.directory]) - +@rename('Visual C++ Express') class VisualCPPExpress(Provider): """The Web installer for Visual C++ Express""" @@ -121,9 +120,9 @@ pass self._prompt('download Visual C++ Express at {} and put in {}'.format( url, self.directory)) -VisualCPPExpress.__name__ = 'Visual C++ Express' +@rename('coverage.py') class CoveragePy(HgProvider): """Cloned repository of coverage.py (WARNING: building takes a while)""" @@ -132,8 +131,13 @@ directory = 'coveragepy' size = 0 # XXX coverage report for CPython - # XXX build runs coverage tests -CoveragePy.__name__ = 'coverage.py' + def build(self): + """Run coverage over CPython.""" + # XXX build python + # XXX run coverage + # XXX ``make distclean`` + # XXX generate html + run_coverage.main() class Mercurial(Provider): @@ -154,8 +158,9 @@ try: return release_data['download_url'] except KeyError: - # XXX - pass + print('Mercurial has changed how it releases software on PyPI; ' + 'please report this to bugs.python.org') + sys.exit(1) def _url_filename(self, url): """Find the filename from the URL.""" @@ -198,10 +203,9 @@ size = 20 def build(self): - """Build the PEPs and symlink PEP 0.""" + """Build the PEPs.""" with change_cwd(self.directory): subprocess.check_call(['make']) - os.symlink(os.path.join(self.directory, 'pep-0000.html'), 'peps.html') class Devguide(HgProvider): @@ -214,19 +218,19 @@ directory = 'devguide' def build(self): - """Build the devguide and symlink its index page.""" + """Build the devguide using Sphinx from CPython's docs.""" # Grab Sphinx from cpython/Doc/tools/ tools_directory = os.path.join(CPython.directory, 'Doc', 'tools') - orig_pythonpath = os.environ['PYTHONPATH'] + orig_pythonpath = os.environ.get('PYTHONPATH') os.environ['PYTHONPATH'] = os.path.abspath(tools_directory) try: with change_cwd(self.directory): subprocess.check_call(['make', 'html']) finally: - os.environ['PYTHONPATH'] = orig_pythonpath + if orig_pythonpath: + os.environ['PYTHONPATH'] = orig_pythonpath index_path = os.path.join(self.directory, '_build', 'html', 'index.html') - os.symlink(index_path, 'devguide.html') class CPython(HgProvider): @@ -235,13 +239,14 @@ url = 'http://hg.python.org/cpython' directory = 'cpython' - size = 325 # Only docs are built + size = 330 # Only docs are built def create(self): """Clone CPython and get the necessary tools to build the documentation.""" super().create() with change_cwd(os.path.join(self.directory, 'Doc')): + # XXX Windows? subprocess.check_call(['make', 'checkout']) def build(self): @@ -255,8 +260,6 @@ cmd = 'make' if sys.platform != 'win32' else 'make.bat' with change_cwd(os.path.join(self.directory, 'Doc')): subprocess.check_call([cmd, 'html']) - os.symlink(os.path.join(self.directory, 'Doc', 'html', 'index.html'), - 'python_docs.html') if __name__ == '__main__': @@ -276,7 +279,7 @@ desired_providers)) print('Getting {}'.format(getting)) total_size = sum(map(operator.attrgetter('size'), desired_providers)) - msg = 'The requested Box will be about {} MB. OK [y/n]? '.format(total_size) + msg = 'The requested Box will be about {} MB. OK? [y/n] '.format(total_size) response = input(msg) if response not in ('Y', 'y'): sys.exit(0) diff --git a/run_tests.py b/run_all_tests.py rename from run_tests.py rename to run_all_tests.py -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Drop the coverage running script; it's so slow only people making a Box should
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed 4314d3836974 to devinabox: http://hg.python.org/devinabox/rev/4314d3836974 changeset: 25:4314d3836974 user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 18:09:20 2011 -0800 summary: Drop the coverage running script; it's so slow only people making a Box should run it. files: run_coverage.py diff --git a/run_coverage.py b/run_coverage.py deleted file mode 100755 --- a/run_coverage.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python -"""Create a coverage report for CPython""" -import subprocess -import os -import sys -import build_cpython -import run_tests - - -def main(): - build_cpython.main() - executable = run_tests.executable() - if not executable: - print('no CPython executable found') - sys.exit(1) - - print('Running coverage ...') - subprocess.check_call([executable, 'coveragepy', 'run', '--pylib', - os.path.join('cpython', 'Lib', 'test', 'regrtest.py'), - ]) - print('Generating report ...') - subprocess.call([executable, 'coveragepy', 'html', '-i', '--omit', - '"*/test/*,*/tests/*"', '-d', 'coverage_report']) - print('Creating symlink ...') - os.symlink(os.path.join('coverage_report', 'index.html'), 'coverage.html') - - -if __name__ == '__main__': - main() -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Move run_coverage.py functionality into make_a_box.py.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed bd04d72f7257 to devinabox: http://hg.python.org/devinabox/rev/bd04d72f7257 changeset: 26:bd04d72f7257 user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 18:12:27 2011 -0800 summary: Move run_coverage.py functionality into make_a_box.py. files: make_a_box.py diff --git a/make_a_box.py b/make_a_box.py --- a/make_a_box.py +++ b/make_a_box.py @@ -24,7 +24,8 @@ import urllib.parse import webbrowser import xmlrpc.client -import run_coverage +import build_cpython +import run_all_tests def rename(new_name): @@ -133,11 +134,25 @@ def build(self): """Run coverage over CPython.""" - # XXX build python - # XXX run coverage - # XXX ``make distclean`` - # XXX generate html - run_coverage.main() + # Build Python + build_cpython.main() + # Run coverage + executable = run_all_tests.executable() + if not executable: + print('No CPython executable found') + sys.exit(1) + print('Running coverage ...') + regrest_path = os.path.join(CPython.directory, 'Lib', 'test', + 'regrtest.py') + subprocess.check_call([executable, self.directory, 'run', '--pylib', + regrtest_path]) + # ``make distclean`` as you don't want to distribute your own build + with change_cwd(CPython.directory): + subprocess.check_call(['make', 'distclean']) + # Generate the HTML report + print('Generating report ...') + subprocess.call([executable, 'coveragepy', 'html', '-i', '--omit', + '"*/test/*,*/tests/*"', '-d', 'coverage_report']) class Mercurial(Provider): -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Refactor run_coverage.py.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed 3efec08c0767 to devinabox: http://hg.python.org/devinabox/rev/3efec08c0767 changeset: 23:3efec08c0767 user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 18:00:35 2011 -0800 summary: Refactor run_coverage.py. files: run_coverage.py diff --git a/run_coverage.py b/run_coverage.py --- a/run_coverage.py +++ b/run_coverage.py @@ -6,19 +6,24 @@ import build_cpython import run_tests -build_cpython.main() -print(os.getcwd()) -executable = run_tests.executable() -if not executable: - print('no CPython executable found') - sys.exit(1) -print('Running coverage ...') -subprocess.check_call([executable, 'coveragepy', 'run', '--pylib', - os.path.join('cpython', 'Lib', 'test', 'regrtest.py'), - ]) -print('Generating report ...') -subprocess.call([executable, 'coveragepy', 'html', '-i', '--omit', - '"*/test/*,*/tests/*"', '-d', 'coverage_report']) -print('Creating symlink ...') -os.symlink(os.path.join('coverage_report', 'index.html'), 'coverage.html') +def main(): + build_cpython.main() + executable = run_tests.executable() + if not executable: + print('no CPython executable found') + sys.exit(1) + + print('Running coverage ...') + subprocess.check_call([executable, 'coveragepy', 'run', '--pylib', + os.path.join('cpython', 'Lib', 'test', 'regrtest.py'), + ]) + print('Generating report ...') + subprocess.call([executable, 'coveragepy', 'html', '-i', '--omit', + '"*/test/*,*/tests/*"', '-d', 'coverage_report']) + print('Creating symlink ...') + os.symlink(os.path.join('coverage_report', 'index.html'), 'coverage.html') + + +if __name__ == '__main__': + main() -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Measure the size of coverage.py + coverage report.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed 4dfc931cab95 to devinabox: http://hg.python.org/devinabox/rev/4dfc931cab95 changeset: 27:4dfc931cab95 user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 21:10:09 2011 -0800 summary: Measure the size of coverage.py + coverage report. files: make_a_box.py diff --git a/make_a_box.py b/make_a_box.py --- a/make_a_box.py +++ b/make_a_box.py @@ -130,7 +130,7 @@ url = 'https://brettsky@bitbucket.org/ned/coveragepy' directory = 'coveragepy' - size = 0 # XXX coverage report for CPython + size = 133 # Includes the coverage report def build(self): """Run coverage over CPython.""" -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Fix code from the shifting of executable().
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed cf80aee7de97 to devinabox: http://hg.python.org/devinabox/rev/cf80aee7de97 changeset: 29:cf80aee7de97 user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 21:16:31 2011 -0800 summary: Fix code from the shifting of executable(). files: build_cpython.py run_all_tests.py diff --git a/build_cpython.py b/build_cpython.py --- a/build_cpython.py +++ b/build_cpython.py @@ -42,7 +42,7 @@ subprocess.call(make_cmd) finally: os.chdir(cwd) - return executable + return executable() if __name__ == '__main__': if not main(): diff --git a/run_all_tests.py b/run_all_tests.py --- a/run_all_tests.py +++ b/run_all_tests.py @@ -7,7 +7,7 @@ def main(): - cmd = executable() + cmd = build_cpython.main() if cmd is None: print('CPython is not built') sys.exit(1) -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Properly clean up the 'build' directory from test runs.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed 921434ac1129 to devinabox: http://hg.python.org/devinabox/rev/921434ac1129 changeset: 31:921434ac1129 user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 21:34:10 2011 -0800 summary: Properly clean up the 'build' directory from test runs. files: make_a_box.py run_all_tests.py diff --git a/make_a_box.py b/make_a_box.py --- a/make_a_box.py +++ b/make_a_box.py @@ -143,10 +143,12 @@ print('Running coverage ...') regrtest_path = os.path.join(CPython.directory, 'Lib', 'test', 'regrtest.py') - subprocess.check_call([executable, self.directory, 'run', '--pylib', - regrtest_path]) - # Clean up from the test run - os.rmdir('build') + try: + subprocess.check_call([executable, self.directory, 'run', '--pylib', + regrtest_path]) + finally: + # Clean up from the test run + os.rmdir('build') # Generate the HTML report print('Generating report ...') subprocess.call([executable, 'coveragepy', 'html', '-i', '--omit', diff --git a/run_all_tests.py b/run_all_tests.py --- a/run_all_tests.py +++ b/run_all_tests.py @@ -11,9 +11,12 @@ if cmd is None: print('CPython is not built') sys.exit(1) - subprocess.call([cmd, '-W', 'default', '-bb', '-E', '-m', 'test', '-r', - '-w', '-u', 'all', '-j', - str(multiprocessing.cpu_count())]) + try: + subprocess.call([cmd, '-W', 'default', '-bb', '-E', '-m', 'test', '-r', + '-w', '-u', 'all', '-j', + str(multiprocessing.cpu_count())]) + finally: + os.rmdir('build') if __name__ == '__main__': -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Fix some issues with building coverage.py.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed 3fd40a5f2e0e to devinabox: http://hg.python.org/devinabox/rev/3fd40a5f2e0e changeset: 30:3fd40a5f2e0e user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 21:30:11 2011 -0800 summary: Fix some issues with building coverage.py. files: make_a_box.py diff --git a/make_a_box.py b/make_a_box.py --- a/make_a_box.py +++ b/make_a_box.py @@ -126,7 +126,7 @@ @rename('coverage.py') class CoveragePy(HgProvider): - """Cloned repository of coverage.py (WARNING: building takes a while)""" + """Clone of coverage.py (WARNING: building takes a while)""" url = 'https://brettsky@bitbucket.org/ned/coveragepy' directory = 'coveragepy' @@ -141,17 +141,20 @@ print('No CPython executable found') sys.exit(1) print('Running coverage ...') - regrest_path = os.path.join(CPython.directory, 'Lib', 'test', + regrtest_path = os.path.join(CPython.directory, 'Lib', 'test', 'regrtest.py') subprocess.check_call([executable, self.directory, 'run', '--pylib', regrtest_path]) - # ``make distclean`` as you don't want to distribute your own build - with change_cwd(CPython.directory): - subprocess.check_call(['make', 'distclean']) + # Clean up from the test run + os.rmdir('build') # Generate the HTML report print('Generating report ...') subprocess.call([executable, 'coveragepy', 'html', '-i', '--omit', '"*/test/*,*/tests/*"', '-d', 'coverage_report']) + # ``make distclean`` as you don't want to distribute your own build + print('Cleaning up the CPython build ...') + with change_cwd(CPython.directory): + subprocess.check_call(['make', 'distclean']) class Mercurial(Provider): -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Re-arrange executable discovery code.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed 817d54b6da18 to devinabox: http://hg.python.org/devinabox/rev/817d54b6da18 changeset: 28:817d54b6da18 user: Brett Cannon <brett(a)python.org> date: Sat Feb 26 21:13:55 2011 -0800 summary: Re-arrange executable discovery code. files: build_cpython.py make_a_box.py run_all_tests.py diff --git a/build_cpython.py b/build_cpython.py --- a/build_cpython.py +++ b/build_cpython.py @@ -5,6 +5,25 @@ import subprocess import sys + +def executable(): + directory = 'cpython' + cmd = os.path.join(directory, 'python') + # UNIX + if not os.path.isfile(cmd): + # OS X + cmd += '.exe' + if not os.path.isfile(cmd): + # 32-bit Windows + cmd = os.path.join(directory, 'PCBuild', 'python_d.exe') + if not os.path.isfile(cmd): + # 64-bit Windows + cmd = os.path.join(directory, 'PCBuild', 'AMD64', 'python_d.exe') + if not os.path.isfile(cmd): + return None + return os.path.abspath(cmd) + + def main(): if sys.platform == 'win32': print("See the devguide's Getting Set Up guide for building under " @@ -23,6 +42,9 @@ subprocess.call(make_cmd) finally: os.chdir(cwd) + return executable if __name__ == '__main__': - main() + if not main(): + print('No executable found') + sys.exit(1) diff --git a/make_a_box.py b/make_a_box.py --- a/make_a_box.py +++ b/make_a_box.py @@ -25,7 +25,6 @@ import webbrowser import xmlrpc.client import build_cpython -import run_all_tests def rename(new_name): @@ -123,6 +122,7 @@ url, self.directory)) +# XXX test @rename('coverage.py') class CoveragePy(HgProvider): @@ -135,9 +135,8 @@ def build(self): """Run coverage over CPython.""" # Build Python - build_cpython.main() + executable = build_cpython.main() # Run coverage - executable = run_all_tests.executable() if not executable: print('No CPython executable found') sys.exit(1) diff --git a/run_all_tests.py b/run_all_tests.py --- a/run_all_tests.py +++ b/run_all_tests.py @@ -1,29 +1,12 @@ #!/usr/bin/env python """Run CPython's test suite in the most rigorous way possible.""" import multiprocessing -import os import subprocess import sys +import build_cpython -def executable(): - directory = 'cpython' - cmd = os.path.join(directory, 'python') - # UNIX - if not os.path.isfile(cmd): - # OS X - cmd += '.exe' - if not os.path.isfile(cmd): - # 32-bit Windows - cmd = os.path.join(directory, 'PCBuild', 'python_d.exe') - if not os.path.isfile(cmd): - # 64-bit Windows - cmd = os.path.join(directory, 'PCBuild', 'AMD64', 'python_d.exe') - if not os.path.isfile(cmd): - return None - return os.path.abspath(cmd) - -if __name__ == '__main__': +def main(): cmd = executable() if cmd is None: print('CPython is not built') @@ -31,3 +14,7 @@ subprocess.call([cmd, '-W', 'default', '-bb', '-E', '-m', 'test', '-r', '-w', '-u', 'all', '-j', str(multiprocessing.cpu_count())]) + + +if __name__ == '__main__': + main() -- Repository URL: http://hg.python.org/devinabox

1 0