Commit Graph

582 Commits

Author SHA1 Message Date
Itamar Turner-Trauring
a552bb53a7 Merge remote-tracking branch 'origin/master' into 3409.allmydata-storage-immutable-python-3 2020-09-15 09:05:55 -04:00
Itamar Turner-Trauring
73967aa5b0
Merge pull request #810 from tahoe-lafs/3411.storage-mutable-python-3
Port a variety of allmydata.storage modules to Python 3

Fixes ticket:3411
2020-09-15 09:02:44 -04:00
Itamar Turner-Trauring
72f72491d0 News fragment. 2020-09-14 14:48:39 -04:00
Chad Whitacre
91a5c8ce95 Satisfy towncrier 2020-09-14 08:26:47 -04:00
Itamar Turner-Trauring
6ffda25d6b News fragment. 2020-09-11 15:04:52 -04:00
Jason R. Coombs
69762df708 Merge branch 'master' into 3398.pre-commit 2020-09-11 14:57:23 -04:00
Itamar Turner-Trauring
6f5c32c461 News fragment. 2020-09-11 14:51:20 -04:00
Jason R. Coombs
a7034de852 Add empty newsfragment. 2020-09-11 14:51:02 -04:00
Sajith Sasidharan
ebd20b7f22 Merge 'origin/master' into 3382.remove-multi-format-page 2020-09-10 10:09:38 -04:00
Jason R. Coombs
d74d7e733c Merge branch 'master' into 3394.py38-tests 2020-09-09 21:42:32 -04:00
Sajith Sasidharan
3b2b6fe646 Merge 'origin/master' into 3391.codecov-yml 2020-09-08 18:05:20 -04:00
Sajith Sasidharan
8ce3b95894
Merge pull request #802 from sajith/3403.pin-pyrsistent
Pin Pyrsistent at a Python 2 compatible version

Fixes: ticket:3403
2020-09-08 18:03:57 -04:00
Sajith Sasidharan
810c7eefd8 Pin Pyrsistent at a Python 2.7 compatible version 2020-09-08 16:31:57 -04:00
Itamar Turner-Trauring
4c90247d99
Merge pull request #799 from tahoe-lafs/3397.test-storage-python-3
Port allmydata.test.test_storage to Python 3

Fixes ticket:3397
2020-09-08 15:32:06 -04:00
Sajith Sasidharan
e17e9fa7a9
Merge pull request #791 from sajith/3393.remove-nevow-106-workaround
Remove allmydata.web._nevow_106

Fixes: ticket:3393
2020-09-07 21:49:00 -04:00
Sajith Sasidharan
46b4c94e7c
Merge pull request #790 from sajith/3392.remove-web-rendering-mixin
Remove unused allmydata.test.common_web.WebRenderingMixin

Fixes: ticket:3392
2020-09-07 21:47:23 -04:00
Itamar Turner-Trauring
59f3a471cb Merge remote-tracking branch 'origin/master' into 3397.test-storage-python-3 2020-09-04 14:51:33 -04:00
Itamar Turner-Trauring
af4814ee7b Merge remote-tracking branch 'origin/master' into 3396.storage-tests-python-3 2020-09-04 13:27:35 -04:00
Itamar Turner-Trauring
38f5a9c5a3 Disable coverage on pypy, in the hopes of making it less flaky. 2020-09-04 12:05:31 -04:00
Jason R. Coombs
fd49047721 Add news fragment. 2020-09-03 18:48:16 -04:00
Itamar Turner-Trauring
063ee18da3 News fragment. 2020-09-01 12:45:32 -04:00
Itamar Turner-Trauring
3fa919834a Finish port to Python 3. 2020-08-31 13:20:57 -04:00
Jason R. Coombs
a3f5a0d7ac Merge branch 'master' into 3394.py38-tests 2020-08-30 12:06:56 -04:00
Itamar Turner-Trauring
6f2f460bf3 Merge remote-tracking branch 'origin/master' into 3374.codec-monitor-python-3-take-2 2020-08-27 14:53:45 -04:00
Itamar Turner-Trauring
7da73c1a03
Merge pull request #772 from tahoe-lafs/3377.configutil-connection_status-python-3
Port configutil and connection_status to Python 3

