Skip to content

Commit

Permalink
Issue Survey Fixes (#2056)
Browse files Browse the repository at this point in the history
~ Updated install documentation
~ Fixed issue where the issue survey's PDK checker uses `./pdks` instead of `~/.volare`
- Dropped `pip` requirement/check: `venv`s include `pip` regardless
  • Loading branch information
donn authored Nov 22, 2023
1 parent d241d11 commit ee452da
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 27 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
4 changes: 1 addition & 3 deletions dependencies/verify_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
29 changes: 7 additions & 22 deletions env.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
openlane_dir = dirname(abspath(__file__))
is_root = os.geteuid() == 0


# Commands
def tool_list():
from dependencies.tool import Tool
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit ee452da

Please sign in to comment.