From 483642ab27746bee75182629e9c1ee50601a20f7 Mon Sep 17 00:00:00 2001
From: Andras Kovi <andrask@users.noreply.github.com>
Date: Sun, 27 Nov 2022 12:51:40 +0100
Subject: [PATCH 1/5] Tidying up for new release

---
 description.html                                    |  6 +++---
 gradle.properties                                   |  5 -----
 .../pyvenvmanage/ConfigureModulePythonVenv.java     |  2 +-
 .../pyvenvmanage/ConfigureProjectPythonVenv.java    |  2 +-
 src/main/resources/META-INF/plugin.xml              | 13 ++++++-------
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/description.html b/description.html
index 3708c31..5bd3ae4 100644
--- a/description.html
+++ b/description.html
@@ -1,10 +1,10 @@
-<b>PyVenvManage</b> is a plugin for managing the Python interpreter of Pycharm Projects.
+<b>PyVenvManage 2</b> is a plugin for managing the Python interpreter of Python projects.
 
 It is a general issue that Python projects may have several interpreters in different
 virtual environments for the various versions of the language. Managing these venvs
-is easily done with `tox`, but configuring the project in Pycharm is painful.
+is easily done with `tox`, but configuring the interpreter for the project or module is painful.
 
-With PyVenvManage the selection and setup of the venv is a few clicks without dialog boxes.
+With PyVenvManage 2 the selection and setup of the venv is a few clicks without unwanted dialog boxes.
 
 <h2>Features</h2>
 <ul>
diff --git a/gradle.properties b/gradle.properties
index 5a9abe5..e5d9a95 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1 @@
-pluginVerifierIdeVersions = 212.3724.23
-platformType = IC
-platformVersion = 2021.1
-platformDownloadSources = true
-platformPlugins = PythonCore:211.6693.111
 kotlin.stdlib.default.dependency = false
diff --git a/src/main/java/com/github/pyvenvmanage/ConfigureModulePythonVenv.java b/src/main/java/com/github/pyvenvmanage/ConfigureModulePythonVenv.java
index 34e0862..80432cc 100644
--- a/src/main/java/com/github/pyvenvmanage/ConfigureModulePythonVenv.java
+++ b/src/main/java/com/github/pyvenvmanage/ConfigureModulePythonVenv.java
@@ -29,7 +29,7 @@ protected void setInterpreter(Project project, VirtualFile file, String pythonEx
 
         if (null != module) {
             ModuleRootModificationUtil.setModuleSdk(module, sdk);
-            String message = MessageFormat.format("Updated SDK for module {0} to: {1}", module, sdk);
+            String message = MessageFormat.format("Updated SDK for module {0} to: {1}", module.getName(), sdk.getName());
             showNotification(project, message);
         }
     }
diff --git a/src/main/java/com/github/pyvenvmanage/ConfigureProjectPythonVenv.java b/src/main/java/com/github/pyvenvmanage/ConfigureProjectPythonVenv.java
index e58fcce..c67c19a 100644
--- a/src/main/java/com/github/pyvenvmanage/ConfigureProjectPythonVenv.java
+++ b/src/main/java/com/github/pyvenvmanage/ConfigureProjectPythonVenv.java
@@ -18,7 +18,7 @@ protected void setInterpreter(Project project, VirtualFile file, String pythonEx
         }
 
         SdkConfigurationUtil.setDirectoryProjectSdk(project, sdk);
-        String message = MessageFormat.format("Updated SDK for project {0} to: {1}", project, sdk);
+        String message = MessageFormat.format("Updated SDK for project {0} to: {1}", project.getName(), sdk.getName());
         showNotification(project, message);
     }
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 604b218..7e6ab83 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -4,7 +4,7 @@
 
 <idea-plugin>
     <id>com.github.pyvenvmanage.pyvenv</id>
-    <name>PyVenv Manage</name>
+    <name>PyVenv Manage 2</name>
     <vendor url="https://github.com/pyvenvmanage/PyVenvManage">pyvenvmanage</vendor>
 
     <description><![CDATA[]]></description>
