8000 respect PEP-0751 regular expression: r"^pylock\.([^.]+)\.toml$" · winpython/winpython@14d47b6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 14d47b6

Browse files
stonebigstonebig
committed
respect PEP-0751 regular expression: r"^pylock\.([^.]+)\.toml$"
only two "." allowed, like "pylock.any_thing.toml" ... REGEX is a foreign langage, like APL
1 parent f1d5293 commit 14d47b6

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

‎generate_a_winpython_distro.bat‎

Lines changed: 13 additions & 11 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=b1
5+
if "%my_release_level%"=="" set my_release_level=b2
66
if "%my_create_installer%"=="" set my_create_installer=True
77

88
rem Set archive directory and log file
@@ -124,16 +124,18 @@ call %my_WINPYDIRBASE%\scripts\env.bat
124124
rem generate pip freeze requirements
125125
echo %date% %time%
126126
set LOCKDIR=%WINPYDIRBASE%\..\
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 req_lock_web=%LOCKDIR%requirement_with_hash_%WINPYVER%.txt
132-
set req_lock_local=%LOCKDIR%requirement_with_hash_%WINPYVER%_local.txt
133-
134-
set my_archive_lockfile=%my_archive_dir%\pylock_%WINPYVER%_%date:/=-%at_%my_time%.toml
135-
set my_archive_lockfile_local=%my_archive_dir%\pylock_%WINPYVER%_%date:/=-%at_%my_time%_local.tml
136-
set my_changelog_lockfile=%~dp0changelogs\pylock_%WINPYVER%.toml
127+
128+
set WINPYVERLOCK=%WINPYVER:.=_%
129+
set req=%LOCKDIR%requirement.%WINPYVERLOCK%_raw.txt
130+
set wanted_req=%LOCKDIR%requirement.%WINPYVERLOCK%.txt
131+
set pip_lock_web=%LOCKDIR%pylock.%WINPYVERLOCK%.toml
132+
set pip_lock_local=%LOCKDIR%pylock.%WINPYVER%_local.toml
133+
set req_lock_web=%LOCKDIR%requirement_with_hash.%WINPYVERLOCK%.txt
134+
set req_lock_local=%LOCKDIR%requirement_with_hash.%WINPYVERLOCK%_local.txt
135+
136+
set my_archive_lockfile=%my_archive_dir%\pylock.%WINPYVERLOCK%_%date:/=-%at_%my_time%.toml
137+
set my_archive_lockfile_local=%my_archive_dir%\pylock.%WINPYVERLOCK%_%date:/=-%at_%my_time%.local.toml
138+
set my_changelog_lockfile=%~dp0changelogs\pylock.%WINPYVERLOCK%.toml
137139

138140
python.exe -m pip freeze>%req%
139141
findstr /v "winpython" %req% > %wanted_req%

0 commit comments

Comments
 (0)
0