Skip to content
This repository was archived by the owner on Sep 10, 2023. It is now read-only.

Commit 1b828ba

Browse files
crazy-maxcrazy-max
committed
* New releases : 3.6.6.2, 3.7.0.2 (Issue neard/neard#391)
1 parent 8efe807 commit 1b828ba

File tree

20 files changed

+310
-4
lines changed

20 files changed

+310
-4
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
# Changelog
22

3+
## r4 (2018/10/04)
4+
5+
* New releases : 3.6.6.2, 3.7.0.2 (Issue neard/neard#391)
6+
37
## r3 (2017/03/02)
48

5-
* New bundles : 2.7.13.0, 3.4.4.6, 3.5.3.0, 3.6.0.1 (Issue neard/neard#223)
9+
* New releases : 2.7.13.0, 3.4.4.6, 3.5.3.0, 3.6.0.1 (Issue neard/neard#223)
610
* Python packaging problem (Issue neard/neard#222)
711
* Normalize path error (Issue neard/neard#221)
812

913
## r2 (2017/01/27)
1014

11-
* New bundles : 2.7.12.4, 3.4.4.5, 3.5.2.3, 3.6.0.0 (Issue neard/neard#213)
15+
* New releases : 2.7.12.4, 3.4.4.5, 3.5.2.3, 3.6.0.0 (Issue neard/neard#213)
1216

1317
## r1 (2016/11/09)
1418

15-
* Add bundles : 2.7.12.3, 3.4.4.4, 3.5.2.2
19+
* Add releases : 2.7.12.3, 3.4.4.4, 3.5.2.2
1620
* Include PyQt4 4.11.4
1721
* Move PIP cache to tmp Neard folder

‎bin/python3.6.6.2/bin/python.bat‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@echo off
2+
set WINPYSCRIPTSDIR=%~dp0..\scripts
3+
call "%WINPYSCRIPTSDIR%\env_for_icons.bat"
4+
cd/D "%WINPYWORKDIR%"
5+
rem backward compatibility for python command-line users
6+
"%WINPYDIR%\python.exe" %*

‎bin/python3.6.6.2/neard.conf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pythonVersion = "3.6.6.2"
2+
pythonExe = "bin\python.bat"
3+
pythonCpExe = "WinPython Control Panel.exe"
4+
pythonIdleExe = "IDLE (Python GUI).exe"
5+
6+
bundleRelease = "@RELEASE_VERSION@"

‎bin/python3.6.6.2/pyqt4/install.bat‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
set WINPYSCRIPTSDIR=%~dp0..\scripts
3+
call "%WINPYSCRIPTSDIR%\env.bat"
4+
"%WINPYDIR%\Scripts\pip.exe" install PyQt4-4.11.4-cp36-cp36m-win32.whl

‎bin/python3.6.6.2/pyqt4/pyqt4.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp36-cp36m-win32.whl

‎bin/python3.6.6.2/python-3.6.6/Lib/site-packages/PyQt4/qt.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[Paths]
2+
Prefix = .
3+
Binaries = .

‎bin/python3.6.6.2/python-3.6.6/qt.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[Paths]
2+
Prefix = Lib/site-packages/PyQt4
3+
Binaries = Lib/site-packages/PyQt4

‎bin/python3.6.6.2/scripts/env.bat‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
@echo off
2+
set WINPYDIRBASETMP=%~dp0..
3+
pushd %WINPYDIRBASETMP%
4+
set WINPYDIRBASE=%CD%
5+
popd
6+
7+
set WINPYDIR=%WINPYDIRBASE%\python-3.6.6
8+
9+
set WINPYVER=3.6.6.2Zero
10+
set HOME=%WINPYDIRBASE%\settings
11+
rem set WINPYDIRBASE=
12+
13+
set JUPYTER_DATA_DIR=%HOME%
14+
set WINPYARCH=WIN32
15+
if "%WINPYDIR:~-5%"=="amd64" set WINPYARCH=WIN-AMD64
16+
set FINDDIR=%WINDIR%\system32
17+
echo ;%PATH%; | %FINDDIR%\find.exe /C /I ";%WINPYDIR%\;" >nul
18+
if %ERRORLEVEL% NEQ 0 set PATH=%WINPYDIR%\Lib\site-packages\PyQt5;%WINPYDIR%\Lib\site-packages\PyQt4;%WINPYDIR%\Lib\site-packages\PySide2;%WINPYDIR%\;%WINPYDIR%\DLLs;%WINPYDIR%\Scripts;%WINPYDIR%\..\t;%WINPYDIR%\..\t\mingw32\bin;%WINPYDIR%\..\t\R\bin\i386;%WINPYDIR%\..\t\Julia\bin;%WINPYDIR%\..\t\n;%PATH%;
19+
20+
rem force default pyqt5 kit for Spyder if PyQt5 module is there
21+
if exist "%WINPYDIR%\Lib\site-packages\PyQt5\__init__.py" set QT_API=pyqt5
22+
23+
rem ******************
24+
rem handle R if included
25+
rem ******************
26+
if not exist "%WINPYDIRBASE%\t\R\bin" goto r_bad
27+
set R_HOME=%WINPYDIRBASE%\t\R
28+
if "%WINPYARCH%"=="WIN32" set R_HOMEbin=%R_HOME%\bin\i386
29+
if not "%WINPYARCH%"=="WIN32" set R_HOMEbin=%R_HOME%\bin\x64
30+
:r_bad
31+
32+
33+
rem ******************
34+
rem handle Julia if included
35+
rem ******************
36+
if not exist "%WINPYDIRBASE%\t\Julia\bin" goto julia_bad
37+
set JULIA_HOME=%WINPYDIRBASE%\t\Julia\bin\
38+
set JULIA_EXE=julia.exe
39+
set JULIA=%JULIA_HOME%%JULIA_EXE%
40+
set JULIA_PKGDIR=%WINPYDIRBASE%\settings\.julia
41+
:julia_bad
42+
43+
rem ******************
44+
rem handle ffmpeg if included
45+
rem ******************
46+
if not exist "%WINPYDIRBASE%\t\ffmpeg.exe" goto ffmpeg_bad
47+
set IMAGEIO_FFMPEG_EXE=%WINPYDIRBASE%\t\ffmpeg.exe
48+
49+
:ffmpeg_bad
50+
51+
52+
rem ******************
53+
rem handle PySide2 if included
54+
rem ******************
55+
set tmp_pyz=%WINPYDIR%\Lib\site-packages\PySide2
56+
if not exist "%tmp_pyz%" goto pyside2_conf_exist
57+
set tmp_pyz=%tmp_pyz%\qt.conf
58+
if exist "%tmp_pyz%" goto pyside2_conf_exist
59+
echo [Paths]>>"%tmp_pyz%"
60+
echo Prefix = .>>"%tmp_pyz%"
61+
echo Binaries = .>>"%tmp_pyz%"
62+
:pyside2_conf_exist
63+
64+
rem ******************
65+
rem handle PyQt5 if included
66+
rem ******************
67+
set tmp_pyz=%WINPYDIR%\Lib\site-packages\PyQt5
68+
if not exist "%tmp_pyz%" goto pyqt5_conf_exist
69+
set tmp_pyz=%tmp_pyz%\qt.conf
70+
if exist "%tmp_pyz%" goto pyqt5_conf_exist
71+
echo [Paths]>>"%tmp_pyz%"
72+
echo Prefix = .>>"%tmp_pyz%"
73+
echo Binaries = .>>"%tmp_pyz%"
74+
:pyqt5_conf_exist
75+
76+
rem ******************
77+
rem handle PyQt4 if included
78+
rem ******************
79+
set tmp_pyz=%WINPYDIR%\Lib\site-packages\PyQt4
80+
if not exist "%tmp_pyz%" goto pyqt4_conf_exist
81+
set tmp_pyz=%tmp_pyz%\qt.conf
82+
if exist "%tmp_pyz%" goto pyqt4_conf_exist
83+
echo [Paths]>>"%tmp_pyz%"
84+
echo Prefix = .>>"%tmp_pyz%"
85+
echo Binaries = .>>"%tmp_pyz%"
86+
:pyqt4_conf_exist
87+
88+
rem ******************
89+
rem handle Pyzo configuration part
90+
rem ******************
91+
if not exist "%HOME%\.pyzo" mkdir %HOME%\.pyzo
92+
if exist "%HOME%\.pyzo\config.ssdf" goto after_pyzo_conf
93+
set tmp_pyz="%HOME%\.pyzo\config.ssdf"
94+
echo shellConfigs2 = list:>>%tmp_pyz%
95+
echo dict:>>%tmp_pyz%
96+
echo name = 'Python'>>%tmp_pyz%
97+
echo exe = '.\\python.exe'>>%tmp_pyz%
98+
echo ipython = 'yes'>>%tmp_pyz%
99+
echo gui = 'none'>>%tmp_pyz%
100+
101+
:after_pyzo_conf
102+
103+
104+
rem ******************
105+
rem WinPython.ini part (removed from nsis)
106+
rem ******************
107+
if not exist "%WINPYDIRBASE%\settings" mkdir "%WINPYDIRBASE%\settings"
108+
set winpython_ini=%WINPYDIRBASE%\settings\winpython.ini
109+
if not exist "%winpython_ini%" (
110+
echo [debug]>>"%winpython_ini%"
111+
echo state = disabled>>"%winpython_ini%"
112+
echo [environment]>>"%winpython_ini%"
113+
echo ## <?> Uncomment lines to override environment variables>>"%winpython_ini%"
114+
echo #HOME = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%>>"%winpython_ini%"
115+
echo #JUPYTER_DATA_DIR = %%HOME%%>>"%winpython_ini%"
116+
echo #WINPYWORKDIR = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\Notebooks>>"%winpython_ini%"
117+
)
118+

‎bin/python3.6.6.2/settings/winpython.ini‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[debug]
2+
state = disabled
3+
[environment]
4+
#HOME = %HOMEDRIVE%%HOMEPATH%\Documents\WinPython%WINPYVER%
5+
#JUPYTER_DATA_DIR = %HOME%
6+
#WINPYWORKDIR = %HOMEDRIVE%%HOMEPATH%\Documents\WinPython%WINPYVER%\Notebooks

‎bin/python3.7.0.2/bin/python.bat‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@echo off
2+
set WINPYSCRIPTSDIR=%~dp0..\scripts
3+
call "%WINPYSCRIPTSDIR%\env_for_icons.bat"
4+
cd/D "%WINPYWORKDIR%"
5+
rem backward compatibility for python command-line users
6+
"%WINPYDIR%\python.exe" %*

0 commit comments

Comments
 (0)