Skip to content

Commit

Permalink
update setuptools
Browse files Browse the repository at this point in the history
  • Loading branch information
yasirroni committed May 27, 2024
1 parent 1a41af6 commit 76df05a
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 48 deletions.
16 changes: 9 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,18 @@ pip install -r requirements.txt
!sudo apt-get -qq update
!sudo apt-get -qq install octave octave-signal liboctave-dev
# # install oct2py that compatible with colab
# install oct2py that compatible with colab
import os
from pkg_resources import get_distribution
os.system(f"pip install -qq"
f" ipykernel=={get_distribution('ipykernel').version}"
f" ipython=={get_distribution('ipython').version}"
f" tornado=={get_distribution('tornado').version}"
f" oct2py"
)
os.system(
f"pip install -qq"
f" ipykernel=={get_distribution('ipykernel').version}"
f" ipython=={get_distribution('ipython').version}"
f" tornado=={get_distribution('tornado').version}"
f" oct2py"
)
# install packages
!pip install -qq matpower matpowercaseframes
Expand Down
8 changes: 6 additions & 2 deletions notebooks/add_new_branch.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"!sudo apt-get -qq update\n",
"!sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"\n",
"# # install oct2py that compatible with colab\n",
"# install oct2py that compatible with colab\n",
"import os\n",
"\n",
"from pkg_resources import get_distribution\n",
Expand Down Expand Up @@ -1245,7 +1245,11 @@
"source": []
}
],
"metadata": {},
"metadata": {
"language_info": {
"name": "python"
}
},
"nbformat": 4,
"nbformat_minor": 0
}
8 changes: 6 additions & 2 deletions notebooks/add_new_generator.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"!sudo apt-get -qq update\n",
"!sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"\n",
"# # install oct2py that compatible with colab\n",
"# install oct2py that compatible with colab\n",
"import os\n",
"\n",
"from pkg_resources import get_distribution\n",
Expand Down Expand Up @@ -806,7 +806,11 @@
"source": []
}
],
"metadata": {},
"metadata": {
"language_info": {
"name": "python"
}
},
"nbformat": 4,
"nbformat_minor": 0
}
8 changes: 6 additions & 2 deletions notebooks/inspect_mpc.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"!sudo apt-get -qq update\n",
"!sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"\n",
"# # install oct2py that compatible with colab\n",
"# install oct2py that compatible with colab\n",
"import os\n",
"\n",
"from pkg_resources import get_distribution\n",
Expand Down Expand Up @@ -687,7 +687,11 @@
"source": []
}
],
"metadata": {},
"metadata": {
"language_info": {
"name": "python"
}
},
"nbformat": 4,
"nbformat_minor": 0
}
8 changes: 6 additions & 2 deletions notebooks/makeYbus.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"!sudo apt-get -qq update\n",
"!sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"\n",
"# # install oct2py that compatible with colab\n",
"# install oct2py that compatible with colab\n",
"import os\n",
"\n",
"from pkg_resources import get_distribution\n",
Expand Down Expand Up @@ -111,7 +111,11 @@
"source": []
}
],
"metadata": {},
"metadata": {
"language_info": {
"name": "python"
}
},
"nbformat": 4,
"nbformat_minor": 0
}
4 changes: 2 additions & 2 deletions notebooks/remove_tap.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"!sudo apt-get -qq update\n",
"!sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"\n",
"# # install oct2py that compatible with colab\n",
"# install oct2py that compatible with colab\n",
"import os\n",
"\n",
"from pkg_resources import get_distribution\n",
Expand All @@ -25,7 +25,7 @@
")\n",
"\n",
"# install packages\n",
"!pip install -qq matpower"
"!pip install -qq matpower matpowercaseframes"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion notebooks/run_mpc_from_drive.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"!sudo apt-get -qq update\n",
"!sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"\n",
"# # install oct2py that compatible with colab\n",
"# install oct2py that compatible with colab\n",
"import os\n",
"\n",
"from pkg_resources import get_distribution\n",
Expand Down
4 changes: 2 additions & 2 deletions notebooks/runopf_pypglib.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"!sudo apt-get -qq update\n",
"!sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"\n",
"# # install oct2py that compatible with colab\n",
"# install oct2py that compatible with colab\n",
"import os\n",
"\n",
"from pkg_resources import get_distribution\n",
Expand All @@ -24,7 +24,7 @@
")\n",
"\n",
"# install packages\n",
"!pip install -qq matpower matpowercaseframes pypglib"
"!pip install -qq matpower matpowercaseframes"
]
},
{
Expand Down
8 changes: 6 additions & 2 deletions notebooks/runpf.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"!sudo apt-get -qq update\n",
"!sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"\n",
"# # install oct2py that compatible with colab\n",
"# install oct2py that compatible with colab\n",
"import os\n",
"\n",
"from pkg_resources import get_distribution\n",
Expand Down Expand Up @@ -648,7 +648,11 @@
"source": []
}
],
"metadata": {},
"metadata": {
"language_info": {
"name": "python"
}
},
"nbformat": 4,
"nbformat_minor": 0
}
53 changes: 27 additions & 26 deletions notebooks/runpf_pmax.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,34 @@
"cells": [
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"# # install octave\n",
"# !sudo apt-get -qq update\n",
"# !sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"# install octave\n",
"!sudo apt-get -qq update\n",
"!sudo apt-get -qq install octave octave-signal liboctave-dev\n",
"\n",
"# # # install oct2py that compatible with colab\n",
"# import os\n",
"# install oct2py that compatible with colab\n",
"import os\n",
"\n",
"# from pkg_resources import get_distribution\n",
"from pkg_resources import get_distribution\n",
"\n",
"# os.system(f\"pip install -qq\"\n",
"# f\" ipykernel=={get_distribution('ipykernel').version}\"\n",
"# f\" ipython=={get_distribution('ipython').version}\"\n",
"# f\" tornado=={get_distribution('tornado').version}\"\n",
"# f\" oct2py\"\n",
"# )\n",
"os.system(\n",
" f\"pip install -qq\"\n",
" f\" ipykernel=={get_distribution('ipykernel').version}\"\n",
" f\" ipython=={get_distribution('ipython').version}\"\n",
" f\" tornado=={get_distribution('tornado').version}\"\n",
" f\" oct2py\"\n",
")\n",
"\n",
"# # install packages\n",
"# !pip install -qq matpower matpowercaseframes"
"# install packages\n",
"!pip install -qq matpower matpowercaseframes"
]
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand All @@ -50,7 +51,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -61,7 +62,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -70,7 +71,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -195,7 +196,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -361,7 +362,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -599,7 +600,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -822,7 +823,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand All @@ -842,7 +843,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -1151,7 +1152,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -1374,7 +1375,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand Down
2 changes: 2 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ pytest-xdist

jupyter
nbmake

setuptools

0 comments on commit 76df05a

Please sign in to comment.