pw_env_setup: Remove setup py roots argument
It's no longer used by Pigweed or any downstream projects.
Change-Id: Ida7592bbcf625a152047cdc23ca5c7b0c60fa2f0
Bug: 287
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/24202
Commit-Queue: Rob Mohr <mohrr@google.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>
diff --git a/pw_env_setup/docs.rst b/pw_env_setup/docs.rst
index 640593f..018424e 100644
--- a/pw_env_setup/docs.rst
+++ b/pw_env_setup/docs.rst
@@ -204,7 +204,7 @@
--install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" \
--use-pigweed-defaults \
--cipd-package-file "$PW_PROJECT_ROOT/path/to/cipd.json" \
- --virtualenv-setup-py-root "$PW_PROJECT_ROOT"
+ --virtualenv-gn-target "$PW_PROJECT_ROOT#:python.install"
Projects wanting some of the Pigweed environment packages but not all of them
should not use ``--use-pigweed-defaults`` and must manually add the references
diff --git a/pw_env_setup/py/pw_env_setup/env_setup.py b/pw_env_setup/py/pw_env_setup/env_setup.py
index 653af47..aff61be 100755
--- a/pw_env_setup/py/pw_env_setup/env_setup.py
+++ b/pw_env_setup/py/pw_env_setup/env_setup.py
@@ -174,9 +174,8 @@
"""Run environment setup for Pigweed."""
def __init__(self, pw_root, cipd_cache_dir, shell_file, quiet, install_dir,
use_pigweed_defaults, cipd_package_file, virtualenv_root,
- virtualenv_requirements, virtualenv_setup_py_root,
- virtualenv_gn_target, cargo_package_file, enable_cargo,
- json_file, project_root):
+ virtualenv_requirements, virtualenv_gn_target,
+ cargo_package_file, enable_cargo, json_file, project_root):
self._env = environment.Environment()
self._project_root = project_root
self._pw_root = pw_root
@@ -198,7 +197,6 @@
self._cipd_package_file = []
self._virtualenv_requirements = []
- self._virtualenv_setup_py_root = []
self._virtualenv_gn_targets = []
self._cargo_package_file = []
self._enable_cargo = enable_cargo
@@ -230,7 +228,6 @@
self._cipd_package_file.extend(cipd_package_file)
self._virtualenv_requirements.extend(virtualenv_requirements)
- self._virtualenv_setup_py_root.extend(virtualenv_setup_py_root)
self._virtualenv_gn_targets.extend(virtualenv_gn_target)
self._cargo_package_file.extend(cargo_package_file)
@@ -390,9 +387,7 @@
requirements, req_glob_warnings = _process_globs(
self._virtualenv_requirements)
- setup_py_roots, setup_glob_warnings = _process_globs(
- self._virtualenv_setup_py_root)
- result = result_func(req_glob_warnings + setup_glob_warnings)
+ result = result_func(req_glob_warnings)
orig_python3 = _which('python3')
with self._env():
@@ -410,8 +405,7 @@
shutil.copyfile(new_python3, python3_copy)
new_python3 = python3_copy
- if (not requirements and not self._virtualenv_setup_py_root
- and not self._virtualenv_gn_targets):
+ if not requirements and not self._virtualenv_gn_targets:
return result(_Result.Status.SKIPPED)
if not virtualenv_setup.install(
@@ -419,7 +413,6 @@
venv_path=self._virtualenv_root,
requirements=requirements,
gn_targets=self._virtualenv_gn_targets,
- setup_py_roots=setup_py_roots,
python=new_python3,
env=self._env,
):
@@ -535,13 +528,6 @@
)
parser.add_argument(
- '--virtualenv-setup-py-root',
- help='Directory in which to recursively search for setup.py files.',
- default=[],
- action='append',
- )
-
- parser.add_argument(
'--virtualenv-gn-target',
help=('GN targets that build and install Python packages. Format: '
"path/to/gn_root#target"),
@@ -583,7 +569,6 @@
'use_pigweed_defaults',
'cipd_package_file',
'virtualenv_requirements',
- 'virtualenv_setup_py_root',
'virtualenv_gn_target',
'cargo_package_file',
)
diff --git a/pw_env_setup/py/pw_env_setup/virtualenv_setup/__main__.py b/pw_env_setup/py/pw_env_setup/virtualenv_setup/__main__.py
index cfdb3a6..29ff21a 100644
--- a/pw_env_setup/py/pw_env_setup/virtualenv_setup/__main__.py
+++ b/pw_env_setup/py/pw_env_setup/virtualenv_setup/__main__.py
@@ -41,11 +41,6 @@
default=[],
action='append',
help='requirements.txt files to install')
- parser.add_argument('-s',
- '--setup-py-roots',
- default=[],
- action='append',
- help='places to search for setup.py files')
parser.add_argument('--gn-target',
dest='gn_targets',
default=[],
diff --git a/pw_env_setup/py/pw_env_setup/virtualenv_setup/install.py b/pw_env_setup/py/pw_env_setup/virtualenv_setup/install.py
index f70c067..98f5900 100644
--- a/pw_env_setup/py/pw_env_setup/virtualenv_setup/install.py
+++ b/pw_env_setup/py/pw_env_setup/virtualenv_setup/install.py
@@ -122,7 +122,6 @@
requirements=(),
gn_targets=(),
python=sys.executable,
- setup_py_roots=(),
env=None,
):
"""Creates a venv and installs all packages in this Git repo."""
@@ -167,8 +166,6 @@
if not pw_root:
raise GitRepoNotFound()
- setup_py_files = _find_files_by_name(setup_py_roots, 'setup.py')
-
# Sometimes we get an error saying "Egg-link ... does not match
# installed location". This gets around that. The egg-link files
# all come from 'pw'-prefixed packages we installed with --editable.
@@ -183,28 +180,12 @@
pip_install('--upgrade', 'pip')
- def package(pkg_path):
- if isinstance(pkg_path, bytes) and bytes != str:
- pkg_path = pkg_path.decode()
- return os.path.join(pw_root, os.path.dirname(pkg_path))
-
if requirements:
requirement_args = tuple('--requirement={}'.format(req)
for req in requirements)
pip_install('--log', os.path.join(venv_path, 'pip-requirements.log'),
*requirement_args)
- if setup_py_files:
- # Run through sorted so pw_cli (on which other packages depend) comes
- # early in the list.
- # TODO(mohrr) come up with a way better than just using sorted().
- find_args = tuple('--find-links={}'.format(package(x))
- for x in setup_py_files)
- package_args = tuple('--editable={}'.format(package(path))
- for path in sorted(setup_py_files))
- pip_install('--log', os.path.join(venv_path, 'pip-packages.log'),
- *(find_args + package_args))
-
def install_packages(gn_target):
build = os.path.join(venv_path, gn_target.name)
diff --git a/pw_presubmit/py/pw_presubmit/environment.py b/pw_presubmit/py/pw_presubmit/environment.py
index 98a935d..d0d7f37 100644
--- a/pw_presubmit/py/pw_presubmit/environment.py
+++ b/pw_presubmit/py/pw_presubmit/environment.py
@@ -63,7 +63,6 @@
def init_virtualenv(
pigweed_root: Path,
output_directory: Path,
- setup_py_roots: Iterable[Union[Path, str]] = (),
requirements: Iterable[Union[Path, str]] = (),
gn_targets: Iterable[str] = (),
) -> None:
@@ -89,6 +88,5 @@
f'--venv_path={output_directory}',
f'--requirements={virtualenv_source / "requirements.txt"}',
*(f'--requirements={x}' for x in requirements),
- *(f'--setup-py-root={p}' for p in setup_py_roots),
*(f'--gn-target={t}' for t in gn_targets),
)