@@ -18,23 +18,22 @@
         <iconProvider implementation="com.github.pyvenvmanage.VenvIconProvider" />
         <iconLayerProvider implementation="com.github.pyvenvmanage.VenvIconProvider" />
         <notificationGroup id="SDK changed notification"
-                           displayType="BALLOON"
-                           key="com.github.pyvenvmanage.pyvenv.sdk.changed"/>
+                           displayType="BALLOON"/>
     </extensions>
 
     <actions>
         <action
-                id="VenvConfigPlugin.com.github.pyvenvmanage.ConfigureProjectPythonVenv"
+                id="com.github.pyvenvmanage.ConfigureProjectPythonVenv"
                 class="com.github.pyvenvmanage.ConfigureProjectPythonVenv"
-                text="Set project venv"
+                text="Set Project Venv"
                 description="Configures this directory to be the venv for the project"
                 icon="PyVenvManageIcons.CONFIGURE_VENV">
             <add-to-group group-id="ProjectViewPopupMenu" anchor="last"/>
         </action>
         <action
-                id="VenvConfigPlugin.com.github.pyvenvmanage.ConfigureModulePythonVenv"
+                id="com.github.pyvenvmanage.ConfigureModulePythonVenv"
                 class="com.github.pyvenvmanage.ConfigureModulePythonVenv"
-                text="Set module venv for %s"
+                text="Set Module Venv for %S"
                 description="Configures this directory to be the venv for the project"
                 icon="PyVenvManageIcons.CONFIGURE_VENV">
             <add-to-group group-id="ProjectViewPopupMenu" anchor="last"/>

From 447e8dbb552cf94cecb0d4a17a55ba98975e8de4 Mon Sep 17 00:00:00 2001
From: Andras Kovi <andrask@users.noreply.github.com>
Date: Sun, 27 Nov 2022 15:29:22 +0100
Subject: [PATCH 2/5] Update jetbrains plugin

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e8aa59b..470688f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("java")
     id("org.jetbrains.kotlin.jvm") version "1.7.10"
-    id("org.jetbrains.intellij") version "1.9.0"
+    id("org.jetbrains.intellij") version "1.10.0"
     id("org.jetbrains.changelog") version "1.3.1"
     id("io.gitlab.arturbosch.detekt") version "1.22.0"
     id("org.jlleitschuh.gradle.ktlint") version "11.0.0"

From ffade28e50f7813ed4e487ca4d34fdc74208848a Mon Sep 17 00:00:00 2001
From: Andras Kovi <andrask@users.noreply.github.com>
Date: Sun, 27 Nov 2022 16:19:05 +0100
Subject: [PATCH 3/5] Turn off flaky macos and windows tests

---
 .github/workflows/check.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index 97b68cf..f7326ff 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/check.yaml
@@ -15,8 +15,8 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
-          - windows-latest
+#          - macos-latest      flaky fails
+#          - windows-latest    flaky fails
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

From 7fb8d2e2355d4da028e684b6dbfc785fe0050a60 Mon Sep 17 00:00:00 2001
From: Andras Kovi <andrask@users.noreply.github.com>
Date: Sun, 27 Nov 2022 18:03:56 +0100
Subject: [PATCH 4/5] Completely remove flaky tests

---
 .github/workflows/check.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index f7326ff..a3cff1d 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/check.yaml
@@ -15,8 +15,6 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-#          - macos-latest      flaky fails
-#          - windows-latest    flaky fails
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

From 9a700bda9f448be5563adc65246c146a02250565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= <bgabor8@bloomberg.net>
Date: Sun, 27 Nov 2022 10:27:42 -0800
Subject: [PATCH 5/5] PR Feedback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernát Gábor <bgabor8@bloomberg.net>
---
 .github/workflows/check.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index a3cff1d..dcf9463 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/check.yaml
@@ -11,11 +11,7 @@ concurrency:
 
 jobs:
   test:
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -33,7 +29,6 @@ jobs:
         run: ./gradlew runPluginVerifier
 
       - uses: actions/upload-artifact@v3
-        if: matrix.os == 'ubuntu-latest'
         with:
           name: plugin
           path: build/distributions/*.zip