Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase with master 1.6.5+ #1

Open
wants to merge 181 commits into
base: master
Choose a base branch
from
Open

Rebase with master 1.6.5+ #1

Changes from 1 commit
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
ad3ce14
Py3.5 (#171)
jschneier Jul 11, 2016
18626fe
Update CHANGELOG for #171 [ci skip]
jschneier Jul 11, 2016
8b56221
Document AWS_QUERYSTRING_* settings. (#164)
martey Jul 11, 2016
77fba4e
Is not a fork anymore (#149)
camilonova Jul 11, 2016
cb1d709
Remove some vestigial language
jschneier Jul 11, 2016
3053816
SFTPStorage: Fix link to paramiko docs (#147)
nikolaik Jul 11, 2016
5639b45
Improved SFTP storage (#177)
ZuluPro Aug 1, 2016
29367fd
Improved DropBox storage (#174)
ZuluPro Aug 1, 2016
64af28d
Added FTP readlines and fix storage init argument (#175)
ZuluPro Aug 1, 2016
7e5e58f
Added info about AWS_S3_ENCRYPTION. (#172)
fala Aug 1, 2016
c8e902b
Added strict mode to utils.setting() (#176)
ZuluPro Aug 2, 2016
1fc2ef1
S3boto3 (#179)
jschneier Aug 2, 2016
fe2f9be
Update CHANGELOG for recent merges
jschneier Aug 2, 2016
d4c7c56
Release version 1.5.0
jschneier Aug 2, 2016
1c5b209
link to https version of docs (#184)
nikolas Aug 4, 2016
302aa74
Fix TZ awareness in S3Boto3Storage (#181)
JshWright Aug 4, 2016
13aa857
Fix broken gzip test
jschneier Aug 4, 2016
e4bce77
Update CHANGELOG for #181
jschneier Aug 5, 2016
8a5f40c
Django110 (#185)
jschneier Aug 5, 2016
eca46e5
Update amazon-S3.rst
a12k Apr 14, 2016
8ac7994
Fix #189 - preload_metadata option on s3boto3 (#190)
leonsmith Aug 18, 2016
78ec969
Update CHANGELOG
jschneier Aug 18, 2016
4f45144
Document supported versions of Django in setup.py (#192)
jdufresne Aug 21, 2016
5f28057
All storage classes are deconstructible (#193)
H72d Aug 26, 2016
b334a99
Add support for files > 5 gb with S3BotoStorage (#201)
btoueg Sep 13, 2016
217231d
CHANGELOG.rst for #194 and #201
jschneier Sep 13, 2016
9c3fd23
Freeze modification time when gzipping files to S3 (#120)
Sep 14, 2016
9963c5d
Use a constant for mtime in GzipFile for stable writes
jschneier Sep 14, 2016
48d0e67
CHANGELOG for #120
jschneier Sep 14, 2016
25f6554
Deprecate a whole bunch of unmaintained backends
jschneier Sep 14, 2016
9448344
Release version 1.5.1
jschneier Sep 14, 2016
ac1e1a5
Fix host access in SFTPStorage
jbittel Sep 16, 2016
e20f985
Merge pull request #204 from jbittel/sftp
ZuluPro Sep 16, 2016
40503ab
Add CHANGELOG for #204
jschneier Sep 26, 2016
2e23b72
Document AWS_S3_FILE_OVERWRITE
jschneier Sep 28, 2016
65c9f72
Document how to use CloudFront
Nov 25, 2015
ba497d4
Add location to the create_bucket parameters (#206)
nobe4 Sep 29, 2016
37ff23e
Fix supported Django versions in README (#210)
timgraham Oct 4, 2016
4c578a0
Add necessary steps for azure backend installation
aleccool213 Oct 17, 2016
66c9d6b
Merge pull request #220 from aleccool213/azure-docs
ZuluPro Oct 17, 2016
c366cbf
Use assertEqual in place of deprecated assertEquals (#223)
jdufresne Oct 30, 2016
cc78c56
Fix syntax of docs (#242)
ad-m Jan 11, 2017
ed45c80
Fix S3Boto3Storage to avoid race conditions in a multi-threaded WSGI …
jdufresne Jan 11, 2017
5d6b85e
Allow newer versions of pytest-cov for tests (#239)
jdufresne Jan 11, 2017
b749c09
Remove unnecessary '-' parsing from boto3 version (#237)
jdufresne Jan 11, 2017
07abcc9
Fix S3Boto3: Double localtime call Exception on modified_time when US…
piglei Jan 12, 2017
fb2d41f
Comment/code tweak
jschneier Jan 12, 2017
9bd76bc
Add CHANGELOG for #235 and link for #238
jschneier Jan 12, 2017
630825b
Fix _get_or_create_bucket to actually create bucket (#196)
linuxlewis Jan 12, 2017
2842378
CHANGELOG for #196
jschneier Jan 12, 2017
4de6387
Adding instructions for s3boto3 usage (#222)
tomchapin Jan 13, 2017
cdec7a2
Clarify which S3 backend should be used and remove some legacy docume…
jschneier Jan 13, 2017
a447233
Document AWS_LOCATION. Fixes #224
jschneier Jan 13, 2017
35bf3de
Note the documentation improvement in CHANGELOG
jschneier Jan 13, 2017
72cd5d6
Release version 1.5.2
jschneier Jan 13, 2017
61b26e1
Use Travis's builtin support for pip cache (#247)
jdufresne Jan 14, 2017
27479d2
Fix typos in Amazon S3 documentation (#246)
Jan 14, 2017
c75e3c8
add apache-libcloud installation note
oonid Jan 22, 2017
b6348d2
Change badge image url to shields.io (#253)
AyumuKasuga Jan 23, 2017
7d99131
Merge pull request #251 from oonid/patch-1
ZuluPro Jan 24, 2017
3e5a0c7
Update documentation copyright years
akx Jan 31, 2017
880ffc5
Merge pull request #261 from valohai/years
ZuluPro Feb 9, 2017
7bb7e2b
#257: S3Boto3Storage bucket_params (#258)
mattayes Feb 28, 2017
06e9224
Add a test that creating a bucket passes in all params: ref #257
jschneier Feb 28, 2017
3e7fff0
Add #257 to CHANGELOG
jschneier Feb 28, 2017
8b506f3
Document AWS_S3_OBJECT_PARAMETERS and mention AWS_HEADERS is boto bac…
jschneier Feb 28, 2017
bce67ed
Use the svg badges in the readme
jschneier Mar 2, 2017
e2edbb0
Fix rst syntax issue
jschneier Mar 3, 2017
c2e7dac
Document AWS_IS_GZIPPED and GZIP_CONTENT_TYPES
jschneier Mar 3, 2017
558e872
Use the univeral flag with bdist_wheel
jschneier Mar 3, 2017
969aa86
Minor code cleanup
jschneier Mar 13, 2017
3c3746b
Remove a whole bunch of deprecated storage backends (#280)
jschneier Mar 13, 2017
25b1b28
CHANGELOG for #280
jschneier Mar 13, 2017
043b91b
Correct example in documentation of S3 parameters (#275)
Flimm Mar 13, 2017
94281ff
Document extra S3 params. (#284)
longhotsummer Mar 31, 2017
a9c4a3a
Add support for AWS_SESSION_TOKEN and AWS_SECURITY_TOKEN (#283)
bxm156 Mar 31, 2017
1ad4890
Update CHANGELOG for #283
jschneier Mar 31, 2017
7977533
Added AWS_S3_CALLING_FORMAT to AWS S3 documentation (#288)
niharathomas Apr 3, 2017
2529729
Don't break if we aren't using session tokens
jschneier Apr 4, 2017
7f5838c
Style cleanup
jschneier Apr 4, 2017
01f105e
Apply smart_text on file names in python2.7 [s3boto3] (#217)
g-as Apr 4, 2017
d032e47
Update CHANGELOG for #217, #217 and fix typo
jschneier Apr 4, 2017
ab574fd
Fix collectstatic tz handling (#290)
jschneier Apr 6, 2017
6010899
Add testing for Django 1.11 and Python 3.6 (#295)
jdufresne Apr 8, 2017
f471345
Update to Amazon S3 Documentation (#294)
Apr 8, 2017
304ac43
Update CHANGELOG for recent merges
jschneier Apr 8, 2017
2f6f6e7
Add Google Cloud Storage backend using the gcloud-python library
eirsyl Apr 26, 2016
85c53b5
Rename to gcloud, and import google.cloud
scjody Dec 14, 2016
b3ec8b5
Add @deconstructible to GoogleCloudStorage
scjody Dec 14, 2016
1ddc32b
Remove MIME type guessing
scjody Jan 5, 2017
8105cba
Fix name in error message
scjody Jan 5, 2017
7cb67d5
Move clean_name to utils
scjody Jan 5, 2017
159b003
Move clean_name tests to test_utils
scjody Jan 5, 2017
621391a
Use utils.clean_name()
scjody Jan 5, 2017
058972f
Remove _normalize_name
scjody Jan 5, 2017
cbe2530
Remove unused import and class variable
scjody Jan 9, 2017
189233a
Move safe_join to utils
scjody Jan 11, 2017
3829f9a
Add and use _normalize_name() like in s3boto
scjody Jan 11, 2017
e16800e
Remove unused function
scjody Jan 11, 2017
0d61513
Only create a Blob in write mode
scjody Jan 11, 2017
dfe90b5
Add tests of Google Cloud Storage
scjody Jan 11, 2017
9ad54cb
Add documentation for Google Cloud Storage
scjody Jan 11, 2017
b37a9cb
Import Storage directly
scjody Jan 11, 2017
74f3841
Use byte string for test read
scjody Jan 11, 2017
e8fc9fb
Add Google Cloud Storage authors
scjody Feb 6, 2017
737ac57
Address review comments
scjody Apr 11, 2017
44f39cd
Fix modified_time; add get_modified_time
scjody Apr 11, 2017
bb9307f
Test and fix unicode handling
scjody Apr 11, 2017
acbe31d
Address further review comments
scjody Apr 12, 2017
02e5829
Remove *args and **kwargs
scjody Apr 12, 2017
1d2e206
Add deprecation notice to 'gs' backend
scjody Apr 12, 2017
6797d93
Added project keyword to support GCS. See https://libcloud.readthedoc…
slightfoot Apr 12, 2017
11c1089
Update CHANGELOG style and for #269
jschneier Apr 11, 2017
699233a
Remove Mercurial ignore
jschneier Apr 11, 2017
9ba4880
Fixes #297
jschneier Apr 12, 2017
7d1e5e0
Adds support for already gzipped content to S3 storage to the boto3 b…
ldng Apr 13, 2017
f28a637
Update CHANGELOG for #263 & #264
jschneier Apr 13, 2017
ee0e575
Highlight the boto3 backend in the README
jschneier Apr 13, 2017
e52a127
Properly encode Windows paths in Dropbox backend
jschneier Apr 15, 2017
bbb203e
Print deprecation notice as warning
scjody Apr 16, 2017
598753b
Simplify ACL options and improve ACL documentation
scjody Apr 18, 2017
7ee116b
Address final PR comments
scjody Apr 19, 2017
61806eb
Merge pull request #236 from plotly/google-cloud-storage
scjody Apr 19, 2017
fe0834c
Update CHANGELOG
jschneier Apr 15, 2017
51c7d60
Update CHANGELOG for #236
jschneier Apr 19, 2017
ddcdf9e
Add missing gcloud test requirements (#307)
faxioman May 5, 2017
5cce7c9
Fix issue #118 (#325)
sallyruthstruik Jun 2, 2017
c297bde
Update CHANGELOG for #325
jschneier Jun 2, 2017
810b9ba
Add flake8 to tox and Travis CI configuration
jdufresne Jun 3, 2017
f2fb535
Alphabetize requirements file
jdufresne Jun 5, 2017
895a068
Fix S3 safe_join() to allow colons
jdufresne May 19, 2017
1755392
Remove unnecessary __all__ from test files
jdufresne Jun 5, 2017
153aa40
Fix minor bug from PR #325 (#330)
sallyruthstruik Jun 7, 2017
259beac
Make linter happy, update CHANGELOG for #322 and #325
jschneier Jun 7, 2017
f552af8
Update dropbox.rst
lucasrcezimbra Jun 2, 2017
d8e4afc
Improved S3 docs about Signature version
jibaku Jun 8, 2017
b70e42c
Avoid incorrect behaviour of S3BotoStorage.exists
lukeburden Jun 16, 2017
e46f306
Dropbox api upgrade (#273)
jschneier Jun 20, 2017
50dec4a
Update CHANGELOG for #273, remove thanks noise
jschneier Jun 20, 2017
75a9bf6
Default signature version (#335)
jschneier Jun 21, 2017
5ab340d
Release version 1.6
jschneier Jun 21, 2017
e89db45
Drop support for Django 1.9
jschneier Jun 21, 2017
39a2a7a
Fix safe_join to allow joining a base path with an empty string (#336)
jdufresne Jun 22, 2017
b3419b3
Integrate isort and use it to consistently sort imports across files …
jdufresne Jun 22, 2017
e3f7a0a
Sync dependency versions between requirements-tests.txt and tox.ini (…
jdufresne Jun 22, 2017
4f05887
Update CHANGELOG
jschneier Jun 22, 2017
e516fbb
Release version 1.6.1
jschneier Jun 22, 2017
39f9b80
Use dict comprehension and set literals
jdufresne Jun 22, 2017
112ae43
Fix safe_join to handle trailing slash with intermediate paths (#341)
jdufresne Jun 22, 2017
aa0cd44
Fix GSBotoStorage connection kwargs (#342)
jschneier Jun 22, 2017
98556ab
Update CHANGELOG for #342
jschneier Jun 22, 2017
c5c0519
Release version 1.6.2
jschneier Jun 22, 2017
309f066
Fix CHANGELOG link
jschneier Jun 22, 2017
f6c615b
Remove the rest of the thanks noise
jschneier Jun 22, 2017
744339f
Revert default AWS_S3_SIGNATURE_VERSION (#344)
jschneier Jun 23, 2017
fe0ee53
Update CHANGELOG for #344
jschneier Jun 23, 2017
ef2c0e3
Release version 1.6.3
jschneier Jun 23, 2017
e101329
Consolidate flake8 & isort tox envs to a single lint env
jdufresne Jun 23, 2017
51f4b26
Fix Dropbox tests to work with version 8.0.0 (#347)
jdufresne Jun 25, 2017
9dab0c6
Simplify S3Boto3Storage.exists() by using boto3's head_object()
jdufresne Jun 24, 2017
b5027d2
Remove unnecessary indirection in s3boto3 backend
jdufresne Jun 26, 2017
d96107d
Add MIME types to gcloud storage
May 17, 2017
a92e7a6
Merge pull request #320 from Sgiath/303-gcloud-mime-type
scjody Jul 2, 2017
609c1ab
Fix DropBoxBackend.url (#357)
jschneier Jul 7, 2017
68eae0b
Update CHANGELOG for #320
jschneier Jul 7, 2017
e88dd98
Fix some typos
jschneier Jul 7, 2017
4501f99
Fix S3Boto3Storage access when AWS_PRELOAD_METADATA = True
Jul 25, 2017
c73680e
Fix for file-like objects without names (#368)
jschneier Jul 26, 2017
829f831
Update CHANGELOG for #195 #368
jschneier Jul 26, 2017
0a2c558
Add import of default_storage to amazon-S3.rst
Curzy Jul 27, 2017
142e822
Create a session/connect per thread for s3boto3 (#358)
tomkins Jul 27, 2017
6f8ef37
Update CHANGELOG for #268 #358
jschneier Jul 27, 2017
523ab59
Refs #366 -- Duck-type when returning size
jschneier Jul 27, 2017
8eaa144
Style and grammar updates
jschneier Jul 27, 2017
100c9b7
Release version 1.6.4
jschneier Jul 27, 2017
c7d1000
Add failing test which tries to save the same content twice (#371)
melwas Jul 31, 2017
b965fb5
Ensure that we're reading the file from the start (#373)
mr-bo-jangles Aug 1, 2017
06cf820
Fix the mtime when gzipping in S3Boto3Storage (#374)
rehandalal Aug 1, 2017
dc3902d
Update CHANGELOG and release 1.6.5
jschneier Aug 1, 2017
adefe32
Dropbox: large file support and a regression fix (#379)
maxmalysh Aug 14, 2017
178dca6
Merge remote-tracking branch 'upstream/master'
Feb 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update amazon-S3.rst
  • Loading branch information
@a12k @jschneier
a12k authored and jschneier committed Aug 5, 2016
commit eca46e509843f39137843441c33f1c51812a909c
4 changes: 4 additions & 0 deletions docs/backends/amazon-S3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ Your Amazon Web Services secret access key, as a string.

Your Amazon Web Services storage bucket name, as a string.

``AWS_DEFAULT_ACL`` (optional)

If set to ``private`` changes uploaded file's Access Control List from the default permission ``public-read`` to give owner full control and remove read access from everyone else.

``AWS_AUTO_CREATE_BUCKET`` (optional)

If set to ``True`` the bucket specified in ``AWS_STORAGE_BUCKET_NAME`` is automatically created.
Expand Down