Merge pull request #370 from compas-dev/black-line-len

Moving most config to pyproject.toml

Author: gonzalocasas

pyproject.toml

@@ -0,0 +1,26 @@
+[tool.black]
+line-length = 180
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+testpaths = ["src", "tests"]
+python_files = [
+    "test_*.py",
+    "*_test.py",
+    "tests.py"
+]
+addopts = "-ra --strict --doctest-glob=*.rst --tb=short"
+doctest_optionflags= "NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ALLOW_UNICODE ALLOW_BYTES"
+filterwarnings = "ignore::DeprecationWarning"
+
+[tool.pydocstyle]
+convention = "numpy"
+add-ignore = ["D100"]
+
+[tool.isort]
+force_single_line = true
+line_length = 180
+known_first_party = "compas_fab"
+default_section = "THIRDPARTY"
+forced_separate = "test_compas_fab"
+skip = ["__init__.py"]

requirements-dev.txt

@@ -1,16 +1,16 @@
 attrs>=19.3.0
-sphinx_compas_theme>=0.9
-sphinx>=1.6
-invoke>=0.14
+black
 bump2version>=1.0
 check-manifest>=0.36
 flake8
-autopep8
+invoke>=0.14
+isort
 pylint
-pytest>=4.6
 pytest_mock
 pytest-cov
+pytest>=6.0
+sphinx_compas_theme>=0.9
+sphinx>=1.6
 sybil
-isort
 twine
 -e .

setup.cfg

@@ -12,36 +12,3 @@ exclude =
     dist,
     src/compas_fab/backends/vrep/remote_api/*,
     src/compas_fab/ghpython/path_planning.py
-
-[pydocstyle]
-convention = numpy
-add-ignore = D100
-
-[tool:pytest]
-testpaths = src tests
-norecursedirs =
-    migrations
-
-python_files =
-    test_*.py
-    *_test.py
-    tests.py
-addopts =
-    -ra
-    --strict
-    --doctest-glob=\*.rst
-    --tb=short
-doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ALLOW_UNICODE ALLOW_BYTES
-filterwarnings =
-    ignore::DeprecationWarning
-
-[isort]
-force_single_line = True
-line_length = 180
-known_first_party = compas_fab
-default_section = THIRDPARTY
-forced_separate = test_compas_fab
-skip = migrations, __init__.py
-
-[coverage:run]
-branch = True

tasks.py

@@ -178,17 +178,17 @@ def test(ctx, checks=False, doctest=False, codeblock=False, coverage=False):
         check(ctx)
 
     with chdir(BASE_FOLDER):
-        pytest_args = ['pytest']
+        pytest_args = ["pytest"]
         if doctest:
-            pytest_args.append('--doctest-modules')
+            pytest_args.append("--doctest-modules")
         if coverage:
-            pytest_args.append('--cov=compas_fab')
+            pytest_args.append("--cov-branch --cov=compas_fab")
 
         ctx.run(" ".join(pytest_args))
 
         # Using --doctest-modules together with docs as the testpaths goes bananas
         if codeblock:
-            ctx.run('pytest docs')
+            ctx.run("pytest docs")
 
 
 @task