Skip to content

Commit

Permalink
pw_env_setup: Cleanup pwbug/67 TODOs
Browse files Browse the repository at this point in the history
Change-Id: I4edb7b5733700a70d3be41145f5a71633d6b459f
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/105800
Commit-Queue: Auto-Submit <[email protected]>
Pigweed-Auto-Submit: Rob Mohr <[email protected]>
Reviewed-by: Wyatt Hepler <[email protected]>
  • Loading branch information
mohrr authored and CQ Bot Account committed Aug 12, 2022
1 parent ee57f5c commit 61d60d3
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 9 deletions.
6 changes: 0 additions & 6 deletions pw_env_setup/py/pw_env_setup/env_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@
import sys
import time

# TODO(pwbug/67): Remove import hacks once the oxidized prebuilt binaries are
# proven stable for first-time bootstrapping. For now, continue to support
# running directly from source without assuming a functioning Python
# environment when running for the first time.

# If we're running oxidized, filesystem-centric import hacks won't work. In that
# case, jump straight to the imports and assume oxidation brought in the deps.
if not getattr(sys, 'oxidized', False):
Expand Down Expand Up @@ -76,7 +71,6 @@
from pw_env_setup import windows_env_start


# TODO(pwbug/67, pwbug/68) switch to shutil.which().
def _which(executable,
pathsep=os.pathsep,
use_pathext=None,
Expand Down
1 change: 0 additions & 1 deletion pw_env_setup/py/pw_env_setup/virtualenv_setup/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@
# the License.
"""Sets up a Python 3 virtualenv for Pigweed."""

# TODO(pwbug/67) move install.py contents to this file.
from .install import *
2 changes: 0 additions & 2 deletions pw_env_setup/py/pw_env_setup/virtualenv_setup/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
import os
import sys

# TODO(pwbug/67) switch back to 'from pw_env_setup import virtualenv_setup'.
# from pw_env_setup import virtualenv_setup
# pylint: disable=import-error
try:
from pw_env_setup import virtualenv_setup
Expand Down

0 comments on commit 61d60d3

Please sign in to comment.