Fixes ticket:3377
2020-08-27 14:51:26 -04:00
Itamar Turner-Trauring
4f1dfec62f
Merge pull request #795 from tahoe-lafs/3395.more-storage-python-3
Port the rest of allmydata.test.test_storage_web to Python 3

Fixes ticket:3395
2020-08-27 14:48:55 -04:00
Jean-Paul Calderone
94c61c817c
Merge pull request #796 from tahoe-lafs/3355.python3-coverage-reports
Collect and report Python 3 test suite coverage

Fixes: ticket:3355
2020-08-27 14:36:56 -04:00
Jean-Paul Calderone
6422dba90d Say some words about this change 2020-08-27 10:39:49 -04:00
Sajith Sasidharan
d79880bf91 Merge 'origin/master' into 3382.remove-multi-format-page 2020-08-26 21:18:44 -04:00
Jean-Paul Calderone
7f3192e310 news fragment 2020-08-26 14:46:57 -04:00
Itamar Turner-Trauring
431e939bb8 Finish porting test_storage_web to Python 3. 2020-08-26 10:38:52 -04:00
Itamar Turner-Trauring
23671b02a4 Merge remote-tracking branch 'origin/master' into 3387.expirer-python-3 2020-08-25 13:57:32 -04:00
Sajith Sasidharan
82ee45c1ac Merge 'origin/master' into 3382.remove-multi-format-page 2020-08-25 13:54:05 -04:00
Sajith Sasidharan
f51c127d6d
Merge pull request #780 from sajith/3381.directory-deep-size-results-to-twisted-web
Port web.directory.DeepSizeResults to twisted web

Fixes: ticket:3381
2020-08-25 13:52:15 -04:00
Itamar Turner-Trauring
b3c1302643 Merge remote-tracking branch 'origin/master' into 3387.expirer-python-3 2020-08-25 12:31:12 -04:00
Itamar Turner-Trauring
6726c6ec5b Merge remote-tracking branch 'origin/master' into 3374.codec-monitor-python-3-take-2 2020-08-25 11:48:31 -04:00
Itamar Turner-Trauring
43f95238d8 Merge remote-tracking branch 'origin/master' into 3377.configutil-connection_status-python-3 2020-08-25 11:44:48 -04:00
Itamar Turner-Trauring
7ad8cb503e
Merge pull request #794 from tahoe-lafs/3367.port-uri-to-python-3-take-2
Port URI to Python 3

Fixes ticket:3367
2020-08-25 11:41:06 -04:00
Jean-Paul Calderone
bce701d5bc
Merge pull request #786 from tahoe-lafs/3388.ubuntu-2004-image-builder
Fix the Ubuntu 20.04 image builder

Fixes: ticket:3388
2020-08-24 18:13:16 -04:00
Itamar Turner-Trauring
2cc21e9893 Finish the port. 2020-08-24 13:57:46 -04:00
Jason R. Coombs
bc5a873456 Adding null newsfragment (changes are internal and subsumed by larger Python 3 effort). 2020-08-24 11:35:58 -04:00
Sajith Sasidharan
57fdead1c3 Remove allmydata.web._nevow_106 2020-08-22 17:21:24 -04:00
Sajith Sasidharan
fa36fb9ab9 Remove unused allmydata.test.common_web.WebRenderingMixin 2020-08-22 16:47:19 -04:00
Sajith Sasidharan
da57a7fc21 Add codecov settings 2020-08-22 08:14:08 -04:00
Sajith Sasidharan
a9fa70c3d5 Add upper bound for attrs library 2020-08-21 15:55:39 -04:00
Itamar Turner-Trauring
71cac5dd44 Merge remote-tracking branch 'origin/master' into 3387.expirer-python-3 2020-08-20 14:56:35 -04:00
Itamar Turner-Trauring
9089a1226a
Merge pull request #785 from tahoe-lafs/3386.storage-crawler-python-3
Port allmydata.storage.crawler to Python 3

