Streamline python package setup

Author: codingjoe

.editorconfig

@@ -0,0 +1,21 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+end_of_line = lf
+max_line_length = 88
+
+[*.{json,yml,yaml,js,jsx}]
+indent_size = 2
+
+[LICENSE]
+insert_final_newline = false
+
+[Makefile]
+indent_style = tab

.checks.yml renamed to .fussyfox.yml

@@ -0,0 +1,6 @@
+include s3file/static/s3file/js/s3file.js
+prune tests
+prune .github
+exclude .fussyfox.yml
+exclude .travis.yml
+exclude .gitignore

MANIFEST.in

@@ -14,7 +14,9 @@ class S3FileInputMixin:
     """FileInput that uses JavaScript to directly upload to Amazon S3."""
 
     needs_multipart_form = False
-    upload_path = getattr(settings, 'S3FILE_UPLOAD_PATH', pathlib.PurePosixPath('tmp', 's3file'))
+    upload_path = getattr(
+        settings, 'S3FILE_UPLOAD_PATH', pathlib.PurePosixPath('tmp', 's3file')
+    )
     expires = settings.SESSION_COOKIE_AGE
 
     @property
@@ -30,7 +32,8 @@ def build_attrs(self, *args, **kwargs):
 
         accept = attrs.get('accept')
         response = self.client.generate_presigned_post(
-            self.bucket_name, str(pathlib.PurePosixPath(self.upload_folder, '${filename}')),
+            self.bucket_name,
+            str(pathlib.PurePosixPath(self.upload_folder, '${filename}')),
             Conditions=self.get_conditions(accept),
             ExpiresIn=self.expires,
         )

requirements-dev.txt

@@ -1,11 +1,12 @@
 [metadata]
 name = django-s3file
 author = Johannes Hoppe
-author-email = [email protected]
-summary = A lightweight file uploader input for Django and Amazon S3
-description-file = README.rst
-home-page = https://github.com/codingjoe/django-s3file
+author_email = [email protected]
+description = A lightweight file uploader input for Django and Amazon S3
+long_description = file: README.rst
+url = https://github.com/codingjoe/django-s3file
 license = MIT
+license_file = LICENSE
 classifier =
     Development Status :: 5 - Production/Stable
     Environment :: Web Environment
@@ -17,30 +18,62 @@ classifier =
     Topic :: Software Development
     Programming Language :: Python :: 3
 
-[files]
-packages =
-    s3file
-data_files =
-    s3file/static/ = s3file/static/*
+[options]
+include_package_data = True
+packages = find:
+install_requires =
+    django>=2.0
+    django-storages
+    boto3
+setup_requires =
+    setuptools_scm
+    pytest-runner
+tests_require =
+    pytest
+    pytest-cov
+    pytest-django
+    selenium
+
+[options.package_data]
+* = *.txt, *.rst, *.html, *.po
+
+[options.packages.find]
+exclude =
+    tests
+
+[bdist_wheel]
+universal = 1
+
+[aliases]
+test = pytest
 
 [tool:pytest]
-addopts = --tb=short -rxs
+addopts = --cov=s3file --cov-report xml --tb=short -rxs
 DJANGO_SETTINGS_MODULE=tests.testapp.settings
-norecursedirs = env docs .eggs
+
+[tox:tox]
+envlist = py{36,37}-dj{20,21,22,master}
+
+[testenv]
+deps=
+    dj20: https://github.com/django/django/archive/stable/2.0.x.tar.gz#egg=django
+    dj21: https://github.com/django/django/archive/stable/2.1.x.tar.gz#egg=django
+    dj22: https://github.com/django/django/archive/stable/2.2.x.tar.gz#egg=django
+    djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
+commands=
+    python setup.py test
 
 [flake8]
-max-line-length = 99
-exclude = */migrations/*,docs/*,env/*,.tox/*
+max-line-length=88
+exclude = venv,.tox,.eggs
 
 [pydocstyle]
-add-ignore = D1
-match-dir = (?!tests|env|\.).*
+add_ignore = D1
 
 [isort]
 atomic = true
-multi_line_output = 5
-line_length = 79
-skip = manage.py,.tox,env,.eggs
-known_first_party = s3file,tests
-known_third_party = django
+line_length = 88
+known_first_party = s3file, tests
+include_trailing_comma = True
+default_section=THIRDPARTY
 combine_as_imports = true

requirements.txt

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-setup(
-    setup_requires=['pbr'],
-    pbr=True,
-)
+setup(use_scm_version=True)

s3file/forms.py

@@ -59,7 +59,10 @@ def test_value_from_datadict_initial_data(self, filemodel):
         assert not form.is_valid()
 
     def test_file_does_not_exist_no_fallback(self, filemodel):
-        form = UploadForm(data={'file': 'foo.bar', 's3file': 'file'}, instance=filemodel)
+        form = UploadForm(
+            data={'file': 'foo.bar', 's3file': 'file'},
+            instance=filemodel,
+        )
         assert form.is_valid()
         assert form.cleaned_data['file'] == filemodel.file
 
@@ -110,14 +113,19 @@ def test_accept(self):
 
         widget = ClearableFileInput(attrs={'accept': 'image/*'})
         assert 'accept="image/*"' in widget.render(name='file', value='test.jpg')
-        assert ["starts-with", "$Content-Type", "image/"] in widget.get_conditions('image/*')
+        assert [
+                   "starts-with", "$Content-Type", "image/"
+               ] in widget.get_conditions('image/*')
 
         widget = ClearableFileInput(attrs={'accept': 'image/jpeg'})
         assert 'accept="image/jpeg"' in widget.render(name='file', value='test.jpg')
         assert {"Content-Type": 'image/jpeg'} in widget.get_conditions('image/jpeg')
 
         widget = ClearableFileInput(attrs={'accept': 'application/pdf,image/*'})
-        assert 'accept="application/pdf,image/*"' in widget.render(name='file', value='test.jpg')
+        assert 'accept="application/pdf,image/*"' in widget.render(
+            name='file',
+            value='test.jpg',
+        )
         assert ["starts-with", "$Content-Type", ""] in widget.get_conditions(
             'application/pdf,image/*')
         assert {"Content-Type": 'application/pdf'} not in widget.get_conditions(