From 4a3c232a5c2a97b71070f240f5599e0b601ea509 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Mon, 21 Jan 2019 15:41:37 -0500 Subject: [PATCH 01/14] Fixes Setup,py error on Windows #676 Fixes Setup,py error on Windows, added shell script to check python environment, print the python version, copy files from /kubernetes/base to /kubernetes/ and finally runs python setup.py install --- scripts/setup-fix.bat | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 scripts/setup-fix.bat diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat new file mode 100644 index 0000000000..208aee9679 --- /dev/null +++ b/scripts/setup-fix.bat @@ -0,0 +1,11 @@ +if ! [ -x "$(command -v python)" ]; +then + echo Python environment notfound.. +else + echo Python environment found.. +fi +python --version +cp -R ../kubernetes/base/* ../kubernetes/ +cd ../ && python setup.py install + + From 769ef0ea65925fc671862452a581ea6f57f78b06 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Wed, 23 Jan 2019 00:26:22 +0530 Subject: [PATCH 02/14] Update setup-fix.bat --- scripts/setup-fix.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat index 208aee9679..902d879ca9 100644 --- a/scripts/setup-fix.bat +++ b/scripts/setup-fix.bat @@ -1,8 +1,8 @@ if ! [ -x "$(command -v python)" ]; then - echo Python environment notfound.. + echo "Python environment notfound.." else - echo Python environment found.. + echo "Python environment found.." fi python --version cp -R ../kubernetes/base/* ../kubernetes/ From 51e0aaba7391a43193692040243f1f53b071a257 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Thu, 24 Jan 2019 23:59:12 +0530 Subject: [PATCH 03/14] Update setup-fix.bat --- scripts/setup-fix.bat | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat index 902d879ca9..b85adaa823 100644 --- a/scripts/setup-fix.bat +++ b/scripts/setup-fix.bat @@ -1,11 +1,3 @@ -if ! [ -x "$(command -v python)" ]; -then - echo "Python environment notfound.." -else - echo "Python environment found.." -fi -python --version -cp -R ../kubernetes/base/* ../kubernetes/ -cd ../ && python setup.py install +where python >null && echo Python environment found.. && python --version && xcopy ..\kubernetes\base\* ..\kubernetes\ /E && cd ../ && python setup.py install From afb91583e1df78247f2a9df2d920c3399c7fa424 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Fri, 25 Jan 2019 00:00:11 +0530 Subject: [PATCH 04/14] Update setup-fix.bat --- scripts/setup-fix.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat index b85adaa823..20df8d0270 100644 --- a/scripts/setup-fix.bat +++ b/scripts/setup-fix.bat @@ -1,3 +1 @@ where python >null && echo Python environment found.. && python --version && xcopy ..\kubernetes\base\* ..\kubernetes\ /E && cd ../ && python setup.py install - - From 6a6d88027d7dc3b9e361e362a1f6598531802031 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Fri, 25 Jan 2019 00:25:52 +0530 Subject: [PATCH 05/14] Update setup-fix.bat --- scripts/setup-fix.bat | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat index 20df8d0270..c8b9e08a0f 100644 --- a/scripts/setup-fix.bat +++ b/scripts/setup-fix.bat @@ -1 +1,5 @@ -where python >null && echo Python environment found.. && python --version && xcopy ..\kubernetes\base\* ..\kubernetes\ /E && cd ../ && python setup.py install +( where python >null + echo Python environment found.. + python --version + copy ..\kubernetes\base\* ..\kubernetes\ + cd ../ && python setup.py install ) From 357f23e42a64cdc9c3bc177b886944288bd5c195 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Fri, 25 Jan 2019 01:18:50 +0530 Subject: [PATCH 06/14] Update setup-fix.bat --- scripts/setup-fix.bat | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat index c8b9e08a0f..3a43f090e3 100644 --- a/scripts/setup-fix.bat +++ b/scripts/setup-fix.bat @@ -1,5 +1,8 @@ -( where python >null - echo Python environment found.. +( python --version>nul 2>&1 && ( + echo Python environment found.. + ) || ( + echo Python environment not found.. + ) python --version copy ..\kubernetes\base\* ..\kubernetes\ cd ../ && python setup.py install ) From 37fcd6944f67f9c689ba594cbfe299fe64648505 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Fri, 25 Jan 2019 03:05:52 +0530 Subject: [PATCH 07/14] Update setup-fix.bat --- scripts/setup-fix.bat | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat index 3a43f090e3..1e10c060cb 100644 --- a/scripts/setup-fix.bat +++ b/scripts/setup-fix.bat @@ -1,7 +1,5 @@ -( python --version>nul 2>&1 && ( - echo Python environment found.. - ) || ( - echo Python environment not found.. +( python --version>nul 2>&1 && ( + echo Python environment found.. ) python --version copy ..\kubernetes\base\* ..\kubernetes\ From a7b035fdb4306102dedf94968e1dc0bcf322c4ab Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Fri, 25 Jan 2019 03:06:31 +0530 Subject: [PATCH 08/14] Update setup-fix.bat --- scripts/setup-fix.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat index 1e10c060cb..a9970822ab 100644 --- a/scripts/setup-fix.bat +++ b/scripts/setup-fix.bat @@ -3,4 +3,4 @@ ) python --version copy ..\kubernetes\base\* ..\kubernetes\ - cd ../ && python setup.py install ) + cd .. && python setup.py install ) From e5bfc75180c5ed9d131363ac4c81a00f904f62f5 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Mon, 28 Jan 2019 23:59:10 +0530 Subject: [PATCH 09/14] Update setup-fix.bat --- scripts/setup-fix.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat index a9970822ab..e322ebc9a1 100644 --- a/scripts/setup-fix.bat +++ b/scripts/setup-fix.bat @@ -1,5 +1,5 @@ ( python --version>nul 2>&1 && ( - echo Python environment found.. + echo Python environment found. ) python --version copy ..\kubernetes\base\* ..\kubernetes\ From f2dacbfd8135ff1e1f87088a1aea99d23668c2ad Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Tue, 29 Jan 2019 11:08:51 +0530 Subject: [PATCH 10/14] Update and rename setup-fix.bat to windows-setup-fix.bat --- scripts/setup-fix.bat | 6 ------ scripts/windows-setup-fix.bat | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 scripts/setup-fix.bat create mode 100644 scripts/windows-setup-fix.bat diff --git a/scripts/setup-fix.bat b/scripts/setup-fix.bat deleted file mode 100644 index e322ebc9a1..0000000000 --- a/scripts/setup-fix.bat +++ /dev/null @@ -1,6 +0,0 @@ -( python --version>nul 2>&1 && ( - echo Python environment found. - ) - python --version - copy ..\kubernetes\base\* ..\kubernetes\ - cd .. && python setup.py install ) diff --git a/scripts/windows-setup-fix.bat b/scripts/windows-setup-fix.bat new file mode 100644 index 0000000000..a27d42932b --- /dev/null +++ b/scripts/windows-setup-fix.bat @@ -0,0 +1,6 @@ +( python --version>nul 2>&1 && ( & :: checks for the availability of python environment + echo Python environment found. & :: prints if python environment is found + ) + python --version & :: prints python environment version + copy ..\kubernetes\base\* ..\kubernetes\ & :: copies every file & folder that's inside \kubernetes\base\ to \kubernetes\ + cd .. && python setup.py install ) & :: runs setup.py file From 13f3391b2caac0ad119e726e58d56f6f2000c1d4 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Tue, 29 Jan 2019 11:10:54 +0530 Subject: [PATCH 11/14] Update windows-setup-fix.bat --- scripts/windows-setup-fix.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/windows-setup-fix.bat b/scripts/windows-setup-fix.bat index a27d42932b..3befb9faff 100644 --- a/scripts/windows-setup-fix.bat +++ b/scripts/windows-setup-fix.bat @@ -1,6 +1,6 @@ -( python --version>nul 2>&1 && ( & :: checks for the availability of python environment - echo Python environment found. & :: prints if python environment is found +( python --version>nul 2>&1 && ( :: checks for the availability of python environment + echo Python environment found. :: prints if python environment is found ) - python --version & :: prints python environment version - copy ..\kubernetes\base\* ..\kubernetes\ & :: copies every file & folder that's inside \kubernetes\base\ to \kubernetes\ - cd .. && python setup.py install ) & :: runs setup.py file + python --version :: prints python environment version + copy ..\kubernetes\base\* ..\kubernetes\ :: copies every file & folder that's inside \kubernetes\base\ to \kubernetes\ + cd .. && python setup.py install ) :: runs setup.py file From 51ae8850534bc5089823ca4f04e69b4accabcfd3 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Tue, 29 Jan 2019 11:12:41 +0530 Subject: [PATCH 12/14] Update windows-setup-fix.bat --- scripts/windows-setup-fix.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/windows-setup-fix.bat b/scripts/windows-setup-fix.bat index 3befb9faff..512eb21c0d 100644 --- a/scripts/windows-setup-fix.bat +++ b/scripts/windows-setup-fix.bat @@ -1,6 +1,6 @@ -( python --version>nul 2>&1 && ( :: checks for the availability of python environment - echo Python environment found. :: prints if python environment is found +( python --version>nul 2>&1 && ( REM checks the availability of python environment + echo Python environment found. REM prints if python environment is found ) - python --version :: prints python environment version - copy ..\kubernetes\base\* ..\kubernetes\ :: copies every file & folder that's inside \kubernetes\base\ to \kubernetes\ - cd .. && python setup.py install ) :: runs setup.py file + python --version REM prints python environment version + copy ..\kubernetes\base\* ..\kubernetes\ REM copies every file and folder that's inside \kubernetes\base\ to \kubernetes\ + cd .. && python setup.py install ) REM runs setup.py file From 3fb317f2ea446abbb306c0068cbc82a79095a0f9 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Tue, 29 Jan 2019 11:25:08 +0530 Subject: [PATCH 13/14] Update windows-setup-fix.bat --- scripts/windows-setup-fix.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/windows-setup-fix.bat b/scripts/windows-setup-fix.bat index 512eb21c0d..f34cf15342 100644 --- a/scripts/windows-setup-fix.bat +++ b/scripts/windows-setup-fix.bat @@ -1,5 +1,5 @@ ( python --version>nul 2>&1 && ( REM checks the availability of python environment - echo Python environment found. REM prints if python environment is found + echo "Python environment found." REM prints if python environment is found ) python --version REM prints python environment version copy ..\kubernetes\base\* ..\kubernetes\ REM copies every file and folder that's inside \kubernetes\base\ to \kubernetes\ From b2e72320f6b319869f352bbb3d7c945635b1b882 Mon Sep 17 00:00:00 2001 From: Sai Adarsh Date: Wed, 30 Jan 2019 12:48:51 +0530 Subject: [PATCH 14/14] Update windows-setup-fix.bat --- scripts/windows-setup-fix.bat | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/windows-setup-fix.bat b/scripts/windows-setup-fix.bat index f34cf15342..a11a75a637 100644 --- a/scripts/windows-setup-fix.bat +++ b/scripts/windows-setup-fix.bat @@ -1,6 +1,10 @@ -( python --version>nul 2>&1 && ( REM checks the availability of python environment - echo "Python environment found." REM prints if python environment is found +REM Install python client in Windows. +REM Windows doesn't have symbolic link that this repo uses. +REM This batch script provides a workaround for symbolic link by copying the folders over. + +( python --version>nul 2>&1 && ( + echo "Python environment found." ) - python --version REM prints python environment version - copy ..\kubernetes\base\* ..\kubernetes\ REM copies every file and folder that's inside \kubernetes\base\ to \kubernetes\ - cd .. && python setup.py install ) REM runs setup.py file + python --version + copy ..\kubernetes\base\* ..\kubernetes\ + cd .. && python setup.py install )