From 5a149c9bd3f11662a4f6da06db533368fe8207de Mon Sep 17 00:00:00 2001
From: "liana.bakradze" <liana.bakradze@jetbrains.com>
Date: Mon, 25 Apr 2016 17:52:22 +0200
Subject: [PATCH] Remove "educational-core-python" plugin

---
 .../resources/META-INF/plugin.xml             |  1 -
 .../resources/META-INF/plugin.xml             | 44 -------------------
 .../src/META-INF/PyCharmEduPlugin.xml         | 14 ++++++
 .../resources/META-INF/plugin.xml             |  1 -
 4 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 python/educational-python/resources/META-INF/plugin.xml

diff --git a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml b/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
index 2399560d07b7..1f7b18e88aec 100644
--- a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
@@ -17,7 +17,6 @@
   <depends>com.jetbrains.edu.coursecreator</depends>
   <depends>com.jetbrains.edu.interactivelearning</depends>
   <depends>com.jetbrains.python.edu.interactivelearning.python</depends>
-  <depends>com.jetbrains.python.edu.core</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <directoryProjectGenerator implementation="com.jetbrains.edu.coursecreator.PyCCProjectGenerator"/>
diff --git a/python/educational-python/resources/META-INF/plugin.xml b/python/educational-python/resources/META-INF/plugin.xml
deleted file mode 100644
index 1c93e40ca434..000000000000
--- a/python/educational-python/resources/META-INF/plugin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<idea-plugin version="2">
-  <id>com.jetbrains.python.edu.core</id>
-  <name>Python Educational utils plugin</name>
-  <version>2.0.3</version>
-  <idea-version since-build="143.403"/>
-  <description><![CDATA[
-      PyCharm configuration and python-specific educational utils.
-      ]]></description>
-  <vendor>JetBrains</vendor>
-
-  <change-notes><![CDATA[
-
-      ]]>
-  </change-notes>
-
-  <depends>com.intellij.modules.lang</depends>
-
-  <extensionPoints>
-    <extensionPoint qualifiedName="Edu.executeFile" interface="com.jetbrains.python.edu.PyExecuteFileExtensionPoint"/>
-  </extensionPoints>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <codeInsight.lineMarkerProvider language="Python" implementationClass="com.jetbrains.python.edu.PyExecuteFileLineMarkerProvider"/>
-  </extensions>
-
-  <extensions defaultExtensionNs="Edu">
-    <executeFile implementation="com.jetbrains.python.edu.PyEduAddParametersAction" order="last"/>
-    <executeFile implementation="com.jetbrains.python.edu.PyDebugCurrentFile"/>
-
-  </extensions>
-
-  <project-components>
-
-  </project-components>
-
-  <application-components>
-
-  </application-components>
-
-  <actions>
-
-  </actions>
-
-</idea-plugin>
\ No newline at end of file
diff --git a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
index a8aa6f578763..5a329ecef446 100644
--- a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
@@ -25,4 +25,18 @@
       <consoleInputFilterProvider implementation="com.jetbrains.python.edu.debugger.PyEduConsoleInputFilterProvider"/>
   </extensions>
 
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="Edu.executeFile" interface="com.jetbrains.python.edu.PyExecuteFileExtensionPoint"/>
+  </extensionPoints>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <codeInsight.lineMarkerProvider language="Python" implementationClass="com.jetbrains.python.edu.PyExecuteFileLineMarkerProvider"/>
+  </extensions>
+
+  <extensions defaultExtensionNs="Edu">
+    <executeFile implementation="com.jetbrains.python.edu.PyEduAddParametersAction" order="last"/>
+    <executeFile implementation="com.jetbrains.python.edu.PyDebugCurrentFile"/>
+  </extensions>
+
 </idea-plugin>
diff --git a/python/educational-python/student-python/resources/META-INF/plugin.xml b/python/educational-python/student-python/resources/META-INF/plugin.xml
index 3828c747c81b..7c5b7f5f5942 100644
--- a/python/educational-python/student-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/student-python/resources/META-INF/plugin.xml
@@ -18,7 +18,6 @@
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.python</depends>
   <depends>com.jetbrains.edu.interactivelearning</depends>
-  <depends>com.jetbrains.python.edu.core</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <directoryProjectGenerator implementation="com.jetbrains.edu.learning.PyStudyDirectoryProjectGenerator"/>