8000 Merge pull request #1256 from stonebig/master · winpython/winpython@323c6fe · GitHub
[go: up one dir, main page]
Skip to content

Commit 323c6fe

Browse files
stonebigstonebig
authored
Merge pull request #1256 from stonebig/master
restore VScode on /t option
2 parents 80d3a27 + 444e9bc commit 323c6fe

File tree

4 files changed

+28
-12
lines changed

4 files changed

+28
-12
lines changed

‎generate_a_winpython_distro.bat

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ echo ------------------
4646
echo 0.0 Initialize variables
4747
echo ------------------
4848

49-
if "%my_release_level%"=="" set my_release_level=b4
49+
if "%my_release_level%"=="" set my_release_level=b5
5050

5151
set my_basedir=%my_root_dir_for_builds%\bd%my_python_target%
5252

@@ -58,10 +58,6 @@ rem 2021-04-22 : path PyPy3 (as we don't try to copy PyPy3.exe to Python.exe)
5858
if "%target_python_exe%"=="" set target_python_exe=python.exe
5959

6060

61-
if %my_python_target%==37 (
62-
set my_python_target_release=3712
63-
set my_release=1
64-
)
6561
if %my_python_target%==38 (
6662
set my_python_target_release=3812
6763
set my_release=1
@@ -76,13 +72,11 @@ if %my_python_target%==310 (
7672
set my_release=2
7773
)
7874

79-
8075
if %my_python_target%==311 (
81-
set my_python_target_release=3114
82-
set my_release=1
76+
set my_python_target_release=3115
77+
set my_release=0
8378
)
8479

85-
8680
if %my_python_target%==312 (
8781
set my_python_target_release=3120
8882
set my_release=0

‎make.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,11 @@ def get_tool_path_dir(relpath):
353353
if pandocexe is not None:
354354
pandocver = utils.get_pandoc_version(str(Path(pandocexe).parent))
355355
installed_tools += [("Pandoc", pandocver)]
356-
356+
vscodeexe = get_tool_path_file(r"\t\VSCode\Code.exe")
357+
if vscodeexe is not None:
358+
installed_tools += [
359+
("VSCode", utils.getFileProperties(vscodeexe)["FileVersion"])
360+
]
357361
tools = []
358362
for name, ver in installed_tools:
359363
metadata = wppm.get_package_metadata("tools.ini", name)
@@ -1831,11 +1835,14 @@ def _create_batch_scripts(self):
18311835
rem launcher for VScode
18321836
call "%~dp0env_for_icons.bat" %*
18331837
rem cd/D "%WINPYWORKDIR1%"
1838+
if exist "%WINPYDIR%\..\t\vscode\code.exe" (
1839+
"%WINPYDIR%\..\t\vscode\code.exe" %*
1840+
) else (
18341841
if exist "%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe" (
18351842
"%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe" %*
18361843
) else (
18371844
"code.exe" %*
1838-
)
1845+
))
18391846
18401847
""",
18411848
)

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

‎winpython/data/packages.ini

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3664,3 +3664,18 @@ description = IPython magic command interface for interactive work with mypyc.
36643664
[installer]
36653665
description = A library for installing Python wheels.
36663666

3667+
[langsmith]
3668+
description = Client library to connect to the LangSmith LLM Tracing and Evaluation Platform.
3669+
3670+
[mutagen]
3671+
description = read and write audio tags for many formats
3672+
3673+
[pydub]
3674+
description = Manipulate audio with an simple and easy high level interface
3675+
3676+
[pypdf]
3677+
description = A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files
3678+
3679+
[yt-dlp]
3680+
description = A youtube-dl fork with additional features and patches
3681+

0 commit comments

Comments
 (0)
0