Skip to content

Commit ea11e3c

Browse files
authored
Bump deps + version.
1 parent dc74335 commit ea11e3c

File tree

9 files changed

+10073
-5811
lines changed

9 files changed

+10073
-5811
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ npm-debug.log
1414
.tox/
1515
.env
1616
.cache
17-
settings.json
17+
settings.json
18+
.parcel-cache

package-lock.json

Lines changed: 10053 additions & 5745 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"name": "django-s3direct",
3-
"version": "1.1.8",
3+
"version": "2.0.0",
44
"description": "Add direct uploads to S3 functionality with a progress bar to file input fields.",
55
"directories": {
66
"example": "example"
77
},
88
"dependencies": {
9-
"js-cookie": "^2.2.1",
109
"evaporate": "^2.1.4",
10+
"js-cookie": "^3.0.1",
1111
"sha.js": "^2.4.11",
12-
"spark-md5": "^3.0.1"
12+
"spark-md5": "^3.0.2"
1313
},
1414
"devDependencies": {
15-
"parcel-bundler": "^1.12.4",
16-
"prettier": "^2.0.5"
15+
"parcel": "^2.2.1",
16+
"prettier": "^2.5.1"
1717
},
1818
"scripts": {
1919
"test": "python runtests.py",
20-
"build": "parcel build --no-source-maps src/index.js -d s3direct/static/s3direct/dist/",
21-
"watch": "parcel watch src/index.js --hmr-port 8001 -d s3direct/static/s3direct/dist/",
20+
"build": "parcel build --no-source-maps src/index.js --dist-dir s3direct/static/s3direct/dist/",
21+
"watch": "parcel watch src/index.js --hmr-port 8001 --dist-dir s3direct/static/s3direct/dist/",
2222
"serve": "python example/manage.py runserver 0.0.0.0:8000",
2323
"yapf": "yapf s3direct/ --recursive --in-place",
2424
"prettier": "prettier src/**/*.js --write --single-quote",
@@ -45,4 +45,4 @@
4545
"url": "https://github.com/bradleyg/django-s3direct/issues"
4646
},
4747
"homepage": "https://github.com/bradleyg/django-s3direct#readme"
48-
}
48+
}

s3direct/static/s3direct/dist/index.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

s3direct/static/s3direct/dist/index.js

Lines changed: 1 addition & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

s3direct/tests.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,8 @@ def test_signing(self):
447447
def test_signing_with_custom_region(self):
448448
dest = 'custom-region-bucket'
449449
custom_region = self.get_custom_region_from_s3_dests(dest)
450-
string_to_sign, signing_date = self.create_dummy_signing_request(region=custom_region)
450+
string_to_sign, signing_date = self.create_dummy_signing_request(
451+
region=custom_region)
451452
response = self.client.post(
452453
reverse('s3direct-signing'),
453454
data={

s3direct/urls.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44

55
urlpatterns = [
66
path('get_upload_params/', get_upload_params, name='s3direct'),
7-
path('get_aws_v4_signature/', generate_aws_v4_signature, name='s3direct-signing'),
7+
path('get_aws_v4_signature/',
8+
generate_aws_v4_signature,
9+
name='s3direct-signing'),
810
]

s3direct/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ def generate_aws_v4_signature(request):
119119
resp = json.dumps({'error': 'Permission denied.'})
120120
return HttpResponseForbidden(resp, content_type='application/json')
121121

122-
region = dest.get('region') or getattr(settings, 'AWS_S3_REGION_NAME', None)
122+
region = dest.get('region') or getattr(settings, 'AWS_S3_REGION_NAME',
123+
None)
123124
if not region:
124125
resp = json.dumps({'error': 'S3 region config missing.'})
125126
return HttpResponseServerError(resp, content_type='application/json')

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
url=package['homepage'],
2121
packages=['s3direct'],
2222
include_package_data=True,
23-
install_requires=['django>=1.8'],
23+
install_requires=['django>=3.0'],
2424
zip_safe=False,
2525
classifiers=[
2626
'Development Status :: 4 - Beta',
@@ -29,7 +29,6 @@
2929
'Intended Audience :: Developers',
3030
'License :: OSI Approved :: MIT License',
3131
'Operating System :: OS Independent',
32-
'Programming Language :: Python :: 2.7',
3332
'Programming Language :: Python :: 3.4',
3433
'Programming Language :: Python :: 3.5',
3534
'Programming Language :: Python :: 3.6',

0 commit comments

Comments
 (0)