Merge pull request #21 from adamboche/isort

Update project metadata

.pre-commit-config.yaml

@@ -0,0 +1,26 @@
+repos:
+  - repo: https://github.com/ambv/black
+    rev: 19.3b0
+    hooks:
+      - id: black
+        language_version: python3.7
+        # override until resolved: https://github.com/ambv/black/issues/402
+        files: \.pyi?$
+        types: []
+
+  - repo: https://github.com/asottile/seed-isort-config
+    rev: v1.9.1
+    hooks:
+      - id: seed-isort-config
+
+  - repo: https://github.com/pre-commit/mirrors-isort
+    rev: v4.3.20
+    hooks:
+      - id: isort
+        language_version: python3.7
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.2.3
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer

CONTRIBUTING.rst

@@ -70,7 +70,7 @@ For merging, you should:
 
 1. Include passing tests (run ``tox``) [1]_.
 2. Update documentation when there's new API, functionality etc.
-3. Add a note to ``CHANGELOG.rst`` about the changes.
+3. Add a file in ``changelog.d/`` describing the changes. The filename should be ``{id}.{type}.rst``, where ``{id}`` is the number of the GitHub issue or pull request and ``{type}`` is one of ``breaking`` (for breaking changes), ``deprecation`` (for deprecations), or ``change`` (for non-breaking changes). For example, to add a new feature requested in GitHub issue #1234, add a file called ``changelog.d/1234.change.rst`` describing the change.
 4. Add yourself to ``AUTHORS.rst``.
 
 .. [1] If you don't have all the necessary python versions available locally you can rely on Travis - it will

changelog.d/towncrier_template.rst

@@ -34,4 +34,3 @@ No significant changes.
 {% endif %}
 {% endfor %}
 ----
-

pyproject.toml

@@ -31,10 +31,21 @@
         showcontent = true
 
 
-[tool.isort]
-
-force_single_line=true
-lines_after_imports=2
-
-not_skip="__init__.py"
-known_first_party="marshmallow_union"
+[tool.black]
+
+include = '\.pyi?$'
+exclude = '''
+/(
+    \.eggs
+  | \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.?venv
+  | _build
+  | buck-out
+  | build
+  | dist
+
+)/
+'''

requirements.in

@@ -1,3 +1 @@
 marshmallow>=3.0.0rc6
-
-

setup.cfg

@@ -24,12 +24,15 @@ addopts =
 
 [isort]
 force_single_line = True
+lines_after_imports=2
 line_length = 120
 known_first_party = marshmallow_union
 default_section = THIRDPARTY
 forced_separate = test_marshmallow_union
 not_skip = __init__.py
 skip = migrations
+known_third_party=marshmallow,pytest,requests,setuptools
+
 
 
 [check-manifest]
@@ -44,3 +47,4 @@ ignore =
   pyproject.toml
   changelog.d
   changelog.d/*
+  .pre-commit-config.yaml