blog2i2j
diff --git a/‎diff.py‎
Lines changed: 17 additions & 8 deletions b/‎diff.py‎
Lines changed: 17 additions & 8 deletions
diff --git a/‎make.py‎
Lines changed: 9 additions & 7 deletions b/‎make.py‎
Lines changed: 9 additions & 7 deletions
diff --git a/‎winpython/__init__.py‎
Lines changed: 1 addition & 1 deletion b/‎winpython/__init__.py‎
Lines changed: 1 addition & 1 deletion
@@ -20,6 +20,9 @@
 # Local imports
 from winpython import utils
 
+# pep503 defines normalized package names: www.python.org/dev/peps/pep-0503
+def normalize(name):
+    return re.sub(r"[-_.]+", "-", name).lower()
 
 CHANGELOGS_DIR = osp.join(
     osp.dirname(__file__), 'changelogs'
@@ -385,14 +388,20 @@ def test_compare(
 if __name__ == '__main__':
     print(
         compare_package_indexes(
-            '3.6.1.1',
-            '3.6.1.0',
-            basedir='D:\Winpython\basedir36',
-            flavor='Qt5',
-            flavor1='Qt5',
-            architecture=32,
-        )
-    )
+            version2='3.7.4.0',
+            version1='3.7.2.0',
+            basedir=r'C:\WinP\bd37',
+            flavor='Zero',
+            flavor1='Zero',
+            architecture=32
+        ))
+    write_changelog(
+            version2='3.7.4.0',
+            version1='3.7.2.0',
+            basedir=r'C:\WinP\bd37',
+            flavor='Ps2',
+            architecture=64
+            )
     # test_parse_package_index_wiki('2.7.3.3')
     # print(compare_package_indexes('2.7.3.3', '2.7.3.1'))
     # write_changelog('2.7.4.1', '2.7.4.0')
 
@@ -408,7 +408,7 @@ def get_tool_path(relpath, checkfunc):
             ]
         # get all packages installed in the changelog, whatever the method
         self.installed_packages = (
-            self.distribution.get_installed_packages()
+            self.distribution.get_installed_packages(update=True)
         )
 
         packages = [
@@ -1660,10 +1660,10 @@ def _create_batch_scripts(self):
 if "%QT_API%"=="pyqt5" (
     if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" %*
-    ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\designer.exe" (
-        "%WINPYDIR%\Lib\site-packages\pyqt5_tools\designer.exe" %*
-    ) else (
+    ) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" (
         "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
+    ) else (
+        "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
     )
 ) else (
     "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
@@ -1679,11 +1679,13 @@ def _create_batch_scripts(self):
 if "%QT_API%"=="pyqt5" (
     if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" %*
-    ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\assistant.exe" (
-        "%WINPYDIR%\Lib\site-packages\pyqt5_tools\assistant.exe" %*
+    ) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" (
+        "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
+    ) else (
+        "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
     )
 ) else (
-    "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
+    "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
 )
 """,
         )
 
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '2.3.20200319'
+__version__ = '2.3.20200406'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'