Skip to content

Commit

Permalink
Bump deps + version.
Browse files Browse the repository at this point in the history
  • Loading branch information
bradleyg authored Jan 30, 2022
1 parent dc74335 commit ea11e3c
Show file tree
Hide file tree
Showing 9 changed files with 10,073 additions and 5,811 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ npm-debug.log
.tox/
.env
.cache
settings.json
settings.json
.parcel-cache
15,798 changes: 10,053 additions & 5,745 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"name": "django-s3direct",
"version": "1.1.8",
"version": "2.0.0",
"description": "Add direct uploads to S3 functionality with a progress bar to file input fields.",
"directories": {
"example": "example"
},
"dependencies": {
"js-cookie": "^2.2.1",
"evaporate": "^2.1.4",
"js-cookie": "^3.0.1",
"sha.js": "^2.4.11",
"spark-md5": "^3.0.1"
"spark-md5": "^3.0.2"
},
"devDependencies": {
"parcel-bundler": "^1.12.4",
"prettier": "^2.0.5"
"parcel": "^2.2.1",
"prettier": "^2.5.1"
},
"scripts": {
"test": "python runtests.py",
"build": "parcel build --no-source-maps src/index.js -d s3direct/static/s3direct/dist/",
"watch": "parcel watch src/index.js --hmr-port 8001 -d s3direct/static/s3direct/dist/",
"build": "parcel build --no-source-maps src/index.js --dist-dir s3direct/static/s3direct/dist/",
"watch": "parcel watch src/index.js --hmr-port 8001 --dist-dir s3direct/static/s3direct/dist/",
"serve": "python example/manage.py runserver 0.0.0.0:8000",
"yapf": "yapf s3direct/ --recursive --in-place",
"prettier": "prettier src/**/*.js --write --single-quote",
Expand All @@ -45,4 +45,4 @@
"url": "https://github.com/bradleyg/django-s3direct/issues"
},
"homepage": "https://github.com/bradleyg/django-s3direct#readme"
}
}
2 changes: 1 addition & 1 deletion s3direct/static/s3direct/dist/index.css

Large diffs are not rendered by default.

52 changes: 1 addition & 51 deletions s3direct/static/s3direct/dist/index.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion s3direct/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,8 @@ def test_signing(self):
def test_signing_with_custom_region(self):
dest = 'custom-region-bucket'
custom_region = self.get_custom_region_from_s3_dests(dest)
string_to_sign, signing_date = self.create_dummy_signing_request(region=custom_region)
string_to_sign, signing_date = self.create_dummy_signing_request(
region=custom_region)
response = self.client.post(
reverse('s3direct-signing'),
data={
Expand Down
4 changes: 3 additions & 1 deletion s3direct/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@

urlpatterns = [
path('get_upload_params/', get_upload_params, name='s3direct'),
path('get_aws_v4_signature/', generate_aws_v4_signature, name='s3direct-signing'),
path('get_aws_v4_signature/',
generate_aws_v4_signature,
name='s3direct-signing'),
]
3 changes: 2 additions & 1 deletion s3direct/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ def generate_aws_v4_signature(request):
resp = json.dumps({'error': 'Permission denied.'})
return HttpResponseForbidden(resp, content_type='application/json')

region = dest.get('region') or getattr(settings, 'AWS_S3_REGION_NAME', None)
region = dest.get('region') or getattr(settings, 'AWS_S3_REGION_NAME',
None)
if not region:
resp = json.dumps({'error': 'S3 region config missing.'})
return HttpResponseServerError(resp, content_type='application/json')
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
url=package['homepage'],
packages=['s3direct'],
include_package_data=True,
install_requires=['django>=1.8'],
install_requires=['django>=3.0'],
zip_safe=False,
classifiers=[
'Development Status :: 4 - Beta',
Expand All @@ -29,7 +29,6 @@
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
Expand Down

0 comments on commit ea11e3c

Please sign in to comment.