Skip to content

Commit 2a3e5de

Browse files
committed
creating lockFile generation in build
1 parent 5dd8bd2 commit 2a3e5de

File tree

2 files changed

+41
-4
lines changed

2 files changed

+41
-4
lines changed

generate_a_winpython_distro.bat

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ rem generate_a_winpython_distro.bat: to be launched from a winpython directory,
22
@echo on
33

44
REM Initialize variables
5-
if "%my_release_level%"=="" set my_release_level=b3
5+
if "%my_release_level%"=="" set my_release_level=b1
66
if "%my_create_installer%"=="" set my_create_installer=True
77

88
rem Set archive directory and log file
@@ -26,8 +26,8 @@ if "%target_python_exe%"=="" set target_python_exe=python.exe
2626

2727
rem Set Python target release based on my_python_target
2828
if %my_python_target%==311 set my_python_target_release=3119& set my_release=1
29-
if %my_python_target%==312 set my_python_target_release=31210& set my_release=0
30-
if %my_python_target%==313 set my_python_target_release=3133& set my_release=0
29+
if %my_python_target%==312 set my_python_target_release=31210& set my_release=1
30+
if %my_python_target%==313 set my_python_target_release=3133& set my_release=1
3131
if %my_python_target%==314 set my_python_target_release=3140& set my_release=0
3232

3333
echo -------------------------------------- >>%my_archive_log%
@@ -114,6 +114,43 @@ cd /D %~dp0
114114
call %my_buildenv%\scripts\env.bat
115115
python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', basedir=r'%my_basedir%', verbose=True, architecture=%my_arch%, flavor='%my_flavor%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', create_installer='%my_create_installer%', rebuild=False, python_target_release='%my_python_target_release%')" >> %my_archive_log%
116116

117+
echo -------------------------------------- >>%my_archive_log%
118+
echo "(%date% %time%) generate lock files">>%my_archive_log%
119+
echo -------------------------------------- >>%my_archive_log%
120+
121+
set path=%my_original_path%
122+
call %my_WINPYDIRBASE%\scripts\env.bat
123+
124+
rem generate pip freeze requirements
125+
echo %date% %time%
126+
set LOCKDIR=%WINPYDIRBASE%\notebooks\
127+
set req=%LOCKDIR%requirement_%WINPYVER%_raw.txt
128+
set wanted_req=%LOCKDIR%requirement_%WINPYVER%.txt
129+
set pip_lock_web=%LOCKDIR%pylock_%WINPYVER%.toml
130+
set pip_lock_local=%LOCKDIR%pylock_%WINPYVER%_local.toml
131+
set my_archive_lockfile=%my_archive_dir%\pylock_%WINPYVER%_%date:/=-%at_%my_time%.toml
132+
set my_archive_lockfile_local=%my_archive_dir%\pylock_%WINPYVER%_%date:/=-%at_%my_time%_local.tml
133+
set my_changelog_lockfile=%~dp0changelogs\pylock_%WINPYVER%.toml
134+
135+
136+
python.exe -m pip freeze>%req%
137+
findstr /v "winpython" %req% > %wanted_req%
138+
139+
rem pip lock from pypi the local, from a frozen req
140+
python.exe -m pip lock --no-deps -c C:\WinP\constraints.txt -r %wanted_req%
141+
copy pylock.toml %pip_lock_web%
142+
python.exe -m pip lock --no-deps --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq -c C:\WinP\constraints.txt -r %wanted_req%
143+
copy pylock.toml %pip_lock_local%
144+
145+
rem compare the two
146+
findstr /V /R "^url =$" %pip_lock_web% > %pip_lock_web%.no_url.txt
147+
findstr /V /R "^url =$" %pip_lock_local% > %pip_lock_local%.no_url.txt
148+
149+
fc %pip_lock_web%.no_url.txt %pip_lock_local%.no_url.txt
150+
151+
copy/Y %pip_lock_web% %my_archive_lockfile%
152+
copy/Y %pip_lock_web% %my_changelog_lockfile%
153+
117154
echo -------------------------------------- >>%my_archive_log%
118155
echo "(%date% %time%) END OF CREATION">>%my_archive_log%
119156
echo -------------------------------------- >>%my_archive_log%

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__ = '15.4.20250507'
31+
__version__ = '15.5.20250511'
3232
__license__ = __doc__
3333
__project_url__ = 'http://winpython.github.io/'

0 commit comments

Comments
 (0)