Polber commented on code in PR #29958:
URL: https://github.com/apache/beam/pull/29958#discussion_r1447765955
##########
sdks/python/apache_beam/yaml/yaml_provider.py:
##########
@@ -730,36 +734,50 @@ def _path(cls, base_python, packages):
def _create_venv_from_scratch(cls, base_python, packages):
venv = cls._path(base_python, packages)
if not os.path.exists(venv):
- subprocess.run([base_python, '-m', 'venv', venv], check=True)
- venv_python = os.path.join(venv, 'bin', 'python')
- subprocess.run([venv_python, '-m', 'ensurepip'], check=True)
- subprocess.run([venv_python, '-m', 'pip', 'install'] + packages,
- check=True)
- with open(venv + '-requirements.txt', 'w') as fout:
- fout.write('\n'.join(packages))
+ try:
+ subprocess.run([base_python, '-m', 'venv', venv], check=True)
+ venv_python = os.path.join(venv, 'bin', 'python')
+ subprocess.run([venv_python, '-m', 'ensurepip'], check=True)
+ subprocess.run([venv_python, '-m', 'pip', 'install'] + packages,
+ check=True)
+ with open(venv + '-requirements.txt', 'w') as fout:
+ fout.write('\n'.join(packages))
+ except: # pylint: disable=bare-except
+ if os.path.exists(venv):
+ shutil.rmtree(venv, ignore_errors=True)
+ raise
return venv
@classmethod
def _create_venv_from_clone(cls, base_python, packages):
venv = cls._path(base_python, packages)
if not os.path.exists(venv):
- clonable_venv = cls._create_venv_to_clone(base_python)
- clonable_python = os.path.join(clonable_venv, 'bin', 'python')
- subprocess.run(
- [clonable_python, '-m', 'clonevirtualenv', clonable_venv, venv],
- check=True)
- venv_binary = os.path.join(venv, 'bin', 'python')
- subprocess.run([venv_binary, '-m', 'pip', 'install'] + packages,
- check=True)
- with open(venv + '-requirements.txt', 'w') as fout:
- fout.write('\n'.join(packages))
+ try:
+ clonable_venv = cls._create_venv_to_clone(base_python)
+ clonable_python = os.path.join(clonable_venv, 'bin', 'python')
+ subprocess.run(
+ [clonable_python, '-m', 'clonevirtualenv', clonable_venv, venv],
+ check=True)
+ venv_binary = os.path.join(venv, 'bin', 'python')
+ subprocess.run([venv_binary, '-m', 'pip', 'install'] + packages,
+ check=True)
+ with open(venv + '-requirements.txt', 'w') as fout:
+ fout.write('\n'.join(packages))
+ except: # pylint: disable=bare-except
+ if os.path.exists(venv):
+ shutil.rmtree(venv, ignore_errors=True)
+ raise
return venv
@classmethod
def _create_venv_to_clone(cls, base_python):
+ if '.dev' in beam_version:
+ base_venv = os.path.dirname(os.path.dirname(base_python))
+ print('Cloning dev environment from', base_venv)
return cls._create_venv_from_scratch(
- base_python, [
- 'apache_beam[dataframe,gcp,test]==' + beam_version,
+ base_python,
+ [
+ 'apache_beam[dataframe,gcp,test,yaml]==' + beam_version,
Review Comment:
Let's merge this and I can play around and see if I still get any errors
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
