1 | 3 patches for repository http://tahoe-lafs.org/source/tahoe-lafs/trunk: |
---|
2 | |
---|
3 | Fri Jan 7 09:37:18 GMT Standard Time 2011 david-sarah@jacaranda.org |
---|
4 | * src/allmydata/scripts/debug.py: add 'tahoe debug trial' command. refs #1296 |
---|
5 | |
---|
6 | Sat Jan 8 11:40:27 GMT Standard Time 2011 david-sarah@jacaranda.org |
---|
7 | * Change 'setup.py test' and 'setup.py trial' to use 'bin/tahoe debug trial'. Remove setuptools_trial which is no longer used. refs #1296 |
---|
8 | |
---|
9 | Sat Jan 8 11:58:30 GMT Standard Time 2011 david-sarah@jacaranda.org |
---|
10 | * Remove a no-longer necessary hack from setup.py. refs #1296 |
---|
11 | |
---|
12 | New patches: |
---|
13 | |
---|
14 | [src/allmydata/scripts/debug.py: add 'tahoe debug trial' command. refs #1296 |
---|
15 | david-sarah@jacaranda.org**20110107093718 |
---|
16 | Ignore-this: 9228ffe655323aa486e88aded90983d7 |
---|
17 | ] { |
---|
18 | hunk ./src/allmydata/scripts/debug.py 4 |
---|
19 | |
---|
20 | # do not import any allmydata modules at this level. Do that from inside |
---|
21 | # individual functions instead. |
---|
22 | -import struct, time, os |
---|
23 | +import struct, time, os, sys |
---|
24 | from twisted.python import usage, failure |
---|
25 | from twisted.internet import defer |
---|
26 | hunk ./src/allmydata/scripts/debug.py 7 |
---|
27 | +from twisted.scripts import trial as twisted_trial |
---|
28 | |
---|
29 | |
---|
30 | class DumpOptions(usage.Options): |
---|
31 | hunk ./src/allmydata/scripts/debug.py 782 |
---|
32 | return code.interact() |
---|
33 | |
---|
34 | |
---|
35 | +class TrialOptions(twisted_trial.Options): |
---|
36 | + def getSynopsis(self): |
---|
37 | + return "Usage: tahoe debug trial [options] [[file|package|module|TestCase|testmethod]...]" |
---|
38 | + |
---|
39 | + def parseArgs(self, *args): |
---|
40 | + if not args: |
---|
41 | + args = ["allmydata.test"] |
---|
42 | + twisted_trial.Options.parseArgs(self, *args) |
---|
43 | + |
---|
44 | + def getUsage(self, width=None): |
---|
45 | + t = twisted_trial.Options.getUsage(self, width) |
---|
46 | + t += """ |
---|
47 | +The 'tahoe debug trial' command uses the correct imports for this instance of |
---|
48 | +Tahoe-LAFS. The default test suite is 'allmydata.test'. |
---|
49 | +""" |
---|
50 | + return t |
---|
51 | + |
---|
52 | + |
---|
53 | +def trial(config): |
---|
54 | + twisted_trial._initialDebugSetup(config) |
---|
55 | + trialRunner = twisted_trial._makeRunner(config) |
---|
56 | + suite = twisted_trial._getSuite(config) |
---|
57 | + |
---|
58 | + # run the tests |
---|
59 | + if config.get('until-failure'): |
---|
60 | + test_result = trialRunner.runUntilFailure(suite) |
---|
61 | + else: |
---|
62 | + test_result = trialRunner.run(suite) |
---|
63 | + |
---|
64 | + # write coverage data |
---|
65 | + if hasattr(config, 'tracer') and config.tracer: |
---|
66 | + sys.settrace(None) |
---|
67 | + results = config.tracer.results() |
---|
68 | + coverdir = os.path.join(config.get('temp-directory') or '_trial_temp', 'coverage') |
---|
69 | + results.write_results(show_missing=1, summary=False, coverdir=coverdir) |
---|
70 | + |
---|
71 | + if test_result.wasSuccessful(): |
---|
72 | + return 0 # success |
---|
73 | + else: |
---|
74 | + return 1 # failure |
---|
75 | + |
---|
76 | + |
---|
77 | class DebugCommand(usage.Options): |
---|
78 | subCommands = [ |
---|
79 | ["dump-share", None, DumpOptions, |
---|
80 | hunk ./src/allmydata/scripts/debug.py 833 |
---|
81 | ["catalog-shares", None, CatalogSharesOptions, "Describe all shares in node dirs."], |
---|
82 | ["corrupt-share", None, CorruptShareOptions, "Corrupt a share by flipping a bit."], |
---|
83 | ["repl", None, ReplOptions, "Open a Python interpreter."], |
---|
84 | + ["trial", None, TrialOptions, "Run Twisted Trial with the correct imports."], |
---|
85 | ] |
---|
86 | def postOptions(self): |
---|
87 | if not hasattr(self, 'subOptions'): |
---|
88 | hunk ./src/allmydata/scripts/debug.py 850 |
---|
89 | tahoe debug catalog-shares Describe all shares in node dirs. |
---|
90 | tahoe debug corrupt-share Corrupt a share by flipping a bit. |
---|
91 | tahoe debug repl Open a Python interpreter. |
---|
92 | + tahoe debug trial Run Twisted Trial with the correct imports. |
---|
93 | |
---|
94 | Please run e.g. 'tahoe debug dump-share --help' for more details on each |
---|
95 | subcommand. |
---|
96 | hunk ./src/allmydata/scripts/debug.py 857 |
---|
97 | """ |
---|
98 | return t |
---|
99 | |
---|
100 | + |
---|
101 | subDispatch = { |
---|
102 | "dump-share": dump_share, |
---|
103 | "dump-cap": dump_cap, |
---|
104 | hunk ./src/allmydata/scripts/debug.py 865 |
---|
105 | "catalog-shares": catalog_shares, |
---|
106 | "corrupt-share": corrupt_share, |
---|
107 | "repl": repl, |
---|
108 | + "trial": trial, |
---|
109 | } |
---|
110 | |
---|
111 | |
---|
112 | } |
---|
113 | [Change 'setup.py test' and 'setup.py trial' to use 'bin/tahoe debug trial'. Remove setuptools_trial which is no longer used. refs #1296 |
---|
114 | david-sarah@jacaranda.org**20110108114027 |
---|
115 | Ignore-this: c33134927e919ab3144f39bd762eb83a |
---|
116 | ] { |
---|
117 | hunk ./setuptools_trial-0.5.9.egg/share/doc/python-setuptools_trial/COPYING.SPL.txt 1 |
---|
118 | -Permission is hereby granted to any person obtaining a copy of this work to |
---|
119 | -deal in this work without restriction (including the rights to use, modify, |
---|
120 | -distribute, sublicense, and/or sell copies). |
---|
121 | rmfile ./setuptools_trial-0.5.9.egg/share/doc/python-setuptools_trial/COPYING.SPL.txt |
---|
122 | hunk ./setuptools_trial-0.5.9.egg/share/doc/python-setuptools_trial/README.txt 1 |
---|
123 | - |
---|
124 | -setuptools_trial Manual |
---|
125 | -======================= |
---|
126 | - |
---|
127 | -About |
---|
128 | ------ |
---|
129 | - |
---|
130 | -This is a plugin for setuptools that integrates Twisted trial. Once |
---|
131 | -installed, "python ./setup.py trial" will run the package's unit tests |
---|
132 | -using Twisted trial. The package can also optionally be configured so |
---|
133 | -that "python ./setup.py test" will use Twisted trial instead of pyunit |
---|
134 | -a.k.a. unittest. |
---|
135 | - |
---|
136 | - |
---|
137 | -Installation |
---|
138 | ------------- |
---|
139 | - |
---|
140 | -With easy_install: |
---|
141 | - |
---|
142 | - easy_install setuptools_trial |
---|
143 | - |
---|
144 | -Alternative manual installation: |
---|
145 | - |
---|
146 | - tar -zxvf setuptools_trial-X.Y.Z.tar.gz |
---|
147 | - cd setuptools_trial-X.Y.Z |
---|
148 | - python setup.py install |
---|
149 | - |
---|
150 | -Where X.Y.Z is a version number. |
---|
151 | - |
---|
152 | -Alternative to make a specific package use setuptools_trial without |
---|
153 | -installing setuptools_trial into the system: |
---|
154 | - |
---|
155 | - Put "setup_requires=['setuptools_trial']" in the call to setup() in |
---|
156 | - the package's setup.py file. |
---|
157 | - |
---|
158 | - |
---|
159 | -Usage |
---|
160 | ------ |
---|
161 | - |
---|
162 | -To use this plugin, you must first package your python module with |
---|
163 | -`setup.py` and use setuptools. The former is well documented in the |
---|
164 | -distutils manual: |
---|
165 | - |
---|
166 | - http://docs.python.org/dist/dist.html |
---|
167 | - |
---|
168 | -To use setuptools instead of distutils, just edit `setup.py` and |
---|
169 | -change |
---|
170 | - |
---|
171 | - from distutils.core import setup |
---|
172 | - |
---|
173 | -to |
---|
174 | - |
---|
175 | - from setuptools import setup |
---|
176 | - |
---|
177 | -Once setuptools_trial is installed (either into the system or just for |
---|
178 | -the current package), then "python ./setup.py trial" will run trial on |
---|
179 | -the package. |
---|
180 | - |
---|
181 | -You can then make "python ./setup.py test" use trial instead of pyunit |
---|
182 | -(unittest) by adding the following stanza to your project's setup.py: |
---|
183 | - |
---|
184 | - [aliases] |
---|
185 | - test = trial |
---|
186 | - |
---|
187 | -See also the output of "python ./setup.py trial --help" for usage |
---|
188 | -options. |
---|
189 | - |
---|
190 | - |
---|
191 | -References |
---|
192 | ----------- |
---|
193 | - |
---|
194 | -How to distribute Python modules with Distutils: |
---|
195 | - |
---|
196 | - http://docs.python.org/dist/dist.html |
---|
197 | - |
---|
198 | - |
---|
199 | -Setuptools complete manual: |
---|
200 | - |
---|
201 | - http://peak.telecommunity.com/DevCenter/setuptools |
---|
202 | - |
---|
203 | - |
---|
204 | -Thanks to Yannick Gingras for providing the prototype for this |
---|
205 | -README.txt. |
---|
206 | rmfile ./setuptools_trial-0.5.9.egg/share/doc/python-setuptools_trial/README.txt |
---|
207 | rmdir ./setuptools_trial-0.5.9.egg/share/doc/python-setuptools_trial |
---|
208 | rmdir ./setuptools_trial-0.5.9.egg/share/doc |
---|
209 | rmdir ./setuptools_trial-0.5.9.egg/share |
---|
210 | rmfile ./setuptools_trial-0.5.9.egg/setuptools_trial/__init__.py |
---|
211 | hunk ./setuptools_trial-0.5.9.egg/setuptools_trial/_version.py 1 |
---|
212 | - |
---|
213 | -# This is the version of this tree, as created by setup.py darcsver from the Darcs patch |
---|
214 | -# information: the main version number is taken from the most recent release |
---|
215 | -# tag. If some patches have been added since the last release, this will have a |
---|
216 | -# -NN "build number" suffix, or else a -rNN "revision number" suffix. Please see |
---|
217 | -# pyutil.version_class for a description of what the different fields mean. |
---|
218 | - |
---|
219 | -verstr = "0.5.9" |
---|
220 | -try: |
---|
221 | - from pyutil.version_class import Version as pyutil_Version |
---|
222 | - __version__ = pyutil_Version(verstr) |
---|
223 | -except (ImportError, ValueError): |
---|
224 | - # Maybe there is no pyutil installed, or this may be an older version of |
---|
225 | - # pyutil.version_class which does not support SVN-alike revision numbers. |
---|
226 | - from distutils.version import LooseVersion as distutils_Version |
---|
227 | - __version__ = distutils_Version(verstr) |
---|
228 | rmfile ./setuptools_trial-0.5.9.egg/setuptools_trial/_version.py |
---|
229 | hunk ./setuptools_trial-0.5.9.egg/setuptools_trial/setuptools_trial.py 1 |
---|
230 | -import sys |
---|
231 | - |
---|
232 | -from setuptools.command import test |
---|
233 | - |
---|
234 | - |
---|
235 | -class TrialTest(test.test): |
---|
236 | - """ |
---|
237 | - Twisted Trial setuptools command |
---|
238 | - """ |
---|
239 | - |
---|
240 | - user_options = test.test.user_options + [ |
---|
241 | - ('rterrors', 'e', "Realtime errors: print out tracebacks as soon as they occur."), |
---|
242 | - ('debug-stacktraces', 'B', "Report Deferred creation and callback stack traces."), |
---|
243 | - ('coverage','c', "Report coverage data."), |
---|
244 | - ('reactor=','r', "which reactor to use"), |
---|
245 | - ('reporter=', None, "Customize Trial's output with a Reporter plugin."), |
---|
246 | - ('until-failure','u', "Repeat test until it fails."), |
---|
247 | - ] |
---|
248 | - |
---|
249 | - boolean_options = ['coverage', 'debug-stacktraces', 'rterrors'] |
---|
250 | - |
---|
251 | - def initialize_options(self): |
---|
252 | - test.test.initialize_options(self) |
---|
253 | - self.coverage = None |
---|
254 | - self.debug_stacktraces = None |
---|
255 | - self.reactor = None |
---|
256 | - self.reporter = None |
---|
257 | - self.rterrors = None |
---|
258 | - self.until_failure = None |
---|
259 | - |
---|
260 | - def finalize_options(self): |
---|
261 | - if self.test_suite is None: |
---|
262 | - if self.test_module is None: |
---|
263 | - self.test_suite = self.distribution.test_suite |
---|
264 | - else: |
---|
265 | - self.test_suite = self.test_module |
---|
266 | - elif self.test_module: |
---|
267 | - raise DistutilsOptionError( |
---|
268 | - "You may specify a module or a suite, but not both" |
---|
269 | - ) |
---|
270 | - |
---|
271 | - self.test_args = self.test_suite |
---|
272 | - |
---|
273 | - def run_tests(self): |
---|
274 | - # We do the import from Twisted inside the function instead of the top |
---|
275 | - # of the file because since Twisted is a setup_requires, we can't |
---|
276 | - # assume that Twisted will be installed on the user's system prior |
---|
277 | - # to using Tahoe, so if we don't do the import here, then importing |
---|
278 | - # from this plugin will fail. |
---|
279 | - from twisted.scripts import trial |
---|
280 | - |
---|
281 | - # Handle parsing the trial options passed through the setuptools |
---|
282 | - # trial command. |
---|
283 | - cmd_options = [] |
---|
284 | - if self.reactor is not None: |
---|
285 | - cmd_options.extend(['--reactor', self.reactor]) |
---|
286 | - else: |
---|
287 | - # Cygwin requires the poll reactor to work at all. Linux requires the poll reactor |
---|
288 | - # to avoid twisted bug #3218. In general, the poll reactor is better than the |
---|
289 | - # select reactor, but it is not available on all platforms. According to exarkun on |
---|
290 | - # IRC, it is available but buggy on some versions of Mac OS X, so just because you |
---|
291 | - # can install it doesn't mean we want to use it on every platform. |
---|
292 | - # Unfortunately this leads to this error with some combinations of tools: |
---|
293 | - # twisted.python.usage.UsageError: The specified reactor cannot be used, failed with error: reactor already installed. |
---|
294 | - if sys.platform in ("cygwin"): |
---|
295 | - cmd_options.extend(['--reactor', 'poll']) |
---|
296 | - if self.reporter is not None: |
---|
297 | - cmd_options.extend(['--reporter', self.reporter]) |
---|
298 | - if self.rterrors is not None: |
---|
299 | - cmd_options.append('--rterrors') |
---|
300 | - if self.debug_stacktraces is not None: |
---|
301 | - cmd_options.append('--debug-stacktraces') |
---|
302 | - config = trial.Options() |
---|
303 | - config.parseOptions(cmd_options) |
---|
304 | - |
---|
305 | - |
---|
306 | - args = self.test_args |
---|
307 | - if type(args) == str: |
---|
308 | - args = [args,] |
---|
309 | - |
---|
310 | - config['tests'] = args |
---|
311 | - |
---|
312 | - if self.coverage: |
---|
313 | - config.opt_coverage() |
---|
314 | - |
---|
315 | - trial._initialDebugSetup(config) |
---|
316 | - trialRunner = trial._makeRunner(config) |
---|
317 | - suite = trial._getSuite(config) |
---|
318 | - |
---|
319 | - # run the tests |
---|
320 | - if self.until_failure: |
---|
321 | - test_result = trialRunner.runUntilFailure(suite) |
---|
322 | - else: |
---|
323 | - test_result = trialRunner.run(suite) |
---|
324 | - |
---|
325 | - # write coverage data |
---|
326 | - if config.tracer: |
---|
327 | - sys.settrace(None) |
---|
328 | - results = config.tracer.results() |
---|
329 | - results.write_results(show_missing=1, summary=False, |
---|
330 | - coverdir=config.coverdir) |
---|
331 | - |
---|
332 | - if test_result.wasSuccessful(): |
---|
333 | - sys.exit(0) # success |
---|
334 | - else: |
---|
335 | - sys.exit(1) # failure |
---|
336 | rmfile ./setuptools_trial-0.5.9.egg/setuptools_trial/setuptools_trial.py |
---|
337 | rmdir ./setuptools_trial-0.5.9.egg/setuptools_trial |
---|
338 | hunk ./setuptools_trial-0.5.9.egg/EGG-INFO/PKG-INFO 1 |
---|
339 | -Metadata-Version: 1.0 |
---|
340 | -Name: setuptools-trial |
---|
341 | -Version: 0.5.9 |
---|
342 | -Summary: Setuptools plugin that makes unit tests execute with trial instead of pyunit. |
---|
343 | -Home-page: http://allmydata.org/trac/setuptools_trial |
---|
344 | -Author: Chris Galvan |
---|
345 | -Author-email: cgalvan@enthought.com |
---|
346 | -License: BSD |
---|
347 | -Description: UNKNOWN |
---|
348 | -Keywords: distutils setuptools trial setuptools_plugin |
---|
349 | -Platform: UNKNOWN |
---|
350 | -Classifier: Development Status :: 4 - Beta |
---|
351 | -Classifier: License :: OSI Approved :: BSD License |
---|
352 | -Classifier: License :: DFSG approved |
---|
353 | -Classifier: Intended Audience :: Developers |
---|
354 | -Classifier: Operating System :: OS Independent |
---|
355 | -Classifier: Natural Language :: English |
---|
356 | -Classifier: Programming Language :: Python |
---|
357 | -Classifier: Programming Language :: Python :: 2 |
---|
358 | -Classifier: Programming Language :: Python :: 2.4 |
---|
359 | -Classifier: Programming Language :: Python :: 2.5 |
---|
360 | -Classifier: Programming Language :: Python :: 2.6 |
---|
361 | -Classifier: Topic :: Utilities |
---|
362 | -Classifier: Topic :: Software Development :: Libraries |
---|
363 | -Classifier: Framework :: Setuptools Plugin |
---|
364 | rmfile ./setuptools_trial-0.5.9.egg/EGG-INFO/PKG-INFO |
---|
365 | hunk ./setuptools_trial-0.5.9.egg/EGG-INFO/SOURCES.txt 2 |
---|
366 | |
---|
367 | -COPYING.SPL.txt |
---|
368 | -README.txt |
---|
369 | -setup.py |
---|
370 | -setuptools_darcs-1.2.11-py2.6.egg/EGG-INFO/PKG-INFO |
---|
371 | -setuptools_darcs-1.2.11-py2.6.egg/EGG-INFO/SOURCES.txt |
---|
372 | -setuptools_darcs-1.2.11-py2.6.egg/EGG-INFO/dependency_links.txt |
---|
373 | -setuptools_darcs-1.2.11-py2.6.egg/EGG-INFO/entry_points.txt |
---|
374 | -setuptools_darcs-1.2.11-py2.6.egg/EGG-INFO/not-zip-safe |
---|
375 | -setuptools_darcs-1.2.11-py2.6.egg/EGG-INFO/top_level.txt |
---|
376 | -setuptools_darcs-1.2.11-py2.6.egg/setuptools_darcs/__init__.py |
---|
377 | -setuptools_darcs-1.2.11-py2.6.egg/setuptools_darcs/_version.py |
---|
378 | -setuptools_darcs-1.2.11-py2.6.egg/setuptools_darcs/setuptools_darcs.py |
---|
379 | -setuptools_darcs-1.2.11-py2.6.egg/share/doc/python-setuptools_darcs/README.txt |
---|
380 | -setuptools_trial/__init__.py |
---|
381 | -setuptools_trial/_version.py |
---|
382 | -setuptools_trial/setuptools_trial.py |
---|
383 | -setuptools_trial.egg-info/PKG-INFO |
---|
384 | -setuptools_trial.egg-info/SOURCES.txt |
---|
385 | -setuptools_trial.egg-info/dependency_links.txt |
---|
386 | -setuptools_trial.egg-info/entry_points.txt |
---|
387 | -setuptools_trial.egg-info/not-zip-safe |
---|
388 | -setuptools_trial.egg-info/requires.txt |
---|
389 | -setuptools_trial.egg-info/top_level.txt |
---|
390 | rmfile ./setuptools_trial-0.5.9.egg/EGG-INFO/SOURCES.txt |
---|
391 | hunk ./setuptools_trial-0.5.9.egg/EGG-INFO/dependency_links.txt 1 |
---|
392 | - |
---|
393 | rmfile ./setuptools_trial-0.5.9.egg/EGG-INFO/dependency_links.txt |
---|
394 | hunk ./setuptools_trial-0.5.9.egg/EGG-INFO/entry_points.txt 1 |
---|
395 | -[distutils.commands] |
---|
396 | -trial = setuptools_trial.setuptools_trial:TrialTest |
---|
397 | - |
---|
398 | rmfile ./setuptools_trial-0.5.9.egg/EGG-INFO/entry_points.txt |
---|
399 | hunk ./setuptools_trial-0.5.9.egg/EGG-INFO/not-zip-safe 1 |
---|
400 | - |
---|
401 | rmfile ./setuptools_trial-0.5.9.egg/EGG-INFO/not-zip-safe |
---|
402 | hunk ./setuptools_trial-0.5.9.egg/EGG-INFO/requires.txt 1 |
---|
403 | -Twisted >= 2.4.0 |
---|
404 | + |
---|
405 | rmfile ./setuptools_trial-0.5.9.egg/EGG-INFO/requires.txt |
---|
406 | hunk ./setuptools_trial-0.5.9.egg/EGG-INFO/top_level.txt 1 |
---|
407 | -setuptools_trial |
---|
408 | rmfile ./setuptools_trial-0.5.9.egg/EGG-INFO/top_level.txt |
---|
409 | rmdir ./setuptools_trial-0.5.9.egg/EGG-INFO |
---|
410 | rmdir ./setuptools_trial-0.5.9.egg |
---|
411 | hunk ./setup.py 247 |
---|
412 | import test_mac_diskimage |
---|
413 | return test_mac_diskimage.test_mac_diskimage('Allmydata', version=self.distribution.metadata.version) |
---|
414 | |
---|
415 | +class Trial(Command): |
---|
416 | + user_options = [ ("rterrors", "e", "Print out tracebacks as soon as they occur."), |
---|
417 | + ("suite=", "s", "Specify the test suite."), |
---|
418 | + ] |
---|
419 | + def initialize_options(self): |
---|
420 | + self.rterrors = False |
---|
421 | + self.suite = "allmydata.test" |
---|
422 | + def finalize_options(self): |
---|
423 | + pass |
---|
424 | + def run(self): |
---|
425 | + args = [sys.executable, os.path.join('bin', 'tahoe.pyscript'), 'debug', 'trial'] |
---|
426 | + if self.rterrors: |
---|
427 | + args += ['--rterrors'] |
---|
428 | + if self.suite: |
---|
429 | + args += [self.suite] |
---|
430 | + rc = subprocess.call(args) |
---|
431 | + sys.exit(rc) |
---|
432 | + |
---|
433 | class CheckAutoDeps(Command): |
---|
434 | user_options = [] |
---|
435 | def initialize_options(self): |
---|
436 | hunk ./setup.py 286 |
---|
437 | def run(self): |
---|
438 | bin_tahoe_template = os.path.join("bin", "tahoe-script.template") |
---|
439 | |
---|
440 | - if sys.platform == 'win32': |
---|
441 | - # 'tahoe' script is needed for cygwin |
---|
442 | - script_names = ["tahoe.pyscript", "tahoe"] |
---|
443 | - else: |
---|
444 | - script_names = ["tahoe"] |
---|
445 | + # tahoe.pyscript is really only necessary for Windows, but we also |
---|
446 | + # create it on Unix for consistency. |
---|
447 | + script_names = ["tahoe.pyscript", "tahoe"] |
---|
448 | |
---|
449 | # Create the tahoe script file under the 'bin' directory. This |
---|
450 | # file is exactly the same as the 'tahoe-script.template' script |
---|
451 | hunk ./setup.py 386 |
---|
452 | "run_with_pythonpath": RunWithPythonPath, |
---|
453 | "check_auto_deps": CheckAutoDeps, |
---|
454 | "test_mac_diskimage": TestMacDiskImage, |
---|
455 | + "trial": Trial, |
---|
456 | "make_executable": MakeExecutable, |
---|
457 | "sdist": MySdist, |
---|
458 | }, |
---|
459 | } |
---|
460 | [Remove a no-longer necessary hack from setup.py. refs #1296 |
---|
461 | david-sarah@jacaranda.org**20110108115830 |
---|
462 | Ignore-this: ea3c707df6185225d48fa4b63f2f5179 |
---|
463 | ] hunk ./setup.py 67 |
---|
464 | install_requires = adglobals['install_requires'] |
---|
465 | |
---|
466 | __requires__ = install_requires[:] |
---|
467 | -if 'trial' in sys.argv or 'test' in sys.argv: |
---|
468 | - if version is not None: |
---|
469 | - __requires__.append(APPNAME + '==' + version) |
---|
470 | - else: |
---|
471 | - __requires__.append(APPNAME) |
---|
472 | |
---|
473 | egg = os.path.realpath(glob.glob('setuptools-*.egg')[0]) |
---|
474 | sys.path.insert(0, egg) |
---|
475 | |
---|
476 | Context: |
---|
477 | |
---|
478 | [docs: update performance.rst to describe the difference between already-uploaded and not-already-uploaded, to parameterize segment size, and to use "~A" to mean "approximately A" |
---|
479 | zooko@zooko.com**20110104065455 |
---|
480 | Ignore-this: 8df0d79a062ee19854c0211bd202f606 |
---|
481 | ] |
---|
482 | [bin/tahoe-script.template: On non-Windows, invoke support/bin/tahoe directly as a script (rather than via python), so that 'top' for example will show it as 'tahoe'. On Windows, simplify some code that set argv[0], which is never used. fixes #174 |
---|
483 | david-sarah@jacaranda.org**20101127232650 |
---|
484 | Ignore-this: 42a86f3eecfdc1ea7b76a7cc68626898 |
---|
485 | ] |
---|
486 | [test_runner: avoid unnecessary use of non-ASCII. |
---|
487 | david-sarah@jacaranda.org**20110101100101 |
---|
488 | Ignore-this: e2ff40dce6bb3b021306f2913d4e75df |
---|
489 | ] |
---|
490 | [docs/quickstart.html: fix redundant, badly nested tag. refs #1284 |
---|
491 | david-sarah@jacaranda.org**20110102175159 |
---|
492 | Ignore-this: 2ae9cc0b47d2e87b9eb64a0f517c4eef |
---|
493 | ] |
---|
494 | [docs/quickstart.html: information about 'troublesome dependencies' and 'verified systems' de-emphasized by smaller italic font. Re-wrap so that the HTML source is readable (just about) as text. Minor wording tweaks. Improve organization by adding 'Windows Caveats' subsection. fixes #1284 |
---|
495 | david-sarah@jacaranda.org**20110102174212 |
---|
496 | Ignore-this: e9dc57983974478200856651c5318fee |
---|
497 | ] |
---|
498 | [NEWS: update entry for removal of Mac and Windows apps. refs #1282 |
---|
499 | david-sarah@jacaranda.org**20101226042245 |
---|
500 | Ignore-this: c8099bc6e8235718d042c9a13c1e2425 |
---|
501 | ] |
---|
502 | [Move dependency imports from windows/depends.py (which has gone away) into src/allmydata/windows/tahoesvc.py. Also fix a pyflakes warning, and change the service display name from 'Allmydata Tahoe Node' to 'Tahoe-LAFS node'. refs #1282 |
---|
503 | david-sarah@jacaranda.org**20101226042100 |
---|
504 | Ignore-this: ee45f324934e1251380206dbee6346d0 |
---|
505 | ] |
---|
506 | [Remove unmaintained Windows GUI app, except for windows/tahoesvc.py which is moved to src/allmydata/windows. refs #1282 |
---|
507 | david-sarah@jacaranda.org**20101226040237 |
---|
508 | Ignore-this: cae37b6622a7dd5940acc7d3e6a98b90 |
---|
509 | ] |
---|
510 | [Remove the Makefile targets relating to the Mac GUI app. refs #1282 |
---|
511 | david-sarah@jacaranda.org**20101226025859 |
---|
512 | Ignore-this: 75303be783974b41138744ec62b07965 |
---|
513 | ] |
---|
514 | [NEWS: remove unmaintained Mac GUI app. refs #1282 |
---|
515 | david-sarah@jacaranda.org**20101226020858 |
---|
516 | Ignore-this: 40474a07f4a550b48563d35350be7ab5 |
---|
517 | ] |
---|
518 | [Remove unmaintained Mac GUI app. fixes #1282 |
---|
519 | david-sarah@jacaranda.org**20101226020508 |
---|
520 | Ignore-this: b3613bf1abfd284d542bf7c753ec557a |
---|
521 | ] |
---|
522 | [Remove src/allmydata/util/find_exe.py which is no longer used. fixes #1150 |
---|
523 | david-sarah@jacaranda.org**20101226023206 |
---|
524 | Ignore-this: 7436c9b53bf210aed34a1a973cd9cace |
---|
525 | ] |
---|
526 | [status_web_pages_review.darcs.patch |
---|
527 | freestorm77@gmail.com**20110102034214 |
---|
528 | Ignore-this: 29f1ecb36177f10f3f846b3d56b313b2 |
---|
529 | |
---|
530 | I make some changes on status web pages |
---|
531 | |
---|
532 | status.xhtml: |
---|
533 | - Delete unused webform_css link |
---|
534 | - Align tables on the left |
---|
535 | |
---|
536 | tahoe-css: |
---|
537 | - Do some minor changes on code synthax |
---|
538 | - changes table.status-download-events style to look like other tables |
---|
539 | |
---|
540 | status.py: |
---|
541 | - Align table on the left |
---|
542 | - Changes table header |
---|
543 | - Add heading tags |
---|
544 | - Modify google api graph: add image border, calculate height to feet data |
---|
545 | |
---|
546 | signed-off-by: zooko@zooko.com |
---|
547 | fixes #1219 |
---|
548 | ] |
---|
549 | [test_storage.py: fix a pyflakes unused import warning. |
---|
550 | david-sarah@jacaranda.org**20101231220756 |
---|
551 | Ignore-this: df08231540cb7dff9d2b038e47ab30ee |
---|
552 | ] |
---|
553 | [test_storage.py: leave at least 512 MiB free when running test_large_share. refs #1195 |
---|
554 | david-sarah@jacaranda.org**20101231203215 |
---|
555 | Ignore-this: b2144c0341c3452b5d4ba219e284ea0e |
---|
556 | ] |
---|
557 | [storage: use fileutil's version of get_disk_stats() and get_available_space(), use mockery/fakery in tests, enable large share test on platforms with sparse files and if > 4 GiB of disk space is currently available |
---|
558 | zooko@zooko.com**20100910173629 |
---|
559 | Ignore-this: 1304f1164c661de6d5304f993eb9b27b |
---|
560 | ] |
---|
561 | [fileutil: copy in the get_disk_stats() and get_available_space() functions from storage/server.py |
---|
562 | zooko@zooko.com**20100910173520 |
---|
563 | Ignore-this: 8b15569715f710f4fc5092f7ca109253 |
---|
564 | ] |
---|
565 | [Update foolscap version requirement to 0.6.0, to address http://foolscap.lothar.com/trac/ticket/167 |
---|
566 | david-sarah@jacaranda.org**20101231060039 |
---|
567 | Ignore-this: 98d2b8086a1a500b9f4565bca5a3810 |
---|
568 | ] |
---|
569 | [docs/webapi.rst: typos. |
---|
570 | david-sarah@jacaranda.org**20101230034422 |
---|
571 | Ignore-this: d1f5166d72cc711f7e0d9981eac9105e |
---|
572 | ] |
---|
573 | [docs/webapi.rst: capitalization, formatting of section on URL character encoding, and a correction about Internet Explorer. |
---|
574 | david-sarah@jacaranda.org**20101230034049 |
---|
575 | Ignore-this: b3b9819d2fb264b4cdc5c8afd4e8c48d |
---|
576 | ] |
---|
577 | [docs: corrections and clarifications. |
---|
578 | david-sarah@jacaranda.org**20101227051056 |
---|
579 | Ignore-this: e33202858c7644c58f3f924b164294b6 |
---|
580 | ] |
---|
581 | [docs: more formatting cleanups and corrections. Spell webapi and wapi as web-API. |
---|
582 | david-sarah@jacaranda.org**20101227050533 |
---|
583 | Ignore-this: 18b23cbfb780df585d8a722a1ec63e94 |
---|
584 | ] |
---|
585 | [docs/debian.rst: bring description of building dependencies from source up-to-date, and change hostname from allmydata.com to tahoe-lafs.org. |
---|
586 | david-sarah@jacaranda.org**20101212222912 |
---|
587 | Ignore-this: f38462afc88b4475195610385a28391c |
---|
588 | ] |
---|
589 | [docs/architecture.rst: correct rst syntax. |
---|
590 | david-sarah@jacaranda.org**20101212202003 |
---|
591 | Ignore-this: 3fbe12feb28bec6f1c63aedbc79aad21 |
---|
592 | ] |
---|
593 | [docs/architecture.rst: formatting. |
---|
594 | david-sarah@jacaranda.org**20101212201719 |
---|
595 | Ignore-this: 305fa5dfc2939355eaf6d0d2161eb1ff |
---|
596 | ] |
---|
597 | [docs: linkification, wording improvements. |
---|
598 | david-sarah@jacaranda.org**20101212201234 |
---|
599 | Ignore-this: 4e67287f527a8bc728cfbd93255d2aae |
---|
600 | ] |
---|
601 | [docs: formatting. |
---|
602 | david-sarah@jacaranda.org**20101212201115 |
---|
603 | Ignore-this: 2e0ed394ac7726651d3a4f2c4b0d3798 |
---|
604 | ] |
---|
605 | [docs/configuration.rst: more formatting tweaks; which -> that. |
---|
606 | david-sarah@jacaranda.org**20101212195522 |
---|
607 | Ignore-this: a7becb7021854ca5a90edd892b36fdd7 |
---|
608 | ] |
---|
609 | [docs/configuration.rst: more changes to formatting. |
---|
610 | david-sarah@jacaranda.org**20101212194511 |
---|
611 | Ignore-this: 491aac33e5f5268d224359f1447d10be |
---|
612 | ] |
---|
613 | [docs/configuration.rst: changes to formatting (mainly putting commands and filenames in monospace). |
---|
614 | david-sarah@jacaranda.org**20101212181828 |
---|
615 | Ignore-this: 8a1480e2d5f43bee678476424615b50f |
---|
616 | ] |
---|
617 | [scripts/backupdb.py: more accurate comment about path field. |
---|
618 | david-sarah@jacaranda.org**20101212170320 |
---|
619 | Ignore-this: 50e47a2228a85207bbcd188a78a0d4e6 |
---|
620 | ] |
---|
621 | [scripts/cli.py: fix missing 'put' in usage example for 'tahoe put'. |
---|
622 | david-sarah@jacaranda.org**20101212170207 |
---|
623 | Ignore-this: 2cbadf066fff611fc03d3c0ff97ce6ec |
---|
624 | ] |
---|
625 | [docs/frontends/CLI.rst: changes to formatting (mainly putting commands and filenames in monospace), and to command syntax to reflect that DIRCAP/... is accepted. Clarify the syntax of 'tahoe put' and other minor corrections. Tahoe -> Tahoe-LAFS. |
---|
626 | david-sarah@jacaranda.org**20101212165800 |
---|
627 | Ignore-this: a123ef6b564aa8624d1e79c97068ea12 |
---|
628 | ] |
---|
629 | [docs/frontends/CLI.rst: Unicode arguments to 'tahoe' work on Windows as of v1.7.1. |
---|
630 | david-sarah@jacaranda.org**20101212063740 |
---|
631 | Ignore-this: 3977a99dfa86ac33a44171deaf43aaab |
---|
632 | ] |
---|
633 | [docs/known_issues.rst: fix title and linkify another URL. refs #1225 |
---|
634 | david-sarah@jacaranda.org**20101212062817 |
---|
635 | Ignore-this: cc91287f7fb51c23440b3d2fe79c449c |
---|
636 | ] |
---|
637 | [docs/known_issues.rst: fix an external link. refs #1225 |
---|
638 | david-sarah@jacaranda.org**20101212062435 |
---|
639 | Ignore-this: b8cbf12f353131756c358965c48060ec |
---|
640 | ] |
---|
641 | [Fix a link from uri.rst to dirnodes.rst. refs #1225 |
---|
642 | david-sarah@jacaranda.org**20101212054502 |
---|
643 | Ignore-this: af6205299f5c9a33229cab259c00f9d5 |
---|
644 | ] |
---|
645 | [Fix a link from webapi.rst to FTP-and-SFTP.rst. refs #1225 |
---|
646 | david-sarah@jacaranda.org**20101212053435 |
---|
647 | Ignore-this: 2b9f88678c3447ea860d6b61e8799858 |
---|
648 | ] |
---|
649 | [More specific hyperlink to architecture.rst from helper.rst. refs #1225 |
---|
650 | david-sarah@jacaranda.org**20101212052607 |
---|
651 | Ignore-this: 50424c768fca481252fabf58424852dc |
---|
652 | ] |
---|
653 | [Update hyperlinks between docs, and linkify some external references. refs #1225 |
---|
654 | david-sarah@jacaranda.org**20101212051459 |
---|
655 | Ignore-this: cd43a4c3d3de1f832abfa88d5fc4ace1 |
---|
656 | ] |
---|
657 | [docs/specifications/dirnodes.rst: fix references to mutable.rst. refs #1225 |
---|
658 | david-sarah@jacaranda.org**20101212012720 |
---|
659 | Ignore-this: 6819b4b4e06e947ee48b365e840db37d |
---|
660 | ] |
---|
661 | [docs/specifications/mutable.rst: correct the magic string for v1 mutable containers. refs #1225 |
---|
662 | david-sarah@jacaranda.org**20101212011400 |
---|
663 | Ignore-this: 99a5fcdd40cef83dbb08f323f6cdaaca |
---|
664 | ] |
---|
665 | [Move .txt files in docs/frontends and docs/specifications to .rst. refs #1225 |
---|
666 | david-sarah@jacaranda.org**20101212010251 |
---|
667 | Ignore-this: 8796d35d928370f7dc6ad2dafdc1c0fe |
---|
668 | ] |
---|
669 | [Convert docs/frontends and docs/specifications to reStructuredText format (not including file moves). |
---|
670 | david-sarah@jacaranda.org**20101212004632 |
---|
671 | Ignore-this: e3ceb2d832d73875abe48624ddbb5622 |
---|
672 | ] |
---|
673 | [scripts/cli.py: remove the disclaimer in the help for 'tahoe cp' that it does not handle non-ASCII filenames well. (At least, we intend to handle them.) |
---|
674 | david-sarah@jacaranda.org**20101130002145 |
---|
675 | Ignore-this: 94c003efaa20b9eb4a83503d79844ca |
---|
676 | ] |
---|
677 | [relnotes.txt: fifth -> sixth labor-of-love release |
---|
678 | zooko@zooko.com**20101129045647 |
---|
679 | Ignore-this: 21c245015268b38916e3a138d256c09d |
---|
680 | ] |
---|
681 | [Makefile: BB_BRANCH is set to the empty string for trunk, not the string 'trunk'. |
---|
682 | david-sarah@jacaranda.org**20101128233512 |
---|
683 | Ignore-this: 5a7ef8eb10475636d21b91e25b56c369 |
---|
684 | ] |
---|
685 | [relnotes.txt: eleventh -> twelfth release. |
---|
686 | david-sarah@jacaranda.org**20101128223321 |
---|
687 | Ignore-this: 1e26410156a665271c1170803dea2c0d |
---|
688 | ] |
---|
689 | [relnotes.tst: point to known_issues.rst, not known_issues.txt. |
---|
690 | david-sarah@jacaranda.org**20101128222918 |
---|
691 | Ignore-this: 60194eb4544cac446fe4f60b3e34b887 |
---|
692 | ] |
---|
693 | [quickstart.html: fix link to point to allmydata-tahoe-1.8.1.zip. |
---|
694 | david-sarah@jacaranda.org**20101128221728 |
---|
695 | Ignore-this: 7b3ee86f8256aa12f5d862f689f3ee29 |
---|
696 | ] |
---|
697 | [TAG allmydata-tahoe-1.8.1 |
---|
698 | david-sarah@jacaranda.org**20101128212336 |
---|
699 | Ignore-this: 9c18bdeaef4822f590d2a0d879e00621 |
---|
700 | ] |
---|
701 | Patch bundle hash: |
---|
702 | fbec1292c2bafb12a82e3bf6cc55bd1c13553f0c |
---|