Fixes ticket:3386
2020-08-20 14:52:30 -04:00
Itamar Turner-Trauring
f227b1b241
Merge pull request #779 from tahoe-lafs/3378.encodingutil-python-3-part-2
Fixes ticket:3378

Port encodingutil to Python 3, part 2
2020-08-20 13:24:33 -04:00
Itamar Turner-Trauring
46b498f99c Merge remote-tracking branch 'origin/master' into 3377.configutil-connection_status-python-3 2020-08-20 13:22:14 -04:00
Jean-Paul Calderone
9bdc085c26 news fragment 2020-08-20 13:20:56 -04:00
Itamar Turner-Trauring
e5b9852081 News file. 2020-08-20 13:05:25 -04:00
Itamar Turner-Trauring
71d33469da Merge remote-tracking branch 'origin/master' into 3378.encodingutil-python-3-part-2 2020-08-20 12:36:36 -04:00
Itamar Turner-Trauring
8279be38c1 Finish porting to Python 3. 2020-08-19 13:25:11 -04:00
Itamar Turner-Trauring
ed2f6bf3df News file. 2020-08-18 13:12:05 -04:00
Sajith Sasidharan
d5853ccb60 Remove web.common.MultiFormatPage 2020-08-18 08:48:02 -04:00
Sajith Sasidharan
0de92a2265 Add newsfragment 2020-08-18 08:38:55 -04:00
Itamar Turner-Trauring
01ba0d0316 News file. 2020-08-17 13:30:12 -04:00
Itamar Turner-Trauring
81ba354357 Merge remote-tracking branch 'origin/master' into 3373.happinessutil-python-3 2020-08-17 10:45:12 -04:00
Jean-Paul Calderone
bd06dac9d9
Merge pull request #778 from tahoe-lafs/3380.failure-ci-on-suite-failure
Make test failures fail CI

Fixes: ticket:3380
2020-08-14 14:47:09 -04:00
Itamar Turner-Trauring
4ddbd8dbbf Merge branch '3376.encodingutil-python-3' into 3377.configutil-connection_status-python-3 2020-08-14 13:13:23 -04:00
Jean-Paul Calderone
41fe405068
news fragment 2020-08-14 13:09:56 -04:00
Itamar Turner-Trauring
2fc8f896b3 Merge remote-tracking branch 'origin/master' into 3376.encodingutil-python-3 2020-08-14 13:09:08 -04:00
Jean-Paul Calderone
bc787975da
Merge pull request #777 from tahoe-lafs/3372.ratchet-by-module.python3.6
Ratchet by module, not by individual test (in python3.6)

Fixes: ticket:3372
2020-08-14 11:55:30 -04:00
meejah
8f1b712a8f
Merge pull request #729 from sajith/3316.check-results-nevow-to-twisted-web
Replace nevow with twisted.web.template in web.check_results
2020-08-13 23:10:19 +00: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
Chad Whitacre
60078ce47f Satisfy towncrier 2020-08-13 06:23:45 -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
Maciej Fijalkowski
c21acc64f0 merge master 2020-08-12 15:42:00 +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
Itamar Turner-Trauring
277298050f News file and ratchet. 2020-08-11 15:51:27 -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
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
Jean-Paul Calderone
0f65d10f47
news fragment 2020-08-11 13:25:08 -04:00
Jean-Paul Calderone
fe2332c519
Merge pull request #768 from tahoe-lafs/3328.ubuntu-2004
Add Ubuntu 20.04

Fixes: ticket:3328
2020-08-10 12:43:55 -04:00
Jean-Paul Calderone
4a4a88773e
Merge remote-tracking branch 'origin/master' into 3336.py36-off-travis 2020-08-10 10:31:26 -04:00
Jean-Paul Calderone
fdfa95e1e8
news fragment 2020-08-10 09:59:28 -04:00
Jean-Paul Calderone
f4e1062aa4
Merge remote-tracking branch 'origin/master' into 3336.py36-off-travis 2020-08-10 09:13:01 -04:00
Jean-Paul Calderone
083be5f0c8
news fragment 2020-08-07 15:40:19 -04:00
Itamar Turner-Trauring
017104fec1 News file. 2020-08-07 13:11:24 -04:00
Itamar Turner-Trauring
5d70a78cce
Merge pull request #761 from tahoe-lafs/3365.log-python-3
Fixes ticket:3365

