Update test configs and setup formatting

Author: Rami Chowdhury

.pre-commit-config.yaml

@@ -3,28 +3,22 @@ default_language_version:
 fail_fast: true
 repos:
   - repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: c8bad492e1b1d65d9126dba3fe3bd49a5a52b9d6  # v2.1.0
+    rev: v2.1.0
     hooks:
-    -   id: check-merge-conflict
-    -   id: check-yaml
-    -   id: debug-statements
-    -   id: end-of-file-fixer
-        exclude: ^docs/.*$
-    -   id: trailing-whitespace
-        exclude: README.md
+    - id: check-merge-conflict
+    - id: check-yaml
+    - id: debug-statements
+    - id: end-of-file-fixer
+      exclude: ^docs/.*$
+    - id: trailing-whitespace
+      exclude: README.md
+    - id: flake8
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.701
     hooks:
       - id: mypy
-        language_version: python3.7
         args: [--ignore-missing-imports, --no-strict-optional]
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.0.0
-    hooks:
-      - id: flake8
-        language_version: python3.7
   - repo: https://github.com/python/black
     rev: stable
     hooks:
       - id: black
-        language_version: python3.7

setup.py

@@ -7,10 +7,13 @@
     "pydantic>=0.25,<0.30",
 ]
 
-tests_require = [
-    "pytest==4.6.3",
-    "pytest-cov==2.7.1",
+dev_requirements = [
+    "tox==3.7.0",  # Should be kept in sync with tox.ini
+    "mypy==0.701",
+    "black==19.3b0",
+    "pre-commit==1.14.4",
 ]
+test_requirements = ["pytest==4.6.3", "pytest-cov==2.7.1"]
 
 setup(
     name="graphene-pydantic",
@@ -32,12 +35,6 @@
     keywords="api graphql protocol rest relay graphene pydantic model",
     packages=find_packages(exclude=["tests"]),
     install_requires=requirements,
-    extras_require={
-        "dev": [
-            "tox==3.7.0",  # Should be kept in sync with tox.ini
-            "pre-commit==1.14.4",
-        ],
-        "test": tests_require,
-    },
-    tests_require=tests_require,
+    extras_require={"dev": dev_requirements, "test": test_requirements},
+    tests_require=test_requirements,
 )

tox.ini

@@ -1,20 +1,19 @@
 [tox]
 envlist = pre-commit,py{36,37}
-skipsdist = true
+skipsdist = {env:TOXBUILD:false}
 
 [testenv]
 deps =
+    .[dev]
     .[test]
-    mypy
-    black
 commands =
     pytest tests/ --cov-report=term-missing --cov=graphene_pydantic {posargs}
     mypy --ignore-missing-imports --no-strict-optional -m graphene_pydantic
     black --check graphene_pydantic
 
 [testenv:pre-commit]
-basepython=python3.7
+basepython = python3.7
 deps =
     .[dev]
 commands =
-pre-commit {posargs:run --all-files}
+    pre-commit {posargs:run --all-files}