From 67c978b7a45c5c751df336f4d48fd7723e808a30 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Mon, 1 Jun 2020 10:32:41 +0100 Subject: [PATCH] Don't use virtualenv to create the venv on Windows. --- Make.bat | 2 +- pkg/win32/README.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Make.bat b/Make.bat index 9c3b49536..4a5ddb729 100644 --- a/Make.bat +++ b/Make.bat @@ -169,7 +169,7 @@ REM Main build sequence Ends IF NOT EXIST "%BUILDROOT%" MKDIR "%BUILDROOT%" CD "%BUILDROOT%" - "%PGADMIN_PYTHON_DIR%\Scripts\virtualenv.exe" venv + "%PGADMIN_PYTHON_DIR%\python.exe" -m venv venv XCOPY /S /I /E /H /Y "%PGADMIN_PYTHON_DIR%\DLLs" "%BUILDROOT%\venv\DLLs" > nul || EXIT /B 1 XCOPY /S /I /E /H /Y "%PGADMIN_PYTHON_DIR%\Lib" "%BUILDROOT%\venv\Lib" > nul || EXIT /B 1 diff --git a/pkg/win32/README.txt b/pkg/win32/README.txt index 0d6cfa21a..d0d4fc8f8 100644 --- a/pkg/win32/README.txt +++ b/pkg/win32/README.txt @@ -19,11 +19,9 @@ Choose the Desktop development with C++ option. choco install -y bzip2 cmake diffutils gzip git innosetup nodejs-lts python strawberryperl wget yarn -5) Upgrade pip (this may give a permissions error that can be ignored) and - install the virtualenv package: +5) Upgrade pip (this may give a permissions error that can be ignored): pip install --upgrade pip -pip install virtualenv Building dependencies ===================== @@ -115,7 +113,7 @@ yarn run bundle 3) Create a virtual env cd pgadmin4 -python -m venv +python -m venv venv pip install -r web\regression\requirements.txt pip install sphinx