From 468a82625a11a6134db2dac3adf3fda150b2fc56 Mon Sep 17 00:00:00 2001 From: Smit-create Date: Sun, 23 Apr 2023 13:41:45 +0530 Subject: [PATCH 1/5] CI: fix graphviz --- .github/workflows/ci.yml | 8 ++++---- environment.yml | 3 ++- lectures/networks.md | 9 ++++++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2cbcdb7..64d3a4f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: python-version: "3.10" environment-file: environment.yml activate-environment: quantecon - - name: Graphics Support - run: | - sudo apt-get -qq update && sudo apt-get install -y graphviz + # - name: Graphics Support + # run: | + # sudo apt-get -qq update && sudo apt-get install -y graphviz # - name: Install latex dependencies # run: | # sudo apt-get -qq update @@ -80,4 +80,4 @@ jobs: deploy-message: "Preview Deploy from GitHub Actions" env: NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} - NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} \ No newline at end of file + NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} diff --git a/environment.yml b/environment.yml index a432c0f2..d0c48740 100644 --- a/environment.yml +++ b/environment.yml @@ -1,9 +1,11 @@ name: quantecon channels: + - anaconda - default dependencies: - python=3.10 - anaconda=2023.03 + - graphviz - pip - pip: - jupyter-book==0.15.1 @@ -23,4 +25,3 @@ dependencies: # - cylp # - array-to-latex # - prettytable - diff --git a/lectures/networks.md b/lectures/networks.md index eb0de92b..9890d025 100644 --- a/lectures/networks.md +++ b/lectures/networks.md @@ -13,10 +13,17 @@ kernelspec: # Networks +```{admonition} graphviz +:class: warning +If you are running this lecture locally it requires [graphviz](https://www.graphviz.org) +to be installed on your computer. Installation instructions for graphviz can be found +[here](https://www.graphviz.org/download/) +``` + ```{code-cell} ipython3 :tags: [hide-output] -pip install quantecon-book-networks pandas-datareader +pip install quantecon-book-networks pandas-datareader graphviz ``` From cba27062a3fd4bed4f0a621af7acf2766395eb85 Mon Sep 17 00:00:00 2001 From: Smit-create Date: Sun, 23 Apr 2023 14:00:55 +0530 Subject: [PATCH 2/5] fix --- environment.yml | 4 ++-- lectures/networks.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index d0c48740..36d0d317 100644 --- a/environment.yml +++ b/environment.yml @@ -1,11 +1,11 @@ name: quantecon channels: - - anaconda + - conda-forge - default dependencies: - python=3.10 - anaconda=2023.03 - - graphviz + - python-graphviz - pip - pip: - jupyter-book==0.15.1 diff --git a/lectures/networks.md b/lectures/networks.md index 9890d025..91fc1e2d 100644 --- a/lectures/networks.md +++ b/lectures/networks.md @@ -23,7 +23,7 @@ to be installed on your computer. Installation instructions for graphviz can be ```{code-cell} ipython3 :tags: [hide-output] -pip install quantecon-book-networks pandas-datareader graphviz +!pip install quantecon-book-networks pandas-datareader graphviz ``` From 70e76948e31a734f15828372b98c427a76504722 Mon Sep 17 00:00:00 2001 From: Smit-create Date: Mon, 24 Apr 2023 10:22:31 +0530 Subject: [PATCH 3/5] fix --- lectures/networks.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lectures/networks.md b/lectures/networks.md index 91fc1e2d..2db63c92 100644 --- a/lectures/networks.md +++ b/lectures/networks.md @@ -23,7 +23,8 @@ to be installed on your computer. Installation instructions for graphviz can be ```{code-cell} ipython3 :tags: [hide-output] -!pip install quantecon-book-networks pandas-datareader graphviz +!pip install quantecon graphviz +!pip install quantecon-book-networks pandas-datareader ``` From b47e829ebef39116f212f25aca11a56002afd05a Mon Sep 17 00:00:00 2001 From: Smit-create Date: Mon, 24 Apr 2023 11:21:53 +0530 Subject: [PATCH 4/5] Add generated files to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 726f336d..1140406f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store lectures/_build -*/.ipynb_checkpoints/ \ No newline at end of file +*/.ipynb_checkpoints/ +_build/* From d760b9fcc6a573c5c512a3ae5648876f51bf2042 Mon Sep 17 00:00:00 2001 From: Smit-create Date: Wed, 26 Apr 2023 11:15:45 +0530 Subject: [PATCH 5/5] re-order channels --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 36d0d317..10c044a2 100644 --- a/environment.yml +++ b/environment.yml @@ -1,7 +1,7 @@ name: quantecon channels: - - conda-forge - default + - conda-forge dependencies: - python=3.10 - anaconda=2023.03