From 1de93b633a9f351649a47c62ee3af0fa1da873e9 Mon Sep 17 00:00:00 2001 From: Kiy4h Date: Sat, 10 Nov 2018 12:52:20 +0700 Subject: [PATCH] .moban.yml: Add .editorconfig Closes https://github.com/coala/corobo/issues/331 --- .editorconfig | 19 +++++++++++++++++++ .gitignore | 3 +++ .moban.yaml | 1 + setup.cfg | 3 +++ test-requirements.txt | 10 ++++++++-- 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..1d0d5cbc --- /dev/null +++ b/.editorconfig @@ -0,0 +1,19 @@ +# top-most EditorConfig file +root = true + +[**] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +max_line_length = 80 +trim_trailing_whitespace = true + +# Set default indentation for python files +[*.py] +indent_size = 4 + +# Override trailing whitespace for markdown files +[*.md] +trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index b33fa492..467bfb5c 100644 --- a/.gitignore +++ b/.gitignore @@ -115,6 +115,9 @@ venv.bak/ .dmypy.json dmypy.json +# Pyre type checker +.pyre/ + # VirtualEnv rules # Virtualenv # http://iamzed.com/2009/05/07/a-primer-on-virtualenv/ diff --git a/.moban.yaml b/.moban.yaml index 16bc40f4..19f63a1c 100644 --- a/.moban.yaml +++ b/.moban.yaml @@ -33,6 +33,7 @@ configuration: configuration_dir: ../coala-mobans/ targets: - .gitignore: coala-gitignore.jj2 + - .editorconfig: .editorconfig.jj2 - setup.cfg: setup.cfg.jj2 - requirements.txt: requirements.txt.jj2 - test-requirements.txt: corobo-test-requirements.txt.jj2 diff --git a/setup.cfg b/setup.cfg index 787ab58f..0e0df071 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,6 +29,9 @@ doctest_optionflags = ELLIPSIS IGNORE_EXCEPTION_DETAIL +env = + PYTEST=1 + reqsfilenamepatterns = requirements.txt test-requirements.txt diff --git a/test-requirements.txt b/test-requirements.txt index 5438ef46..40fe81d8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,8 @@ +# Radon requires colorama<0.4, but many other tools listed here will +# install a later version, so when pip tries to install radon it will +# ignore the dependency version difference and only fail when the +# bear is loaded. +colorama<0.4 # coverage 4.4.2 broke compatibility with coverage-config-reload-plugin # and thus broke https://github.com/jayvdb/coverage_env_plugin . # See https://github.com/jayvdb/coverage_config_reload_plugin/issues/1 @@ -5,7 +10,7 @@ coverage==4.4.1 coverage-env-plugin~=0.1 coverage-config-reload-plugin~=0.2 codecov~=2.0.5 -moban~=0.2.4 +moban~=0.3.1 packaging~=16.8 pytest~=3.6.1 pytest-cov~=2.4 @@ -15,11 +20,12 @@ pytest-instafail~=0.3.0 pytest-mock~=1.1 pytest-profiling~=1.3.0 pytest-reorder~=0.1.0 -pytest-reqs~=0.0.6 +git+https://github.com/jayvdb/pytest-reqs@coala#egg=pytest-reqs pytest-timeout~=1.3.0 pytest-travis-fold~=1.3.0 pytest-xdist~=1.15 requests-mock~=1.2 +ipdb~=0.11 pip<10 wheel~=0.29 vcrpy