summary refs log tree commit diff stats
diff options
context:
space:
mode:
authornfnty <git@nfnty.se>2016-12-26 17:18:52 +0100
committernfnty <git@nfnty.se>2017-01-17 05:59:04 +0100
commit52403c53841a30edf550f5610e33e6c0981caad1 (patch)
tree5d5213702ea53d3f2189a7f20aff0dceeda6526f
parenta59ca83853707522d9de515a6d4128a5c1c5ac0a (diff)
downloadranger-52403c53841a30edf550f5610e33e6c0981caad1.tar.gz
linting: Fix `make test`
-rw-r--r--Makefile8
-rw-r--r--pylintrc (renamed from .pylintrc)0
-rw-r--r--ranger/config/pylintrc (renamed from ranger/config/.pylintrc)0
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index beb0a325..cd871d2e 100644
--- a/Makefile
+++ b/Makefile
@@ -60,13 +60,17 @@ doc: cleandoc
 		pydoc.writedocs("$(CWD)")'
 	find . -name \*.html -exec sed -i 's|'"$(CWD)"'|../..|g' -- {} \;
 
-TEST_PATHS_MAIN = doc/tools/*.py examples/*.py $(filter-out ranger/__pycache__ ranger/config ranger/data, $(wildcard ranger/*)) tests *.py
+TEST_PATHS_MAIN = \
+	$(shell find ranger -mindepth 1 -maxdepth 1 -type d -and -not -name '__pycache__' -and -not -path 'ranger/config' -and -not -path 'ranger/data') \
+	ranger/__init__.py \
+	$(shell find . '(' -path './ranger' -or -path './tests' ')' -prune -or -type f -name '*.py' -print) \
+	tests
 TEST_PATH_CONFIG = ranger/config
 
 test:
 	@echo "Running pylint..."
 	pylint $(TEST_PATHS_MAIN)
-	pylint --rcfile=$(TEST_PATH_CONFIG)/.pylintrc $(TEST_PATH_CONFIG)
+	pylint --rcfile=$(TEST_PATH_CONFIG)/pylintrc $(TEST_PATH_CONFIG)
 	@echo "Running flake8..."
 	flake8 $(TEST_PATHS_MAIN) $(TEST_PATH_CONFIG)
 	@echo "Running doctests..."
diff --git a/.pylintrc b/pylintrc
index 935c58f4..935c58f4 100644
--- a/.pylintrc
+++ b/pylintrc
diff --git a/ranger/config/.pylintrc b/ranger/config/pylintrc
index adec41f1..adec41f1 100644
--- a/ranger/config/.pylintrc
+++ b/ranger/config/pylintrc
9 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133