Merge remote-tracking branch 'origin/master'

python/helpers/profiler/profiler.thrift

@@ -11,7 +11,7 @@ struct FuncStat {
 
 struct Function {
    1: required FuncStat func_stat,
-   2: optional list<FuncStat> callers,    // list of functions called from the executed function.
+   2: required list<FuncStat> callers,    // list of functions called from the executed function.
 }
 
 

python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java

@@ -9,6 +9,7 @@ import com.intellij.psi.PsiErrorElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.env.PyEnvTestCase;
+import com.jetbrains.env.Staging;
 import com.jetbrains.env.python.console.PyConsoleTask;
 import org.hamcrest.Matchers;
 import org.jetbrains.annotations.NotNull;
@@ -38,6 +39,7 @@ public class IPythonConsoleTest extends PyEnvTestCase {
   }
 
   @Test
+  @Staging
   public void testParsing() throws Exception {
     runPythonTest(new IPythonTask() {
       @Override