From f49ab5296742cc7789a2685ca8d1b501552e4fbc Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 14 Jun 2021 14:35:16 +0200 Subject: [PATCH 1/5] Fix environment creation with virtualenv 20.X --- requirements.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.py b/requirements.py index 387b867..eb39f83 100644 --- a/requirements.py +++ b/requirements.py @@ -54,7 +54,7 @@ sys.argv = ['', VENV_DIR] try: sys_stdout.write('creating virtualenv {}\n'.format(VENV_DIR).encode()) - virtualenv.main() + virtualenv.cli_run([VENV_DIR]) finally: sys.argv = original From 5414aca4c60d85c11dbeddf84d327c5281b588af Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 8 Sep 2022 18:37:36 +0200 Subject: [PATCH 2/5] Fix stderr/stdout --- index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.js b/index.js index 6770f21..c7e8a3d 100644 --- a/index.js +++ b/index.js @@ -315,6 +315,8 @@ pip3 install -U virtualenv && ${runPy} this.log('Installing packagings: ' + cmd.join(' ')); const ret = ChildProcess.spawnSync(cmd[0], cmd.slice(1)); + ret.stderr = ret.stderr || '' + ret.stdout = ret.stdout || '' this.log(ret.stderr.toString()); this.log(ret.stdout.toString()); From 1de1237dcda0de0ae2eaa4699b191e0442e1bd50 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 25 Nov 2022 16:57:24 +0100 Subject: [PATCH 3/5] Add new warning string for isNotPipWarning --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index c7e8a3d..2dc0b78 100644 --- a/index.js +++ b/index.js @@ -320,7 +320,7 @@ pip3 install -U virtualenv && ${runPy} this.log(ret.stderr.toString()); this.log(ret.stdout.toString()); - var isNotPipWarning = ret.stderr.indexOf('You are using pip version') < 0; + var isNotPipWarning = ret.stderr.indexOf('You are using pip version') < 0 && ret.stderr.indexOf('A new release of pip available') < 0; if (ret.error || (ret.stderr.length != 0 && isNotPipWarning)) { this.log('Unhandled error in pip, not deploying to AWS.'); return BbPromise.reject(ret.error) From 76ebc179e986d15d09742d98b896870f510532a6 Mon Sep 17 00:00:00 2001 From: paul Date: Mon, 17 Apr 2023 19:42:10 +0200 Subject: [PATCH 4/5] Change warning string for isNotPipWarning --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 2dc0b78..870eaa2 100644 --- a/index.js +++ b/index.js @@ -320,7 +320,7 @@ pip3 install -U virtualenv && ${runPy} this.log(ret.stderr.toString()); this.log(ret.stdout.toString()); - var isNotPipWarning = ret.stderr.indexOf('You are using pip version') < 0 && ret.stderr.indexOf('A new release of pip available') < 0; + var isNotPipWarning = ret.stderr.indexOf('You are using pip version') < 0 && ret.stderr.indexOf('A new release of pip') < 0; if (ret.error || (ret.stderr.length != 0 && isNotPipWarning)) { this.log('Unhandled error in pip, not deploying to AWS.'); return BbPromise.reject(ret.error) From b28b159c015e47b2c2c003fdfe04aec649776b00 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 29 Mar 2024 17:38:59 +0100 Subject: [PATCH 5/5] Update readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index da0e913..0440176 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +This project is a fork of the unmaintained repository [cfchou/serverless-python-individually](https://github.com/cfchou/serverless-python-individually) + +It fixes errors due to virtualenv en pip versions. + # serverless-python-individually [![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com)