Port allmydata.util.log to Python 3
2020-08-07 12:40:58 -04:00
Itamar Turner-Trauring
1308fc44c0 Ratchet and news file. 2020-08-07 11:51:43 -04:00
Chad Whitacre
49c631b4c8 Sort the thing we said we'd sort 2020-08-07 08:43:54 -04:00
Itamar Turner-Trauring
0622b86b91 Merge remote-tracking branch 'origin/master' into 3370.happiness-upload-python-3 2020-08-06 17:03:43 -04:00
Itamar Turner-Trauring
f53ea4579d Merge remote-tracking branch 'origin/master' into 3365.log-python-3 2020-08-06 17:03:27 -04:00
Itamar Turner-Trauring
d8f74770eb Port to Python 3. 2020-08-06 16:38:19 -04:00
Itamar Turner-Trauring
b8df17283b News file. Not bothering with explanation since the regression was only in
unreleased versions.
2020-08-05 11:54:09 -04:00
Itamar Turner-Trauring
11c7841cd7
Merge pull request #760 from tahoe-lafs/3364.crypto-python-3
Fixes ticket:3364

Port allmydata.crypto to Python 3
2020-08-05 11:26:30 -04:00
Jean-Paul Calderone
4492e0e917
Merge pull request #762 from tahoe-lafs/3366.codechecks-macOS
Get `tox -e codechecks` to work on macOS

Fixes: ticket:3366
2020-08-05 08:59:28 -04:00
Chad Whitacre
1ef25e128c
Merge pull request #759 from tahoe-lafs/3362.enforce-no-tabs
Enforce no tabs
2020-08-05 07:59:51 -04:00
Chad Whitacre
2a6cd8eb58 Get tox -e codechecks to work (on macOS?)
Without this, git fails underneath towncrier with an "error: Could not
expand include path '~/.gitcinclude'".

See: https://stackoverflow.com/q/36908041

I had added similar for `tox -e py36` in d25c8b1a.
2020-08-03 21:19:26 -04:00
Chad Whitacre
f0ddda9665 Add a codecheck for tabs in indentation 2020-08-03 21:14:55 -04:00
Jean-Paul Calderone
f889edb9bd
Merge remote-tracking branch 'origin/master' into 3336.py36-off-travis 2020-08-03 17:18:07 -04:00
Jean-Paul Calderone
a47bd93fd0
news fragment 2020-08-03 17:12:15 -04:00
Itamar Turner-Trauring
2a623e0b05 Port to Python 3. 2020-08-03 14:13:16 -04:00
Itamar Turner-Trauring
d71951ecf1 News fragment. 2020-08-03 11:00:09 -04:00
Jean-Paul Calderone
27b6737eaf
Merge remote-tracking branch 'origin/master' into 3358.fileutil-to-python-3
with fijal
2020-07-30 13:38:47 -04:00
Maciej Fijalkowski
da87bd7e7f news fragment 2020-07-29 21:03:05 +02:00
Itamar Turner-Trauring
5e308260b1 Port to Python 3. 2020-07-29 14:49:48 -04:00
Itamar Turner-Trauring
9e4eda6912
Merge pull request #756 from tahoe-lafs/3359.statistics-python-3
Port statistics and dictutil to Python 3

Fixes ticket:3359
2020-07-29 13:16:17 -04:00
Sajith Sasidharan
fb5f9f0c89 Merge 'origin/master' into 3316.check-results-nevow-to-twisted-web 2020-07-28 07:54:21 -04:00
Itamar Turner-Trauring
058a76dc85 Ratchet, and news file. 2020-07-27 15:58:28 -04:00
Itamar Turner-Trauring
361e75804c Merge remote-tracking branch 'origin/master' into 3356.iputil-python-3 2020-07-27 13:07:12 -04:00
Itamar Turner-Trauring
e681ca1cb9
Merge pull request #754 from tahoe-lafs/3357.version_checks-py3
Port version_checks to Python 3

