Commit Graph

10353 Commits

Author SHA1 Message Date
Itamar Turner-Trauring
a79c581332 Wrong branch. 2020-08-13 16:37:24 -04:00
Itamar Turner-Trauring
a3714a9970 Fix whitespace. 2020-08-13 16:32:32 -04:00
Itamar Turner-Trauring
b0c4f6d2ab Fix Python 2 tests. 2020-08-13 16:30:27 -04:00
Itamar Turner-Trauring
af61571fa6 Accidentally passing test :( 2020-08-13 15:56:08 -04:00
Itamar Turner-Trauring
6e24defe4b Merge branch '3376.encodingutil-python-3' into 3377.configutil-connection_status-python-3 2020-08-13 15:53:02 -04:00
Itamar Turner-Trauring
942c5d52cf New passing tests. 2020-08-13 15:49:47 -04:00
Itamar Turner-Trauring
a2e707225b Fix the ratchet.sh script. 2020-08-13 15:48:21 -04:00
Itamar Turner-Trauring
2e5a982fde Merge remote-tracking branch 'origin/master' into 3376.encodingutil-python-3 2020-08-13 15:23:15 -04:00
Itamar Turner-Trauring
8167e85f7b Fix flake8 with __all__. 2020-08-13 15:11:14 -04:00
Itamar Turner-Trauring
2157da524d This needs an encoding too. 2020-08-13 15:04:44 -04:00
Itamar Turner-Trauring
e113cba8d0 Address review comments. 2020-08-13 15:02:59 -04:00
Chad Whitacre
ae87037e73 Filter tests we care about in CI for Python 3 2020-08-13 06:23:46 -04:00
Chad Whitacre
60078ce47f Satisfy towncrier 2020-08-13 06:23:45 -04:00
Chad Whitacre
306df53012 Expose TAHOE_LAFS_TRIAL_ARGS to config
This allows for working around a bug in trial under Python 3 where
--reporter and --rterror collide.
2020-08-13 05:55:51 -04:00
Chad Whitacre
96e3d94172 Fold py36 back into normal tox run
This removes the individual-test-based ratchet.
2020-08-13 05:55:48 -04:00
Itamar Turner-Trauring
7505abe826 News file and ratchet (connection_status stuff is... iffy, but we have to live
with it until the only-ported-modules bit is done).
2020-08-12 15:59:00 -04:00
Itamar Turner-Trauring
e0a52d8bf6
Merge pull request #758 from tahoe-lafs/3358.fileutil-to-python-3
Fixes ticket:3358

Port fileutil to python 3
2020-08-12 15:57:24 -04:00
Itamar Turner-Trauring
cdccb93179 Flake fixes. 2020-08-12 15:52:12 -04:00
Itamar Turner-Trauring
5c9294ebf1 Port to Python 3. 2020-08-12 15:46:15 -04:00
Itamar Turner-Trauring
5a0fa7ff73 Test unicode_to_argv(). 2020-08-12 15:40:52 -04:00
Itamar Turner-Trauring
b25f62d189 Clarifications. 2020-08-12 15:40:45 -04:00
Itamar Turner-Trauring
e03c2a759f Port test_encodingutil.py to Python 3. 2020-08-12 15:14:04 -04:00
Itamar Turner-Trauring
b04a65fc16 And more progress to Python 3. 2020-08-12 14:54:07 -04:00
Itamar Turner-Trauring
e9d67b8d0f Even more progress towards Python 3 support. 2020-08-12 14:32:22 -04:00
Itamar Turner-Trauring
f7e28ffb0b More progress towards Python 3. 2020-08-12 14:18:02 -04:00
Itamar Turner-Trauring
53bdc10e19 Some steps towards Python 3 support. 2020-08-12 13:10:10 -04:00
Maciej Fijalkowski
820586cadb try a bit harder to properly merge master 2020-08-12 18:27:50 +02:00
Maciej Fijalkowski
c37a2b0a89 maybe this is the magic incantation 2020-08-12 18:15:14 +02:00
Maciej Fijalkowski
a4a44fe112 make some changes to an opaque binary file 2020-08-12 18:02:00 +02:00
Maciej Fijalkowski
32a17caddb maybe that's how it should be? 2020-08-12 17:50:40 +02:00
Itamar Turner-Trauring
e13c0cf4d3 Reorganize imports to make Python 3 support easier. 2020-08-12 10:23:30 -04:00
Itamar Turner-Trauring
5dde21f966 Merge remote-tracking branch 'origin/3358.fileutil-to-python-3' into 3376.encodingutil-python-3 2020-08-12 10:15:45 -04:00
Itamar Turner-Trauring
3c5f4f7ddf Merge remote-tracking branch 'origin/master' into 3376.encodingutil-python-3 2020-08-12 10:15:41 -04:00
Itamar Turner-Trauring
14b273953a Better fix, maybe. 2020-08-12 10:10:18 -04:00
Maciej Fijalkowski
c21acc64f0 merge master 2020-08-12 15:42:00 +02:00
Maciej Fijalkowski
9c4e68e0a7 maybe that's how you use subunit2pyunit 2020-08-12 15:33:54 +02:00
Jean-Paul Calderone
726dfb42b1
Merge pull request #747 from tahoe-lafs/3336.py36-off-travis
Move Python 3.6 CI onto CircleCI

Fixes: ticket:3336
2020-08-11 19:10:33 -04:00
Jean-Paul Calderone
513177c4b8
strace not used by anything now 2020-08-11 18:33:01 -04:00
Itamar Turner-Trauring
9ad5602477 Fix test failures. 2020-08-11 16:50:42 -04:00
Itamar Turner-Trauring
d087f04d39
Merge pull request #764 from tahoe-lafs/3370.happiness-upload-python-3
Port happiness_upload to Python 3
2020-08-11 16:40:40 -04:00
Itamar Turner-Trauring
10378541d7 Use Python 2 ConfigParser, so correct exceptions get raised. 2020-08-11 16:40:00 -04:00
Itamar Turner-Trauring
277298050f News file and ratchet. 2020-08-11 15:51:27 -04:00
Itamar Turner-Trauring
11b934120c Port to Python 3. 2020-08-11 15:49:59 -04:00
Itamar Turner-Trauring
babe2dbc85 Port to Python 3. 2020-08-11 15:45:52 -04:00
Itamar Turner-Trauring
e24c21bef7 Make configutil tests more standalone, and less repetitive. 2020-08-11 15:38:58 -04:00
Itamar Turner-Trauring
80c7739096 Merge branch '3370.happiness-upload-python-3' into 3373.happinessutil-python-3 2020-08-11 14:54:39 -04:00
Itamar Turner-Trauring
504258622c Docstring. 2020-08-11 14:54:12 -04:00
Itamar Turner-Trauring
202a7cf975 Merge remote-tracking branch 'origin/master' into 3370.happiness-upload-python-3 2020-08-11 14:53:34 -04:00
Jean-Paul Calderone
b69287be4b
Merge remote-tracking branch 'origin/master' into 3336.py36-off-travis 2020-08-11 14:51:08 -04:00
Itamar Turner-Trauring
a08cde9a4d Port to Python 3. 2020-08-11 14:30:16 -04:00