Commit graph

47 commits

Author SHA1 Message Date
Michael Kaye
fa0194e225
Merge pull request #26 from matrix-org/michaelkaye/move_to_non-binary_psycopg2
Move to non-binary psycopg2 dependency
2019-10-18 15:53:23 +01:00
Michael Kaye
916790767b Move to non-binary setup.py 2019-10-03 17:53:57 +01:00
Michael Kaye
339a72dbb4
Merge pull request #27 from matrix-org/michaelkaye/no_py27
Don't test against py2.7
2019-10-03 17:53:21 +01:00
Michael Kaye
675d6c65e9 Ensure we still perform "packaging" test 2019-10-03 17:47:04 +01:00
Michael Kaye
9f39da09a9 Don't test against py2.7 2019-10-03 17:46:03 +01:00
Michael Kaye
d42a38dea9
Merge pull request #17 from rkfg/patch-1
Support intelligent tiering
2019-06-10 12:14:41 +01:00
Michael Kaye
266c2ace4e
Merge pull request #20 from matrix-org/michaelkaye/use_boto3_session_from_localdata
Use boto3 session from localdata.
2019-06-10 12:12:03 +01:00
Michael Kaye
e56e98c6df
Merge pull request #19 from matrix-org/michaelkaye/docs_and_deprecations
Documentation and deprecation warnings
2019-06-10 12:11:43 +01:00
Michael Kaye
b0c94ff56e Use boto3 session from localdata.
This prevents issues when the thread-unsafe Session() is
used by multiple threads by allocating one in local_data.
2019-06-06 09:57:49 +01:00
Michael Kaye
cea4154788 Move to safe_yaml per https://msg.pyyaml.org/load 2019-06-05 10:01:22 +01:00
Michael Kaye
00d3697e63 Add more documentation, correct line endings. 2019-06-05 10:01:09 +01:00
Michael Kaye
ad284721a0
Merge pull request #18 from matrix-org/michaelkaye/add_cleanup_script
Add a s3_media_upload script
2019-06-04 14:47:12 +01:00
rkfg
ad979a6bea Support intelligent tiering 2019-06-04 09:38:43 +03:00
Michael Kaye
fcfc95d0e6 Add a s3_media_upload script 2019-06-03 15:06:06 +01:00
Erik Johnston
197709f1f0
Merge pull request #16 from Sharparam/feature/improvements
Generalize and improve threading
2019-05-22 14:32:50 +01:00
Adam Hellberg
af9ee9df53
Fix test_s3.py to work with python 2 2019-03-14 23:10:00 +01:00
Adam Hellberg
5fa3b097dc
Update README 2019-03-14 22:56:23 +01:00
Adam Hellberg
dd1d03f955
Fix line too long 2019-03-14 22:54:41 +01:00
Adam Hellberg
f4df1a69eb
Allow configuration of region and access keys
Adds the option to set more boto3 options: region_name,
aws_access_key_id, and aws_secret_access_key. This makes it easier to
configure without having to be careful about some CLI tool having the
correct configuration. Also allows setting the region name.
2019-03-14 22:51:16 +01:00
Adam Hellberg
30c30447e7
Merge remote-tracking branch 'djmaze/master' into feature/improvements 2019-03-14 22:43:28 +01:00
Amber Brown
5df69d7201
Fix a Py3 issue and package & test it better (#15) 2018-10-23 20:48:22 +11:00
Martin Honermeyer
05d9bf6bd6 Create a separate boto3 session for each file store thread
This prevents threading problems, see
https://boto3.amazonaws.com/v1/documentation/api/latest/guide/resources.html#multithreading-multiprocessing.
2018-09-13 23:37:21 +02:00
Erik Johnston
a082503444
Merge pull request #10 from matrix-org/michaelkaye/add_boto3_dependency
add boto3 as a dependency
2018-08-23 19:03:13 +01:00
Michael Kaye
d8c6a807f5 add boto3 as a dependency 2018-08-23 18:55:50 +01:00
Erik Johnston
2af74f2e28
Merge pull request #9 from matrix-org/erikj/push_producer
Convert to being PushProducer and add tests
2018-08-23 15:50:10 +01:00
Erik Johnston
ba5d7856d1 Fix incorrect arguments 2018-08-23 14:46:46 +01:00
Erik Johnston
507a6d7e42 Add TravisCI 2018-08-23 13:26:11 +01:00
Erik Johnston
98a7c55ea2 Add tests 2018-08-23 13:26:08 +01:00
Erik Johnston
005f857917 Factor out generic streaming from s3 specific 2018-08-23 12:52:27 +01:00
Erik Johnston
1314baff14 Convert to be a PushProducer 2018-08-23 11:01:36 +01:00
Michael Kaye
931fd197cf
Merge pull request #8 from matrix-org/hawkowl/packaging
Add some packaging
2018-08-21 16:44:04 +01:00
Amber Brown
6abb9aefb7 add some packaging 2018-08-22 00:30:22 +10:00
Saad Rhoulam
503fd7ba38 Generalize for usage in other S3-like services. 2018-08-21 01:20:24 -04:00
Erik Johnston
54c58922de
Merge pull request #5 from matrix-org/erikj/404_correctly
Correctly catch 404 errors
2018-03-14 13:49:40 +00:00
Erik Johnston
4a1356c0b2 Correctly catch 404 errors
The docs are super unclear on how one should catch a missing file
exception, but empirically this should catch the errors we're seeing.
2018-03-14 12:09:41 +00:00
Erik Johnston
86f5f6390f
Merge pull request #4 from matrix-org/erikj/allow_specifying_storage_class
Add storage class config option
2018-02-16 11:03:27 +00:00
Erik Johnston
925d1c602b Add storage class config option 2018-02-13 16:59:28 +00:00
Erik Johnston
bcfc674144
Merge pull request #3 from matrix-org/erikj/readme
Add README
2018-02-13 14:17:45 +00:00
Erik Johnston
303b9690c6
Merge pull request #2 from matrix-org/erikj/upload
Implement uploading of files to s3
2018-02-13 13:58:51 +00:00
Erik Johnston
bb0c485b29 Add README 2018-02-13 13:57:56 +00:00
Erik Johnston
49414477a0 Implement uploading of files to s3 2018-02-12 15:06:49 +00:00
Erik Johnston
0b66aa8ed9
Merge pull request #1 from matrix-org/erikj/download
Implement downloading files from S3
2018-02-12 15:04:51 +00:00
Erik Johnston
0e0c652212 Fix up comment 2018-02-12 13:50:47 +00:00
Erik Johnston
231426db5f Reorder file 2018-02-12 13:50:21 +00:00
Erik Johnston
c1239fbea3 Correctly handle logcontexts 2018-02-12 13:49:43 +00:00
Erik Johnston
b6743e6d7b Implement downloading files from S3 2018-02-07 11:39:58 +00:00
Erik Johnston
c69d89ac11
Initial commit 2018-02-07 11:13:13 +00:00