Skip to content

auto-update of packages.ini at build time #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Apr 6, 2020
Merged

auto-update of packages.ini at build time #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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')
Expand Down
16 changes: 9 additions & 7 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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" %*
Expand All @@ -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" %*
)
""",
)
Expand Down
2 changes: 1 addition & 1 deletion winpython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
Loading