diff --git a/README.md b/README.md index 69899ed8b..d9d625416 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ The short version is, to install the OpenLane environment... 1. [Get Docker](https://docs.docker.com/get-docker/) (or a compatible container engine) * On Ubuntu, follow the [Docker post install instructions](https://docs.docker.com/engine/install/linux-postinstall/) after you install Docker. 2. Get Python 3.6 or higher ([macOS](https://formulae.brew.sh/formula/python3) | [Ubuntu](https://packages.ubuntu.com/focal/python3)) - * On Ubuntu, you may also need to install venv: `apt-get install python3-venv`, and pip: `apt-get install python3-pip`. + * On Ubuntu, you may also need to install venv: `apt-get install python3-venv` 3. Get git ([macOS](https://formulae.brew.sh/formula/git) | [Ubuntu](https://packages.ubuntu.com/focal/git)) 4. Get GNU Make ([macOS](https://formulae.brew.sh/formula/make) | [Ubuntu](https://packages.ubuntu.com/focal/make)) diff --git a/dependencies/verify_versions.py b/dependencies/verify_versions.py index 45b0cd9e8..cdc81281c 100644 --- a/dependencies/verify_versions.py +++ b/dependencies/verify_versions.py @@ -61,9 +61,7 @@ def verify_versions( if not no_pdks and pdk is not None: try: # 2. Check if the PDK is compatible with Flow Scripts - pdk_root = os.getenv("PDK_ROOT") - if not os.getenv("PDK_ROOT"): - pdk_root = join(openlane_dir, "pdks") + pdk_root = os.getenv("PDK_ROOT", os.path.expanduser("~/.volare")) if functools.reduce( lambda x, y: x or y, diff --git a/docs/source/getting_started/installation/wsl_ubuntu_packages.md b/docs/source/getting_started/installation/wsl_ubuntu_packages.md index d809aab18..084031c85 100644 --- a/docs/source/getting_started/installation/wsl_ubuntu_packages.md +++ b/docs/source/getting_started/installation/wsl_ubuntu_packages.md @@ -5,5 +5,5 @@ Update packages database and upgrade the packages to avoid version mismatches th ```bash sudo apt-get update sudo apt-get upgrade -sudo apt install -y build-essential python3 python3-venv python3-pip make git +sudo apt install -y build-essential python3 python3-venv make git ``` diff --git a/env.py b/env.py index 6b6abe963..bcd35de7c 100755 --- a/env.py +++ b/env.py @@ -35,6 +35,7 @@ openlane_dir = dirname(abspath(__file__)) is_root = os.geteuid() == 0 + # Commands def tool_list(): from dependencies.tool import Tool @@ -168,36 +169,20 @@ def issue_survey(): % get_tag() ) - pip_ok = True + venv_ok = True try: - import pip # noqa F401 + import venv # noqa F401 except ImportError: - pip_ok = False + venv_ok = False alert = ( - "pip: " + "INSTALLED" - if pip_ok - else "NOT FOUND: Please install pip using your operating system's package manager." + "python-venv: " + "INSTALLED" + if venv_ok + else "NOT FOUND: Install python3-venv using your operating system's package manager." ) - final_report += "%s\n" % alert print(alert, file=alerts) - if pip_ok: - venv_ok = True - try: - import venv # noqa F401 - except ImportError: - venv_ok = False - - alert = ( - "python-venv: " + "INSTALLED" - if venv_ok - else "NOT FOUND: Please install python-venv using your operating system's package manager." - ) - final_report += "%s\n" % alert - print(alert, file=alerts) - if python_ok: from dependencies.verify_versions import verify_versions