diff --git a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb index f66045065..1862a724a 100644 --- a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb +++ b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb @@ -122,14 +122,15 @@ "import pathlib\n", "import sys\n", "\n", - "!apt-get install -y ruby-full time build-essential\n", - "!apt install -f libqt4-designer libqt4-xml libqt4-sql libqt4-network libqtcore4 libqtgui4\n", + "!apt install -y time build-essential\n", "!curl -Ls https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -xvj bin/micromamba\n", "conda_prefix_path = pathlib.Path('conda-env')\n", "CONDA_PREFIX = str(conda_prefix_path.resolve())\n", "%env CONDA_PREFIX={CONDA_PREFIX}\n", - "!bin/micromamba create --yes --prefix $CONDA_PREFIX\n", "!echo 'python ==3.7*' >> {CONDA_PREFIX}/conda-meta/pinned\n", + "site_package_path = conda_prefix_path / 'lib/python3.7/site-packages'\n", + "sys.path.append(str(site_package_path.resolve()))\n", + "!bin/micromamba create --yes --prefix $CONDA_PREFIX\n", "!bin/micromamba install --yes --prefix $CONDA_PREFIX \\\n", " --channel litex-hub \\\n", " --channel main \\\n", @@ -137,16 +138,14 @@ " magic \\\n", " netgen \\\n", " openroad \\\n", - " yosys\n", + " yosys \\\n", + " klayout \n", "!bin/micromamba install --yes --prefix $CONDA_PREFIX \\\n", " --channel conda-forge \\\n", " svgutils ngspice\n", "\n", - "!wget https://www.klayout.org/downloads/Ubuntu-18/klayout_0.27.11-1_amd64.deb\n", - "!dpkg -i klayout_0.27.11-1_amd64.deb\n", "!python -m pip install pyyaml click gdstk --no-binary gdstk\n", "PATH = os.environ['PATH']\n", - "\n", "# clone OpenFASOC repo\n", "!git clone https://github.com/idea-fasoc/OpenFASOC\n", "# setup env\n", @@ -162,9 +161,7 @@ "PATH = os.environ['PATH']\n", "%env PATH={PATH}:{CONDA_PREFIX}/bin:{OPENFASOC_ROOT}:{OPENFASOC_ROOT}/openfasoc/generators/temp-sense-gen/tools\n", "LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')\n", - "%env LD_LIBRARY_PATH={LD_LIBRARY_PATH}:{CONDA_PREFIX}/lib\n", - "site_package_path = conda_prefix_path / 'lib/python3.7/site-packages'\n", - "sys.path.append(str(site_package_path.resolve()))" + "%env LD_LIBRARY_PATH={LD_LIBRARY_PATH}:{CONDA_PREFIX}/lib/python3.7\n" ] }, {