Merge from 3.x: PR #4256

spyder-ide · Mar 13, 2017 · a1e10ad · a1e10ad
2 parents 1c3265b + 22cba7e
commit a1e10ad
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 10 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,5 +1,11 @@
 [run]
-omit = */tests/*
+omit =
+    # Omit tests
+    */tests/*
+    # Omit external files
+    */external/*
+    # Omit site files
+    */utils/site/*
 
 [report]
 fail_under=0
diff --git a/spyder/plugins/tests/__init__.py b/spyder/plugins/tests/__init__.py
diff --git a/spyder/utils/introspection/test/__init__.py b/spyder/utils/introspection/test/__init__.py
diff --git a/...ntrospection/test/test_fallback_plugin.py → ...trospection/tests/test_fallback_plugin.py b/...ntrospection/test/test_fallback_plugin.py → ...trospection/tests/test_fallback_plugin.py
diff --git a/...ls/introspection/test/test_jedi_plugin.py → ...s/introspection/tests/test_jedi_plugin.py b/...ls/introspection/test/test_jedi_plugin.py → ...s/introspection/tests/test_jedi_plugin.py
diff --git a/...trospection/test/test_modulecompletion.py → ...rospection/tests/test_modulecompletion.py b/...trospection/test/test_modulecompletion.py → ...rospection/tests/test_modulecompletion.py
diff --git a/.../introspection/test/test_plugin_server.py → ...introspection/tests/test_plugin_server.py b/.../introspection/test/test_plugin_server.py → ...introspection/tests/test_plugin_server.py
diff --git a/...ls/introspection/test/test_rope_plugin.py → ...s/introspection/tests/test_rope_plugin.py b/...ls/introspection/test/test_rope_plugin.py → ...s/introspection/tests/test_rope_plugin.py
diff --git a/...er/utils/introspection/test/test_utils.py → ...r/utils/introspection/tests/test_utils.py b/...er/utils/introspection/test/test_utils.py → ...r/utils/introspection/tests/test_utils.py
diff --git a/spyder/widgets/tests/test_findinfiles.py → .../widgets/tests/test_findinfiles_widget.py b/spyder/widgets/tests/test_findinfiles.py → .../widgets/tests/test_findinfiles_widget.py
diff --git a/...gets/variableexplorer/tests/test_utils.py → ...riableexplorer/tests/test_varexp_utils.py b/...gets/variableexplorer/tests/test_utils.py → ...riableexplorer/tests/test_varexp_utils.py