Skip to content

Commit b7a2eb0

Browse files
stonebigstonebig
committed
auto-update of packages.ini at build time
1 parent 562afcb commit b7a2eb0

5 files changed

Lines changed: 1012 additions & 995 deletions

File tree

‎diff.py‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
# Local imports
2121
from winpython import utils
2222

23+
# pep503 defines normalized package names: www.python.org/dev/peps/pep-0503
24+
def normalize(name):
25+
return re.sub(r"[-_.]+", "-", name).lower()
2326

2427
CHANGELOGS_DIR = osp.join(
2528
osp.dirname(__file__), 'changelogs'
@@ -385,14 +388,20 @@ def test_compare(
385388
if __name__ == '__main__':
386389
print(
387390
compare_package_indexes(
388-
'3.6.1.1',
389-
'3.6.1.0',
390-
basedir='D:\Winpython\basedir36',
391-
flavor='Qt5',
392-
flavor1='Qt5',
393-
architecture=32,
394-
)
395-
)
391+
version2='3.7.4.0',
392+
version1='3.7.2.0',
393+
basedir=r'C:\WinP\bd37',
394+
flavor='Zero',
395+
flavor1='Zero',
396+
architecture=32
397+
))
398+
write_changelog(
399+
version2='3.7.4.0',
400+
version1='3.7.2.0',
401+
basedir=r'C:\WinP\bd37',
402+
flavor='Ps2',
403+
architecture=64
404+
)
396405
# test_parse_package_index_wiki('2.7.3.3')
397406
# print(compare_package_indexes('2.7.3.3', '2.7.3.1'))
398407
# write_changelog('2.7.4.1', '2.7.4.0')

‎make.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ def get_tool_path(relpath, checkfunc):
408408
]
409409
# get all packages installed in the changelog, whatever the method
410410
self.installed_packages = (
411-
self.distribution.get_installed_packages()
411+
self.distribution.get_installed_packages(update=True)
412412
)
413413

414414
packages = [
@@ -1660,10 +1660,10 @@ def _create_batch_scripts(self):
16601660
if "%QT_API%"=="pyqt5" (
16611661
if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
16621662
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" %*
1663-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\designer.exe" (
1664-
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\designer.exe" %*
1665-
) else (
1663+
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" (
16661664
"%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
1665+
) else (
1666+
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
16671667
)
16681668
) else (
16691669
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
@@ -1679,11 +1679,13 @@ def _create_batch_scripts(self):
16791679
if "%QT_API%"=="pyqt5" (
16801680
if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" (
16811681
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" %*
1682-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\assistant.exe" (
1683-
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\assistant.exe" %*
1682+
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" (
1683+
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
1684+
) else (
1685+
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
16841686
)
16851687
) else (
1686-
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
1688+
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
16871689
)
16881690
""",
16891691
)

‎winpython/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
OTHER DEALINGS IN THE SOFTWARE.
2929
"""
3030

31-
__version__ = '2.3.20200319'
31+
__version__ = '2.3.20200406'
3232
__license__ = __doc__
3333
__project_url__ = 'http://winpython.github.io/'

0 commit comments

Comments
 (0)