Skip to content

Commit 5f2f791

Browse files
stonebigstonebig
authored
Merge pull request winpython#985 from stonebig/master
tweaks for a big PyPy3
2 parents becafce + 532d2ae commit 5f2f791

File tree

4 files changed

+28
-12
lines changed

4 files changed

+28
-12
lines changed

‎generate_a_winpython_distro.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ rem Override other scripts (simpler maintenance)
5050
set my_buildenv=C:\WinPython-64bit-3.6.8.0
5151

5252
rem handle alpha set my_release_level=a0
53-
if "%my_release_level%"=="" set my_release_level=
53+
if "%my_release_level%"=="" set my_release_level=b2
5454

5555
rem ---------
5656
rem newAge 20191022
@@ -63,12 +63,12 @@ if %my_python_target%==37 (
6363
set my_release=0
6464
)
6565
if %my_python_target%==38 (
66-
set my_python_target_release=389
67-
set my_release=1
66+
set my_python_target_release=3810
67+
set my_release=0
6868
)
6969
if %my_python_target%==39 (
70-
set my_python_target_release=394
71-
set my_release=1
70+
set my_python_target_release=395
71+
set my_release=0
7272
)
7373

7474
if %my_python_target%==310 (

‎generate_winpython_distros310_dot.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set my_flavor=dot
1212

1313
set my_release=0
1414

15-
set my_release_level=a7
15+
set my_release_level=b1
1616

1717
rem set my_create_installer=False
1818
set my_create_installer=nsis.zip

‎run_complement_newbuild.bat

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ rem 2020-09-27 Jupyterlab-3 5S (looking for missing detail)
66
rem 2020-10-25no_more_needed "nbextension enable" no more needed for bqplot, ipyleaflet, ipympl
77
rem 2021-01-30: jupyterlab2 final stuff removal
88
rem 2021-03-13: notebook classic stuff removal
9+
rem 2021-05-23: use "%PYTHON%" for the executable instead of "%WINPYDIR%\python.exe"
910

1011

1112
rem if build error, launch "WinPython Command Prompt.exe" dos ico, then try manual install of requirements.txt
@@ -16,11 +17,12 @@ rem ( drag & drop "requirements.txt" file in the dos window a the end
1617
rem then drag & drop "run_complement_newbuild.bat" file in the dos window and launch it
1718

1819
@echo off
19-
rem %1 is WINPYDIR being prepared
20+
rem %1 is WINPYDIRBASE being prepared, (names winpydir of python build batch) (like "...bd37\buPyPy\WPy64-37100b2")
2021
rem this .bat is placed at root (buildir34, buildir34\FlavorJulia, ...)
2122
set origin=%~dp0
2223
set new_winpydir=%1
2324

25+
echo new_winpydir= ********%new_winpydir%***********************************************************
2426
cd /d %new_winpydir%
2527

2628
call scripts\env.bat
@@ -54,7 +56,7 @@ if exist "%WINPYDIR%\Lib\site-packages\voila" "%WINPYDIR%\Scripts\jupyter.exe"
5456
rem * =================
5557
echo finish install seaborn iris example
5658
rem * =================
57-
if exist "%WINPYDIR%\Lib\site-packages\seaborn" "%WINPYDIR%\python.exe" -c "import seaborn as sns;sns.set();sns.load_dataset('iris')"
59+
if exist "%WINPYDIR%\Lib\site-packages\seaborn" "%PYTHON%" -c "import seaborn as sns;sns.set();sns.load_dataset('iris')"
5860

5961

6062
rem ** Active patchs**
@@ -67,8 +69,8 @@ rem in DOS, the variable must be set befor the parenthesis block....
6769
set this_source='%WINPYDIR%\Lib\site-packages\jupyter_lsp\virtual_documents_shadow.py'
6870
if exist "%WINPYDIR%\Lib\site-packages\jupyter_lsp-1.1.4.dist-info" (
6971
echo "**%this_source%**"
70-
%WINPYDIR%\python.exe -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r%this_source%, 'read_text()', 'read_text(encoding='+chr(39)+'utf-8'+chr(39)+')' )"
71-
%WINPYDIR%\python.exe -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r%this_source%, 'join(self.lines))', 'join(self.lines), encoding='+chr(39)+'utf-8'+chr(39)+')' )"
72+
"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r%this_source%, 'read_text()', 'read_text(encoding='+chr(39)+'utf-8'+chr(39)+')' )"
73+
"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r%this_source%, 'join(self.lines))', 'join(self.lines), encoding='+chr(39)+'utf-8'+chr(39)+')' )"
7274
)
7375

7476

@@ -88,7 +90,7 @@ rem KEEP as example for next time needed
8890

8991
set qt56p=%WINPYDIR%\Lib\site-packages\tornado-6.0.3.dist-info
9092
if exist "%qt56p%" (
91-
%WINPYDIR%\python.exe -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%WINPYDIR%\Lib\site-packages\tornado\platform\asyncio.py', 'import asyncio', 'import asyncio;asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy()) # python-3.8.0' )"
93+
"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%WINPYDIR%\Lib\site-packages\tornado\platform\asyncio.py', 'import asyncio', 'import asyncio;asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy()) # python-3.8.0' )"
9294
rem echo "DID I patch %qt56p% ??"
9395
) else (
9496
rem echo "I DIDN'T patch of %qt56p% !"
@@ -130,7 +132,7 @@ if exist "%WINPYDIR%\..\settings\.spyder-py3\temp.py" del "%WINPYDIR%\..\setti
130132
rem * ====================
131133
echo patch spyder update reflex (2019-05-18 : spyder, not spyderlib !)
132134
rem * ====================
133-
%WINPYDIR%\python.exe -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%WINPYDIR%\Lib\site-packages\spyder\config\main.py', ' '+chr(39)+'check_updates_on_startup'+chr(39)+': True', ' '+chr(39)+'check_updates_on_startup'+chr(39)+': False' )"
135+
"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%WINPYDIR%\Lib\site-packages\spyder\config\main.py', ' '+chr(39)+'check_updates_on_startup'+chr(39)+': True', ' '+chr(39)+'check_updates_on_startup'+chr(39)+': False' )"
134136

135137
rem * ====================
136138
echo summary 20202-04-11

‎winpython/data/packages.ini

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3085,4 +3085,18 @@ description = A library to handle automated deprecations
30853085
[matplotlib-inline]
30863086
description = Inline Matplotlib backend for Jupyter
30873087
3088+
[sqlite-utils]
3089+
description = CLI tool and Python utility functions for manipulating SQLite databases
3090+
3091+
[py-lru-cache]
3092+
description = LRU cache for python. Provides a dictionary-like object as well as a method decorator.
3093+
3094+
[dateparser]
3095+
description = Date parsing library designed to parse dates from HTML pages
3096+
3097+
[datasette-graphql]
3098+
description = Datasette plugin providing an automatic GraphQL API for your SQLite databases
3099+
3100+
[csvs-to-sqlite]
3101+
description = Convert CSV files into a SQLite database
30883102

0 commit comments

Comments
 (0)