Ticket #1435: dependency-updates.darcs.patch

File dependency-updates.darcs.patch, 19.2 KB (added by davidsarah, at 2011-07-19T02:55:43Z)

setup.py, _auto_deps.py, NEWS: dependency updates for Twisted and zope.interface. This version also removes the instruction to install pywin32 on Windows, which is no longer needed. fixes #1274, #1435. refs #1429

Line 
12 patches for repository davidsarah@dev.allmydata.org:/home/darcs/tahoe/trunk:
2
3Tue Jul 19 00:46:54 BST 2011  david-sarah@jacaranda.org
4  * setup.py, _auto_deps.py, NEWS: dependency updates for Twisted and zope.interface. fixes #1274, #1435. refs #1429
5
6Tue Jul 19 02:55:39 BST 2011  david-sarah@jacaranda.org
7  * docs/quickstart.rst: remove the instruction to install pywin32 on Windows, which is no longer needed. refs #1274
8
9New patches:
10
11[setup.py, _auto_deps.py, NEWS: dependency updates for Twisted and zope.interface. fixes #1274, #1435. refs #1429
12david-sarah@jacaranda.org**20110718234654
13 Ignore-this: 61c3d92e1a85896143ef85b18f5a5972
14] {
15hunk ./NEWS.rst 15
16   will throw an exception if they gather stats from a new storage
17   server and it sends a "None" for a percentile. (`#1392`_)
18 
19+Compatibility and Dependencies
20+''''''''''''''''''''''''''''''
21+
22+- An incompatibility of zope.interface version 3.6.4 with Nevow has
23+  been resolved. Tahoe-LAFS now requires one of the exact versions
24+  v3.3.1, v3.5.3, or v3.6.1 of zope.interface. (`#1435`_)
25+- The Twisted dependency has been raised to version 10.1. This ensures
26+  that we no longer require pywin32 on Windows, and that the new
27+  drop-upload feature has the required support from Twisted on Linux.
28+  (`#1274`_, `#1429`_)
29+
30+.. _`#1274`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1274
31 .. _`#1392`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1392
32 .. _`#1409`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1409
33hunk ./NEWS.rst 29
34+.. _`#1429`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1429
35+.. _`#1435`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1435
36+
37 
38 Release 1.8.2 (2011-01-30)
39 --------------------------
40hunk ./setup.py 138
41 # http://pypi.python.org/pypi/darcsver
42 setup_requires.append('darcsver >= 1.7.2')
43 
44-# Nevow requires Twisted to setup, but prior to Nevow v0.9.33, didn't
45-# declare that requirement in a way that enables setuptools to satisfy
46-# the requirement before Nevow's setup.py tries to "import twisted".
47-# This only matters when Twisted is not already installed.
48-# See http://divmod.org/trac/ticket/2629
49-# Retire this hack if/when we require Nevow >= 0.9.33.
50-setup_requires.append('Twisted >= 2.4.0')
51+# Nevow imports itself when building, which causes Twisted and zope.interface
52+# to be imported. We need to make sure that the versions of Twisted and
53+# zope.interface used at build time satisfy Nevow's requirements. If not
54+# then there are two problems:
55+#  - prior to Nevow v0.9.33, Nevow didn't declare its dependency on Twisted
56+#    in a way that enabled setuptools to satisfy that requirement at
57+#    build time.
58+#  - some versions of zope.interface, e.g. v3.6.4, are incompatible with
59+#    Nevow, and we need to avoid those both at build and run-time.
60+#
61+# This only matters when compatible versions of Twisted and zope.interface
62+# are not already installed. Retire this hack when
63+# https://bugs.launchpad.net/nevow/+bug/812537 has been fixed.
64+setup_requires += [req for req in install_requires if req.startswith('Twisted') or req.startswith('zope.interface')]
65 
66 # setuptools_darcs is required to produce complete distributions (such
67 # as with "sdist" or "bdist_egg"), unless there is a
68hunk ./src/allmydata/_auto_deps.py 17
69     # Feisty has simplejson 1.4
70     "simplejson >= 1.4",
71 
72-    "zope.interface",
73+    # zope.interface 3.6.4 is incompatible with Nevow.
74+    # These are the versions packaged in major versions of Debian or Ubuntu, or in pkgsrc.
75+    "zope.interface == 3.3.1, == 3.5.3, == 3.6.1",
76 
77hunk ./src/allmydata/_auto_deps.py 21
78-    "Twisted >= 2.4.0",
79+    # On Windows we need at least Twisted 9.0 to avoid an indirect dependency on pywin32.
80+    # On Linux we need at least Twisted 10.1.0 for inotify support.
81+    "Twisted >= 10.1.0",
82 
83     # foolscap < 0.5.1 had a performance bug which spent
84     # O(N**2) CPU for transferring large mutable files
85}
86[docs/quickstart.rst: remove the instruction to install pywin32 on Windows, which is no longer needed. refs #1274
87david-sarah@jacaranda.org**20110719015539
88 Ignore-this: f9cef08a0eab6fa1b0767f434a564e32
89] hunk ./docs/quickstart.rst 41
90 directory has no spaces in it (e.g. on Windows, do not install Python
91 in the "Program Files" directory).
92 
93-If you are on Windows, you now must manually install the pywin32
94-package from `the pywin32 site
95-<http://sourceforge.net/projects/pywin32/files/>`_ before getting
96-Tahoe-LAFS. Make sure to get the correct file for the version of Python
97-you are using -- e.g. ending in "py2.6.exe" for Python v2.6. If using
98-64-bit Windows, the file should have "win-amd64" in its name.
99-
100 Get Tahoe-LAFS
101 --------------
102 
103
104Context:
105
106[docs/running.rst: use 'tahoe run ~/.tahoe' instead of 'tahoe run' (the default is the current directory, unlike 'tahoe start').
107david-sarah@jacaranda.org**20110718005949
108 Ignore-this: 81837fbce073e93d88a3e7ae3122458c
109]
110[docs/running.rst: say to put the introducer.furl in tahoe.cfg.
111david-sarah@jacaranda.org**20110717194315
112 Ignore-this: 954cc4c08e413e8c62685d58ff3e11f3
113]
114[setup: remove the dependency on foolscap's "secure_connections" extra, add a dependency on pyOpenSSL
115zooko@zooko.com**20110717114226
116 Ignore-this: df222120d41447ce4102616921626c82
117 fixes #1383
118]
119[docs: add missing link in NEWS.rst
120zooko@zooko.com**20110712153307
121 Ignore-this: be7b7eb81c03700b739daa1027d72b35
122]
123[contrib: remove the contributed fuse modules and the entire contrib/ directory, which is now empty
124zooko@zooko.com**20110712153229
125 Ignore-this: 723c4f9e2211027c79d711715d972c5
126 Also remove a couple of vestigial references to figleaf, which is long gone.
127 fixes #1409 (remove contrib/fuse)
128]
129[README.txt: say that quickstart.rst is in the docs directory.
130david-sarah@jacaranda.org**20110717192400
131 Ignore-this: bc6d35a85c496b77dbef7570677ea42a
132]
133[test_sftp.py cleanup: remove a redundant definition of failUnlessReallyEqual.
134david-sarah@jacaranda.org**20110716181813
135 Ignore-this: 50113380b368c573f07ac6fe2eb1e97f
136]
137[add Protovis.js-based download-status timeline visualization
138Brian Warner <warner@lothar.com>**20110629222606
139 Ignore-this: 477ccef5c51b30e246f5b6e04ab4a127
140 
141 provide status overlap info on the webapi t=json output, add decode/decrypt
142 rate tooltips, add zoomin/zoomout buttons
143]
144[add more download-status data, fix tests
145Brian Warner <warner@lothar.com>**20110629222555
146 Ignore-this: e9e0b7e0163f1e95858aa646b9b17b8c
147]
148[prepare for viz: improve DownloadStatus events
149Brian Warner <warner@lothar.com>**20110629222542
150 Ignore-this: 16d0bde6b734bb501aa6f1174b2b57be
151 
152 consolidate IDownloadStatusHandlingConsumer stuff into DownloadNode
153]
154[docs: fix error in crypto specification that was noticed by Taylor R Campbell <campbell+tahoe@mumble.net>
155zooko@zooko.com**20110629185711
156 Ignore-this: b921ed60c1c8ba3c390737fbcbe47a67
157]
158[setup.py: don't make bin/tahoe.pyscript executable. fixes #1347
159david-sarah@jacaranda.org**20110130235809
160 Ignore-this: 3454c8b5d9c2c77ace03de3ef2d9398a
161]
162[Makefile: remove targets relating to 'setup.py check_auto_deps' which no longer exists. fixes #1345
163david-sarah@jacaranda.org**20110626054124
164 Ignore-this: abb864427a1b91bd10d5132b4589fd90
165]
166[Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary dependency of 'test' on 'build' and 'src/allmydata/_version.py'. fixes #1344
167david-sarah@jacaranda.org**20110623205528
168 Ignore-this: c63e23146c39195de52fb17c7c49b2da
169]
170[Rename test_package_initialization.py to (much shorter) test_import.py .
171Brian Warner <warner@lothar.com>**20110611190234
172 Ignore-this: 3eb3dbac73600eeff5cfa6b65d65822
173 
174 The former name was making my 'ls' listings hard to read, by forcing them
175 down to just two columns.
176]
177[tests: fix tests to accomodate [20110611153758-92b7f-0ba5e4726fb6318dac28fb762a6512a003f4c430]
178zooko@zooko.com**20110611163741
179 Ignore-this: 64073a5f39e7937e8e5e1314c1a302d1
180 Apparently none of the two authors (stercor, terrell), three reviewers (warner, davidsarah, terrell), or one committer (me) actually ran the tests. This is presumably due to #20.
181 fixes #1412
182]
183[wui: right-align the size column in the WUI
184zooko@zooko.com**20110611153758
185 Ignore-this: 492bdaf4373c96f59f90581c7daf7cd7
186 Thanks to Ted "stercor" Rolle Jr. and Terrell Russell.
187 fixes #1412
188]
189[docs: three minor fixes
190zooko@zooko.com**20110610121656
191 Ignore-this: fec96579eb95aceb2ad5fc01a814c8a2
192 CREDITS for arc for stats tweak
193 fix link to .zip file in quickstart.rst (thanks to ChosenOne for noticing)
194 English usage tweak
195]
196[docs/running.rst: fix stray HTML (not .rst) link noticed by ChosenOne.
197david-sarah@jacaranda.org**20110609223719
198 Ignore-this: fc50ac9c94792dcac6f1067df8ac0d4a
199]
200[server.py:  get_latencies now reports percentiles _only_ if there are sufficient observations for the interpretation of the percentile to be unambiguous.
201wilcoxjg@gmail.com**20110527120135
202 Ignore-this: 2e7029764bffc60e26f471d7c2b6611e
203 interfaces.py:  modified the return type of RIStatsProvider.get_stats to allow for None as a return value
204 NEWS.rst, stats.py: documentation of change to get_latencies
205 stats.rst: now documents percentile modification in get_latencies
206 test_storage.py:  test_latencies now expects None in output categories that contain too few samples for the associated percentile to be unambiguously reported.
207 fixes #1392
208]
209[docs: revert link in relnotes.txt from NEWS.rst to NEWS, since the former did not exist at revision 5000.
210david-sarah@jacaranda.org**20110517011214
211 Ignore-this: 6a5be6e70241e3ec0575641f64343df7
212]
213[docs: convert NEWS to NEWS.rst and change all references to it.
214david-sarah@jacaranda.org**20110517010255
215 Ignore-this: a820b93ea10577c77e9c8206dbfe770d
216]
217[docs: remove out-of-date docs/testgrid/introducer.furl and containing directory. fixes #1404
218david-sarah@jacaranda.org**20110512140559
219 Ignore-this: 784548fc5367fac5450df1c46890876d
220]
221[scripts/common.py: don't assume that the default alias is always 'tahoe' (it is, but the API of get_alias doesn't say so). refs #1342
222david-sarah@jacaranda.org**20110130164923
223 Ignore-this: a271e77ce81d84bb4c43645b891d92eb
224]
225[setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError
226zooko@zooko.com**20110128142006
227 Ignore-this: 57d4bc9298b711e4bc9dc832c75295de
228 I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement().
229]
230[M-x whitespace-cleanup
231zooko@zooko.com**20110510193653
232 Ignore-this: dea02f831298c0f65ad096960e7df5c7
233]
234[docs: fix typo in running.rst, thanks to arch_o_median
235zooko@zooko.com**20110510193633
236 Ignore-this: ca06de166a46abbc61140513918e79e8
237]
238[relnotes.txt: don't claim to work on Cygwin (which has been untested for some time). refs #1342
239david-sarah@jacaranda.org**20110204204902
240 Ignore-this: 85ef118a48453d93fa4cddc32d65b25b
241]
242[relnotes.txt: forseeable -> foreseeable. refs #1342
243david-sarah@jacaranda.org**20110204204116
244 Ignore-this: 746debc4d82f4031ebf75ab4031b3a9
245]
246[replace remaining .html docs with .rst docs
247zooko@zooko.com**20110510191650
248 Ignore-this: d557d960a986d4ac8216d1677d236399
249 Remove install.html (long since deprecated).
250 Also replace some obsolete references to install.html with references to quickstart.rst.
251 Fix some broken internal references within docs/historical/historical_known_issues.txt.
252 Thanks to Ravi Pinjala and Patrick McDonald.
253 refs #1227
254]
255[docs: FTP-and-SFTP.rst: fix a minor error and update the information about which version of Twisted fixes #1297
256zooko@zooko.com**20110428055232
257 Ignore-this: b63cfb4ebdbe32fb3b5f885255db4d39
258]
259[munin tahoe_files plugin: fix incorrect file count
260francois@ctrlaltdel.ch**20110428055312
261 Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34
262 fixes #1391
263]
264[corrected "k must never be smaller than N" to "k must never be greater than N"
265secorp@allmydata.org**20110425010308
266 Ignore-this: 233129505d6c70860087f22541805eac
267]
268[Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389
269david-sarah@jacaranda.org**20110411190738
270 Ignore-this: 7847d26bc117c328c679f08a7baee519
271]
272[tests: add test for including the ImportError message and traceback entry in the summary of errors from importing dependencies. refs #1389
273david-sarah@jacaranda.org**20110410155844
274 Ignore-this: fbecdbeb0d06a0f875fe8d4030aabafa
275]
276[allmydata/__init__.py: preserve the message and last traceback entry (file, line number, function, and source line) of ImportErrors in the package versions string. fixes #1389
277david-sarah@jacaranda.org**20110410155705
278 Ignore-this: 2f87b8b327906cf8bfca9440a0904900
279]
280[remove unused variable detected by pyflakes
281zooko@zooko.com**20110407172231
282 Ignore-this: 7344652d5e0720af822070d91f03daf9
283]
284[allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388
285david-sarah@jacaranda.org**20110401202750
286 Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f
287]
288[update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1
289Brian Warner <warner@lothar.com>**20110325232511
290 Ignore-this: d5307faa6900f143193bfbe14e0f01a
291]
292[control.py: remove all uses of s.get_serverid()
293warner@lothar.com**20110227011203
294 Ignore-this: f80a787953bd7fa3d40e828bde00e855
295]
296[web: remove some uses of s.get_serverid(), not all
297warner@lothar.com**20110227011159
298 Ignore-this: a9347d9cf6436537a47edc6efde9f8be
299]
300[immutable/downloader/fetcher.py: remove all get_serverid() calls
301warner@lothar.com**20110227011156
302 Ignore-this: fb5ef018ade1749348b546ec24f7f09a
303]
304[immutable/downloader/fetcher.py: fix diversity bug in server-response handling
305warner@lothar.com**20110227011153
306 Ignore-this: bcd62232c9159371ae8a16ff63d22c1b
307 
308 When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the
309 _shares_from_server dict was being popped incorrectly (using shnum as the
310 index instead of serverid). I'm still thinking through the consequences of
311 this bug. It was probably benign and really hard to detect. I think it would
312 cause us to incorrectly believe that we're pulling too many shares from a
313 server, and thus prefer a different server rather than asking for a second
314 share from the first server. The diversity code is intended to spread out the
315 number of shares simultaneously being requested from each server, but with
316 this bug, it might be spreading out the total number of shares requested at
317 all, not just simultaneously. (note that SegmentFetcher is scoped to a single
318 segment, so the effect doesn't last very long).
319]
320[immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps
321warner@lothar.com**20110227011150
322 Ignore-this: d8d56dd8e7b280792b40105e13664554
323 
324 test_download.py: create+check MyShare instances better, make sure they share
325 Server objects, now that finder.py cares
326]
327[immutable/downloader/finder.py: reduce use of get_serverid(), one left
328warner@lothar.com**20110227011146
329 Ignore-this: 5785be173b491ae8a78faf5142892020
330]
331[immutable/offloaded.py: reduce use of get_serverid() a bit more
332warner@lothar.com**20110227011142
333 Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f
334]
335[immutable/upload.py: reduce use of get_serverid()
336warner@lothar.com**20110227011138
337 Ignore-this: ffdd7ff32bca890782119a6e9f1495f6
338]
339[immutable/checker.py: remove some uses of s.get_serverid(), not all
340warner@lothar.com**20110227011134
341 Ignore-this: e480a37efa9e94e8016d826c492f626e
342]
343[add remaining get_* methods to storage_client.Server, NoNetworkServer, and
344warner@lothar.com**20110227011132
345 Ignore-this: 6078279ddf42b179996a4b53bee8c421
346 MockIServer stubs
347]
348[upload.py: rearrange _make_trackers a bit, no behavior changes
349warner@lothar.com**20110227011128
350 Ignore-this: 296d4819e2af452b107177aef6ebb40f
351]
352[happinessutil.py: finally rename merge_peers to merge_servers
353warner@lothar.com**20110227011124
354 Ignore-this: c8cd381fea1dd888899cb71e4f86de6e
355]
356[test_upload.py: factor out FakeServerTracker
357warner@lothar.com**20110227011120
358 Ignore-this: 6c182cba90e908221099472cc159325b
359]
360[test_upload.py: server-vs-tracker cleanup
361warner@lothar.com**20110227011115
362 Ignore-this: 2915133be1a3ba456e8603885437e03
363]
364[happinessutil.py: server-vs-tracker cleanup
365warner@lothar.com**20110227011111
366 Ignore-this: b856c84033562d7d718cae7cb01085a9
367]
368[upload.py: more tracker-vs-server cleanup
369warner@lothar.com**20110227011107
370 Ignore-this: bb75ed2afef55e47c085b35def2de315
371]
372[upload.py: fix var names to avoid confusion between 'trackers' and 'servers'
373warner@lothar.com**20110227011103
374 Ignore-this: 5d5e3415b7d2732d92f42413c25d205d
375]
376[refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload
377warner@lothar.com**20110227011100
378 Ignore-this: 7ea858755cbe5896ac212a925840fe68
379 
380 No behavioral changes, just updating variable/method names and log messages.
381 The effects outside these three files should be minimal: some exception
382 messages changed (to say "server" instead of "peer"), and some internal class
383 names were changed. A few things still use "peer" to minimize external
384 changes, like UploadResults.timings["peer_selection"] and
385 happinessutil.merge_peers, which can be changed later.
386]
387[storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers
388warner@lothar.com**20110227011056
389 Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc
390]
391[test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code
392warner@lothar.com**20110227011051
393 Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d
394]
395[test: increase timeout on a network test because Francois's ARM machine hit that timeout
396zooko@zooko.com**20110317165909
397 Ignore-this: 380c345cdcbd196268ca5b65664ac85b
398 I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish.
399]
400[docs/configuration.rst: add a "Frontend Configuration" section
401Brian Warner <warner@lothar.com>**20110222014323
402 Ignore-this: 657018aa501fe4f0efef9851628444ca
403 
404 this points to docs/frontends/*.rst, which were previously underlinked
405]
406[web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366
407"Brian Warner <warner@lothar.com>"**20110221061544
408 Ignore-this: 799d4de19933f2309b3c0c19a63bb888
409]
410[Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable.
411david-sarah@jacaranda.org**20110221015817
412 Ignore-this: 51d181698f8c20d3aca58b057e9c475a
413]
414[allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355.
415david-sarah@jacaranda.org**20110221020125
416 Ignore-this: b0744ed58f161bf188e037bad077fc48
417]
418[Refactor StorageFarmBroker handling of servers
419Brian Warner <warner@lothar.com>**20110221015804
420 Ignore-this: 842144ed92f5717699b8f580eab32a51
421 
422 Pass around IServer instance instead of (peerid, rref) tuple. Replace
423 "descriptor" with "server". Other replacements:
424 
425  get_all_servers -> get_connected_servers/get_known_servers
426  get_servers_for_index -> get_servers_for_psi (now returns IServers)
427 
428 This change still needs to be pushed further down: lots of code is now
429 getting the IServer and then distributing (peerid, rref) internally.
430 Instead, it ought to distribute the IServer internally and delay
431 extracting a serverid or rref until the last moment.
432 
433 no_network.py was updated to retain parallelism.
434]
435[TAG allmydata-tahoe-1.8.2
436warner@lothar.com**20110131020101]
437Patch bundle hash:
438a01ed648ac92321d2f84efd5bb2e551b2c8944fe