Fixes ticket:3357
2020-07-27 12:36:28 -04:00
Itamar Turner-Trauring
f9bda5bbd3 News file. 2020-07-27 11:46:22 -04:00
Itamar Turner-Trauring
11cd30c425 Merge remote-tracking branch 'origin/master' into 3357.version_checks-py3 2020-07-24 14:50:39 -04:00
Itamar Turner-Trauring
e0d3e46683 Merge remote-tracking branch 'origin/master' into 3351.spans-python-3 2020-07-24 14:48:33 -04:00
Itamar Turner-Trauring
337a4381bb Finish port to Python 3. 2020-07-24 14:31:36 -04:00
Itamar Turner-Trauring
65500de72f Merge remote-tracking branch 'origin/master' into 3346.abbreviate-and-time_format-py3 2020-07-24 14:13:28 -04:00
Itamar Turner-Trauring
8bcd6dd34b
Merge branch 'master' into 3346.abbreviate-and-time_format-py3 2020-07-24 11:10:38 -04:00
Itamar Turner-Trauring
dd4737f20c
Merge branch 'master' into 3353.observer-and-pipeline-py3 2020-07-24 11:08:08 -04:00
Itamar Turner-Trauring
8c3d592705 Merge remote-tracking branch 'origin/master' into 3354.hashtree-to-python-3 2020-07-23 12:28:39 -04:00
Itamar Turner-Trauring
d23394b35c Merge remote-tracking branch 'origin/master' into 3346.abbreviate-and-time_format-py3 2020-07-23 12:27:06 -04:00
Itamar Turner-Trauring
31ed6b0a4f News fragment. 2020-07-23 11:37:56 -04:00
Itamar Turner-Trauring
ff0ffb8040 Merge remote-tracking branch 'origin/master' into 3344.netstring-and-hashutil-to-python-3 2020-07-23 11:30:23 -04:00
Itamar Turner-Trauring
64e4af2d05 Port to Python 3. 2020-07-22 13:17:49 -04:00
Sajith Sasidharan
46b44b43dc
Merge pull request #730 from sajith/3320.github-actions-windows-integration-tests
Run integration tests on Windows using GitHub Actions

Fixes: ticket:3320
2020-07-22 13:05:53 -04:00
Itamar Turner-Trauring
04bf9aeffc News file. 2020-07-22 10:30:13 -04:00
Itamar Turner-Trauring
13306f70e7 News file. 2020-07-22 10:01:26 -04:00
Itamar Turner-Trauring
3a8bafafc3 Merge remote-tracking branch 'origin/master' into 3344.netstring-and-hashutil-to-python-3 2020-07-22 09:36:34 -04:00
Itamar Turner-Trauring
fa567841b5 Merge remote-tracking branch 'origin/master' into 3342-base32-and-base62-to-python-3 2020-07-21 14:40:33 -04:00
Itamar Turner-Trauring
7e8de10ea3 Merge branch '3342-base32-and-base62-to-python-3' into 3344.netstring-and-hashutil-to-python-3 2020-07-21 14:00:53 -04:00
Sajith Sasidharan
74a77a48cc Merge 'origin/master' into 3320.github-actions-windows-integration-tests 2020-07-21 13:50:47 -04:00
Sajith Sasidharan
4d20f8447c
Merge pull request #749 from sajith/3348.tor-chutney-integration-tests-python2
Use a Chutney revision that works with Python 2

Fixes: ticket:3348
2020-07-21 13:44:15 -04:00
meejah
8cdfcb1c24 news 2020-07-21 09:40:06 -06:00
Sajith Sasidharan
e4e59c7aab Use a Chutney revision that works with Python 2 2020-07-21 10:44:49 -04:00
Sajith Sasidharan
e145c7b00d
Merge pull request #722 from sajith/3254.status-status-nevow-to-twisted-web
Replace nevow with twisted.web.template in status.Status

Fixes: ticket:3254
2020-07-20 11:28:18 -04:00
Jean-Paul Calderone
52e745afac
Merge pull request #746 from tahoe-lafs/3330.remove-some-travis-config
Remove some TravisCI configuration

