From 67fb8585c21c8da35ba526c75d08e0872e197252 Mon Sep 17 00:00:00 2001 From: stonebig Date: Wed, 23 Oct 2019 23:14:08 +0200 Subject: [PATCH] split build process in 3 steps apply this https://github.com/winpython/winpython/issues/789 --- generate_a_winpython_distro.bat | 105 +++++++++++++++--- generate_winpython_distros35_qt5.bat | 45 -------- generate_winpython_distros38_qt5.bat | 2 +- make.py | 16 ++- ...plement.bat => run_complement_newbuild.bat | 101 ++++++++++++----- winpython/__init__.py | 2 +- 6 files changed, 180 insertions(+), 91 deletions(-) delete mode 100644 generate_winpython_distros35_qt5.bat rename run_complement.bat => run_complement_newbuild.bat (73%) diff --git a/generate_a_winpython_distro.bat b/generate_a_winpython_distro.bat index f29dec44..0dab9d9e 100644 --- a/generate_a_winpython_distro.bat +++ b/generate_a_winpython_distro.bat @@ -1,5 +1,16 @@ rem to launch from a winpython package directory, where 'make.py' is @echo on + +rem ***************************** +rem 2019-05-10 PATCH for build problem (asking permission to overwrite the file) +rem +rem ***************************** +del -y %userprofile%\.jupyter\jupyter_notebook_config.py + + +rem ****************************** + + rem this is initialised per the calling .bat rem set my_original_path=%path% rem set my_buildenv=C:\WinPython-64bit-3.4.3.7Qt5 @@ -23,19 +34,23 @@ rem Override other scripts (simpler maintenance) set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5 rem handle alpha -if "%my_release_level%"=="" set my_release_level= - -if %my_python_target%==27 set my_release=2 - -if %my_python_target%==34 set my_release=8 - -if %my_python_target%==35 set my_release=3 - -if %my_python_target%==36 set my_release=1 - -if %my_python_target%==37 set my_release=0 - -if %my_python_target%==38 set my_release=0 +if "%my_release_level%"=="" set my_release_level=b1 +if %my_python_target%==38 set my_release_level= + +rem --------- +rem newAge 20191022 +rem install with zero package, no installer, then do it from there +rem change is we must help by giving my_python_target_release +rem -------- + +if %my_python_target%==37 ( + set my_python_target_release=375 + set my_release=0 +) +if %my_python_target%==38 ( + set my_python_target_release=380 + set my_release=0 +) rem **** 2018-10-30 create_installer ** if "%my_create_installer%"=="" set my_create_installer=True @@ -121,10 +136,67 @@ set path=%my_original_path% echo call %my_buildenv%\scripts\env.bat>>%my_archive_log% call %my_buildenv%\scripts\env.bat -rem build with this +echo ----------------------------->>%my_archive_log% +echo 2.0 Create a build newage1/3 >>%my_archive_log% +echo ----------------------------->>%my_archive_log% + +rem 2019-10-22 new age step1 +rem we don't use requirements +rem we don't create installer at first path +rem we use legacy python build cd /D %~dp0 + +set my_buildenv_path=%path% + +echo 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%', toolsdirs=r'%my_toolsdirs%', docsdirs=r'%my_docsdirs%', create_installer='False')">>%my_archive_log% +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%', toolsdirs=r'%my_toolsdirs%', docsdirs=r'%my_docsdirs%', create_installer='False')">>%my_archive_log% + +rem old one +rem echo 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%', requirements=r'%my_requirements%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', toolsdirs=r'%my_toolsdirs%', docsdirs=r'%my_docsdirs%', create_installer='%my_create_installer%')">>%my_archive_log% + + +echo ----------------------------->>%my_archive_log% +echo 2.0 Create a build newage2/3 >>%my_archive_log% +echo ----------------------------->>%my_archive_log% +rem 2019-10-22 new age step2 +rem we use final environment to install requirements +set path=%my_original_path% + +@echo on +set my_WINPYDIRBASE=%my_root_dir_for_builds%\bd%my_python_target%\bu%my_flavor%\Wpy%my_arch%-%my_python_target_release%%my_release%%my_release_level% + +set WINPYDIRBASE=%my_WINPYDIRBASE% +call %my_WINPYDIRBASE%\scripts\env.bat +set +echo beg of step 2/3 +rem ok no pause + +echo pip install -r %my_requirements% --pre --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq --upgrade +pip install -r %my_requirements% --pre --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq --upgrade >>%my_archive_log% +echo mid of step 2/3 +rem pause + +rem finalize +@echo on +call %my_basedir%\run_complement_newbuild.bat %my_WINPYDIRBASE% +echo end of step 2/3 +rem pause + +echo ----------------------------->>%my_archive_log% +echo 2.0 Create a build newage3/3 >>%my_archive_log% +echo ----------------------------->>%my_archive_log% + +rem build final changelog and binaries, using create_installer='%my_create_installer%', remove_existing=False , remove : requirements, toolsdirs and docdirs + +set path=%my_original_path% +echo cd /D %~dp0>>%my_archive_log% cd /D %~dp0 -echo 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%', requirements=r'%my_requirements%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', toolsdirs=r'%my_toolsdirs%', docsdirs=r'%my_docsdirs%', create_installer='%my_create_installer%')">>%my_archive_log% -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%', requirements=r'%my_requirements%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', toolsdirs=r'%my_toolsdirs%', docsdirs=r'%my_docsdirs%', create_installer='%my_create_installer%')">>%my_archive_log% + +echo call %my_buildenv%\scripts\env.bat>>%my_archive_log% +call %my_buildenv%\scripts\env.bat +set + +echo 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%', remove_existing=False)">>%my_archive_log% +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%', remove_existing=False)">>%my_archive_log% echo ===============>>%my_archive_log% echo END OF creation>>%my_archive_log% @@ -132,3 +204,4 @@ echo %date% %time% >>%my_archive_log% echo ===============>>%my_archive_log% set path=%my_original_path% +rem pause \ No newline at end of file diff --git a/generate_winpython_distros35_qt5.bat b/generate_winpython_distros35_qt5.bat deleted file mode 100644 index c7e6e43a..00000000 --- a/generate_winpython_distros35_qt5.bat +++ /dev/null @@ -1,45 +0,0 @@ -rem this replace running manually from spyder the make.py -rem to launch from a winpython module 'make' directory - -set my_original_path=%path% -set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5 - -set my_root_dir_for_builds=C:\Winp -set my_python_target=35 -set my_pyver=3.5 - -set my_flavor=Qt5 - -set my_release=3 -set my_release_level= - -set my_install_options=--no-index --pre --trusted-host=None -set my_find_links=C:\Winp\packages.srcreq -set my_docsdirs=C:\Winp\bd35\docs - -set my_arch=32 - -set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target% - -set my_requirements=%tmp_reqdir%\Qt5_requirements.txt - - -set my_source_dirs=C:\Winp\bd35\packages.win32.Qt5 -set my_toolsdirs=C:\Winp\bd35\tools - - -set my_preclear_build_directory=Yes -call %~dp0\generate_a_winpython_distro.bat - -set my_arch=64 -set my_requirements=%tmp_reqdir%\Qt5_requirements64.txt -set my_source_dirs=C:\Winp\bd35\packages.win-amd64.Qt5 -set my_toolsdirs=C:\Winp\bd35\tools64 - -set my_preclear_build_directory=No - - -call %~dp0\generate_a_winpython_distro.bat - - -pause \ No newline at end of file diff --git a/generate_winpython_distros38_qt5.bat b/generate_winpython_distros38_qt5.bat index be5ee65f..a1e25a49 100644 --- a/generate_winpython_distros38_qt5.bat +++ b/generate_winpython_distros38_qt5.bat @@ -12,7 +12,7 @@ set my_flavor= set my_release=0 -set my_release_level=b2b +set my_release_level= rem set my_create_installer=False set my_create_installer=nsis.zip diff --git a/make.py b/make.py index eb595993..69c2434f 100644 --- a/make.py +++ b/make.py @@ -1796,6 +1796,10 @@ def _run_complement_batch_scripts( 'launch "%s" for "%s"' % (filepath, self.winpydir) ) + self._print( + 'launch "%s" for "%s" !' + % (filepath, self.winpydir) + ) try: retcode = subprocess.call( '"%s" "%s"' @@ -1809,12 +1813,22 @@ def _run_complement_batch_scripts( -retcode, file=sys.stderr, ) + self._print( + "Child was terminated by signal ! ", + -retcode, + file=sys.stderr, + ) except OSError as e: print( "Execution failed:", e, file=sys.stderr, ) + self._print( + "Execution failed !:", + e, + file=sys.stderr, + ) self._print_done() def make( @@ -1922,7 +1936,7 @@ def make( # actions=["install","-r", req, "--no-index", # "--trusted-host=None"]+ links, # install_options=None) - self._run_complement_batch_scripts() # run_complement.bat + self._run_complement_batch_scripts() self.distribution.patch_standard_packages() if remove_existing and not self.simulation: self._print("Cleaning up distribution") diff --git a/run_complement.bat b/run_complement_newbuild.bat similarity index 73% rename from run_complement.bat rename to run_complement_newbuild.bat index 087f373e..e9aaacba 100644 --- a/run_complement.bat +++ b/run_complement_newbuild.bat @@ -1,3 +1,6 @@ +rem first line check +echo keep me in ansi =utf-8 without BOM (notepad plus plus or win10 screwing up for compatibility) + echo rem labextendion 2019-06-28 test @echo off rem %1 is WINPYDIR being prepared @@ -58,7 +61,7 @@ rem jupyter labextension list rem jupyter labextension disable bqplot jupyter-leaflet jupyter-matplotlib jupyter-threejs jupyterlab-datawidgets jupyterlab_bokeh rem 2018-07-07 for jupyterlab-0.32.x: https://www.npmjs.com/package/@jupyter-widgets/jupyterlab-manager -if exist "%WINPYDIR%\Lib\site-packages\jupyterlab" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build @jupyter-widgets/jupyterlab-manager +if not "%WINPYARCH%"=="WIN32" if exist "%WINPYDIR%\Lib\site-packages\jupyterlab" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build @jupyter-widgets/jupyterlab-manager rem * ================== @@ -66,13 +69,13 @@ echo finish install of bqplot rem * ================= if exist "%WINPYDIR%\Lib\site-packages\bqplot" "%WINPYDIR%\Scripts\jupyter.exe" nbextension enable --py --sys-prefix bqplot rem labextendion2 -if exist "%WINPYDIR%\Lib\site-packages\bqplot" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build bqplot +if not "%WINPYARCH%"=="WIN32" if exist "%WINPYDIR%\Lib\site-packages\bqplot" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build bqplot rem * ================== -echo finish install of bokeh for jupyterlab (2017-09-16) +echo finish install of bokeh for jupyterlab (2019-08-10) rem * ================= -rem labextendion if exist "%WINPYDIR%\Lib\site-packages\bokeh" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyterlab_bokeh +if not "%WINPYARCH%"=="WIN32" if exist "%WINPYDIR%\Lib\site-packages\bokeh" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyterlab_bokeh rem * ================== @@ -82,7 +85,7 @@ if exist "%WINPYDIR%\Lib\site-packages\ipydatawidgets" "%WINPYDIR%\Scripts\jupy if exist "%WINPYDIR%\Lib\site-packages\ipydatawidgets" "%WINPYDIR%\Scripts\jupyter.exe" nbextension enable --py --sys-prefix ipydatawidgets rem labextendion rem no need: included per default in jlab-1 -if exist "%WINPYDIR%\Lib\site-packages\ipydatawidgets" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyterlab-datawidgets +if not "%WINPYARCH%"=="WIN3x2" if exist "%WINPYDIR%\Lib\site-packages\ipydatawidgets" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyterlab-datawidgets rem * ================== @@ -92,7 +95,7 @@ if exist "%WINPYDIR%\Lib\site-packages\ipyleaflet" "%WINPYDIR%\Scripts\jupyter. rem labextendion rem jupyter-leaflet-0.10.7 not ok with jupyterlab-1 (but doesn't work ?) rem labextendion3 2017-07-02 -if exist "%WINPYDIR%\Lib\site-packages\ipyleaflet" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyter-leaflet +if not "%WINPYARCH%"=="WIN32" if exist "%WINPYDIR%\Lib\site-packages\ipyleaflet" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyter-leaflet rem * ================== @@ -100,7 +103,7 @@ echo finish install of pythreejs rem * ================= if exist "%WINPYDIR%\Lib\site-packages\pythreejs" "%WINPYDIR%\Scripts\jupyter.exe" nbextension enable --py --sys-prefix pythreejs rem labextendion -if exist "%WINPYDIR%\Lib\site-packages\pythreejs" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyter-threejs +if not "%WINPYARCH%"=="WIN3x2" if exist "%WINPYDIR%\Lib\site-packages\pythreejs" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyter-threejs rem * ================== @@ -124,7 +127,7 @@ if exist "%WINPYDIR%\Lib\site-packages\vega3" "%WINPYDIR%\Scripts\jupyter.exe" rem 2019-03-30 workaround altair-3 rem no need: included per default in jlab-1 -if exist "%WINPYDIR%\Lib\site-packages\jupyterlab" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build @jupyterlab/vega3-extension +if not "%WINPYARCH%"=="WIN32" if exist "%WINPYDIR%\Lib\site-packages\jupyterlab" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build @jupyterlab/vega3-extension rem * ================== echo finish install of rise @@ -139,7 +142,7 @@ rem * ================= if exist "%WINPYDIR%\Lib\site-packages\ipympl" "%WINPYDIR%\Scripts\jupyter.exe" nbextension enable --py --sys-prefix ipympl rem labextendion4 rem no need: included per default in jlab-1 -if exist "%WINPYDIR%\Lib\site-packages\ipympl" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyter-matplotlib +if not "%WINPYARCH%"=="WIN3x2" if exist "%WINPYDIR%\Lib\site-packages\ipympl" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build jupyter-matplotlib rem * ================= @@ -151,7 +154,7 @@ rem if exist "%WINPYDIR%\Lib\site-packages\holoviews" "%WINPYDIR%\Scripts\jupyt rem jupyterlan-1.0.0rc0 tempo patch echo finish install of holoviews jupyterlab 2018-06-28 rem labextendion2 -if exist "%WINPYDIR%\Lib\site-packages\holoviews" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build @pyviz/jupyterlab_pyviz +if not "%WINPYARCH%"=="WIN32" if exist "%WINPYDIR%\Lib\site-packages\holoviews" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build @pyviz/jupyterlab_pyviz rem * ================== @@ -170,10 +173,21 @@ rem * ================== echo finish install of Jupyterlab-sql rem * ================== rem 2019-06-30 20190706 -if exist "%WINPYDIR%\Lib\site-packages\jupyterlab_sql" "%WINPYDIR%\Scripts\jupyter.exe" serverextension enable jupyterlab_sql --py --sys-prefix +rem # wait spoofing end https://github.com/pbugnion/jupyterlab-sql/issues/89 +rem if exist "%WINPYDIR%\Lib\site-packages\jupyterlab_sql" "%WINPYDIR%\Scripts\jupyter.exe" serverextension enable jupyterlab_sql --py --sys-prefix rem labextendion if exist "%WINPYDIR%\Lib\site-packages\jupyterlab_sql" "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build @jupyterlab-sql rem requires jupyter lab build after +rem * ================== +echo finish install of Voila (2019-07-21) +rem * ================= +if not "%WINPYARCH%"=="WIN32" if exist "%WINPYDIR%\Lib\site-packages\voila" "%WINPYDIR%\Scripts\jupyter.exe" labextension labextension install @jupyter-voila/jupyterlab-preview + +rem * ================== +echo install of dataregistry (2019-07-28) +rem * ================= +if not "%WINPYARCH%"=="WIN32" if exist "%WINPYDIR%\Lib\site-packages\voila" "%WINPYDIR%\Scripts\jupyter.exe" labextension labextension @jupyterlab/dataregistry + rem * ================= echo finish install seaborn iris example rem * ================= @@ -209,24 +223,15 @@ rem * ================== set qt56p=%WINPYDIR%\Lib\site-packages\tornado-6.0.3.dist-info if exist "%qt56p%" ( %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' )" + echo "DID I patch %qt56p% ??" + rem pause +) else ( + echo "I DIDN'T patch of %qt56p% !" + rem pause ) -rem * ============================ -echo .spyder3\temp.py suspected of creating issue east of Italia -echo see https://groups.google.com/forum/#!topic/spyderlib/dH5VXlTc30s -rem * ============================ -if exist "%WINPYDIR%\..\settings\.spyder-py3\temp.py" del "%WINPYDIR%\..\settings\.spyder-py3\temp.py" -rem * ==================== -echo patch spyder update reflex (2019-05-18 : spyder, not spyderlib !) -rem * ==================== -%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' )" - -rem * ==================== -echo patch spyder keep default white theme (2019-05-18) -rem * ==================== -%WINPYDIR%\python.exe -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%WINPYDIR%\Lib\site-packages\spyder\config\main.py', 'selected'+chr(39)+': '+chr(39)+'spyder/dark'+chr(39) , 'selected'+chr(39)+': '+chr(39)+'spyder'+chr(39) )" @@ -237,9 +242,35 @@ rem reduce time by building only once rem at each extension do: rem "%WINPYDIR%\Scripts\jupyter.exe" labextension install --no-build rem at the end: -if exist "%WINPYDIR%\Lib\site-packages\jupyterlab" "%WINPYDIR%\Scripts\jupyter.exe" lab build -if exist "%WINPYDIR%\Lib\site-packages\jupyterlab" jupyter labextension list +rem 2019-08-28 : 32 bit sos "--minimize=False" +rem FAILED: if exist "%WINPYDIR%\Lib\site-packages\jupyterlab" "%WINPYDIR%\Scripts\jupyter.exe" lab build --minimize=False +rem trying the memory 3000 instead of 4096 for %WINPYARCH=%WIN32 + +rem set qt56p=%WINPYDIR%\Lib\jupyterlab\staging\package.json +rem if exist "%qt56p%" ( +rem if "%WINPYARCH%"=="WIN32" %WINPYDIR%\python.exe -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%qt56p%', 'max_old_space_size=4096 ', 'max_old_space_size=3000 ' )" +rem ) +rem if exist "%qt56p%" ( +rem if not "%WINPYARCH%"=="WIN32" %WINPYDIR%\python.exe -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%qt56p%', 'max_old_space_size=3000 ', 'max_old_space_size=4096 ' )" +rem ) + +rem 2019-08_31 patch +rem if not "%WINPYARCH%"=="WIN32" if exist "%WINPYDIR%\Lib\site-packages\jupyterlab" ( +rem if "%WINPYARCH%"=="WIN32" "%WINPYDIR%\Scripts\jupyter.exe" lab build --minimize=False +rem if not "%WINPYARCH%"=="WIN32" "%WINPYDIR%\Scripts\jupyter.exe" lab build +rem jupyter labextension list +rem ) + +rem 2019-10-22: in any case Jupytrelab want to build with +rem jupyter-matplotlib +rem jupyter-threejs +rem jupyter-datawidgets + +if exist "%WINPYDIR%\Lib\site-packages\jupyterlab" ( +"%WINPYDIR%\Scripts\jupyter.exe" lab build +jupyter labextension list +) rem 2018-01-15 node-gyp experience rem npm config set python "C:\WinPython\bd27\buildZero\winpython-32bit-2.7.x.2\python-2.7.13" @@ -270,6 +301,22 @@ rem * =================== rem 20181222 rem if exist "%WINPYDIR%\Lib\site-packages\PySide2\qml" rmdir /S /Q "%WINPYDIR%\Lib\site-packages\PySide2\qml" +@echo on + +echo 2019-10-22 Spyder tweaks moved at the end as suspicion of problem creating (on Python-3.8) +rem * ============================ +echo .spyder3\temp.py suspected of creating issue east of Italia +echo see https://groups.google.com/forum/#!topic/spyderlib/dH5VXlTc30s +rem * ============================ +if exist "%WINPYDIR%\..\settings\.spyder-py3\temp.py" del "%WINPYDIR%\..\settings\.spyder-py3\temp.py" + + +rem * ==================== +echo patch spyder update reflex (2019-05-18 : spyder, not spyderlib !) +rem * ==================== +%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' )" + + @echo on goto the_end diff --git a/winpython/__init__.py b/winpython/__init__.py index 10069940..c6f807fb 100644 --- a/winpython/__init__.py +++ b/winpython/__init__.py @@ -28,6 +28,6 @@ OTHER DEALINGS IN THE SOFTWARE. """ -__version__ = '2.1.20191018' +__version__ = '2.2.20191022' __license__ = __doc__ __project_url__ = 'http://winpython.github.io/'