Fixes: ticket:3330
Fixes: ticket:3331
Fixes: ticket:3332
Fixes: ticket:3333
Fixes: ticket:3334
Fixes: ticket:3335
2020-07-20 11:13:21 -04:00
Sajith Sasidharan
26ca9ae724
Merge pull request #726 from sajith/3313.operations-ophandle-table-nevow-to-twisted
Replace nevow with twisted.web in operations.OphandleTable

Fixes: ticket:3313
2020-07-19 08:14:32 -04:00
Sajith Sasidharan
0f835e94f5 Merge 'origin/master' into 3254.status-status-nevow-to-twisted-web 2020-07-18 07:53:36 -04:00
Sajith Sasidharan
6dec821271
Merge pull request #720 from sajith/3288.status-download-nevow-to-twisted-web
Replace nevow with twisted.web.template in status.DownloadStatusPage

Fixes: ticket:3288
2020-07-18 07:22:37 -04:00
Jean-Paul Calderone
16c8026b6d
Stop using TravisCI for pyinstaller/Linux test coverage 2020-07-17 12:46:23 -04:00
Jean-Paul Calderone
1b491f293a
Stop using TravisCI for codechecks/Linux test coverage 2020-07-17 12:45:50 -04:00
Jean-Paul Calderone
82a4fca416
Stop using TravisCI for coverage/Linux test coverage 2020-07-17 12:45:05 -04:00
Jean-Paul Calderone
0803aef1cb
Stop using TravisCI for pyinstaller/macOS test coverage 2020-07-17 12:44:19 -04:00
Jean-Paul Calderone
f3780cd4cb
Stop using TravisCI for Python 2.7/macOS test coverage 2020-07-17 12:43:39 -04:00
Jean-Paul Calderone
c942064ee0
Stop using TravisCI for Python 2.7/Linux test coverage 2020-07-17 12:42:41 -04:00
Itamar Turner-Trauring
e77ab46549 Correct type. 2020-07-16 15:28:39 -04:00
Itamar Turner-Trauring
1f4cf403c6 Use minor for these sort of tickets. 2020-07-16 15:25:32 -04:00
Itamar Turner-Trauring
4da8e2ddee Merge branch '3342-base32-and-base62-to-python-3' into 3344.netstring-and-hashutil-to-python-3 2020-07-16 14:42:09 -04:00
Itamar Turner-Trauring
7abc54c429 Merge remote-tracking branch 'origin/master' into 3342-base32-and-base62-to-python-3 2020-07-16 14:21:42 -04:00
Jean-Paul Calderone
0ce6e562cb
Merge pull request #742 from chadwhitacre/3325.add-py36-to-ci
Add py36 to CI

Fixes: ticket:3325
2020-07-15 20:11:39 -04:00
Jean-Paul Calderone
c493396148
Merge pull request #740 from tahoe-lafs/3340-unused-code-in-util
Delete some dead code.

Fixes: ticket:3340
2020-07-15 20:08:41 -04:00
Itamar Turner-Trauring
7e7f771619 News file. 2020-07-15 15:00:44 -04:00
Itamar Turner-Trauring
841969de5a Merge remote-tracking branch 'origin/master' into 3342-base32-and-base62-to-python-3 2020-07-14 13:47:27 -04:00
Itamar Turner-Trauring
148d9a77ae News fragment. 2020-07-14 13:43:52 -04:00
Itamar Turner-Trauring
db41d5af6f
Merge pull request #743 from tahoe-lafs/3342-more-tests-for-base32-base62
Fixes https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3343
2020-07-14 13:41:20 -04:00
Itamar Turner-Trauring
fc73b7c793 News fragment. 2020-07-14 10:51:46 -04:00
Chad Whitacre
8e8a215b83 Is this it? towncrier just wants empty files? 2020-07-13 22:42:51 -04:00
Itamar Turner-Trauring
af916c3968
Merge branch 'master' into 3341-more-python-3-utils 2020-07-13 14:30:11 -04:00