From 596dcaaebb6e63505adf6a57025f82f0fbb2cbdd Mon Sep 17 00:00:00 2001 From: Lily Olson Date: Tue, 9 Apr 2024 16:03:35 -0400 Subject: [PATCH] bug fix for protsetopt solver installation --- install.py | 4 ++++ requirements.txt | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/install.py b/install.py index d976fff42..a02c1f1d6 100644 --- a/install.py +++ b/install.py @@ -24,6 +24,7 @@ os.system(f"{sys.executable} -m pip install --upgrade pip setuptools") os.system(f"{sys.executable} -m pip install -r {source_dir}/requirements.txt") os.system(f"{sys.executable} -m pip install -e {source_dir}") + os.system(f"{sys.executable} -m pip install -e git+https://github.com/lilycatolson/Protection-settings-optimizer.git#egg=RSO-pack") os.system(f'sudo chmod 755 {source_dir}/omf/solvers/opendss/opendsscmd-1.7.4-linux-x64-installer.run && sudo {source_dir}/omf/solvers/opendss/opendsscmd-1.7.4-linux-x64-installer.run --mode unattended') # - If using Docker, this configuration should be done in the Dockerfile print('*****\nRun $ export LC_ALL=C.UTF-8 $ if running phaseId._tests() gives an ascii decode error.\n*****') @@ -42,6 +43,7 @@ os.system(f"{sys.executable} -m pip install -r {source_dir}/requirements.txt") os.system(f"{sys.executable} -m pip install --ignore-installed six") os.system(f"{sys.executable} -m pip install -e {source_dir}") + os.system(f"{sys.executable} -m pip install -e git+https://github.com/lilycatolson/Protection-settings-optimizer.git#egg=RSO-pack") os.system(f'sudo chmod 755 {source_dir}/omf/solvers/opendss/opendsscmd-1.7.4-linux-x64-installer.run && sudo {source_dir}/omf/solvers/opendss/opendsscmd-1.7.4-linux-x64-installer.run --mode unattended') # - If using Docker, this configuration should be done in the Dockerfile print('*****\nRun $ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib $ if opendsscmd gives a shared library error.\n*****') @@ -53,6 +55,7 @@ os.system(f"{sys.executable} -m pip install --upgrade pip") os.system(f"{sys.executable} -m pip install -r {source_dir}/requirements.txt") os.system(f"{sys.executable} -m pip install -e {source_dir}") + os.system(f"{sys.executable} -m pip install -e git+https://github.com/lilycatolson/Protection-settings-optimizer.git#egg=RSO-pack") os.system(f'{source_dir}\\omf\\solvers\\opendss\\opendsscmd-1.7.4-windows-installer.exe --mode unattended') elif major_platform == "Darwin": # MacOS os.system("HOMEBREW_NO_AUTO_UPDATE=1 brew install ffmpeg mdbtools") # Set no-update to keep homebrew from blowing away python3. @@ -71,6 +74,7 @@ ''') # sed is to hack the build to work without user input. os.system(f"{sys.executable} -m pip install -r {source_dir}/requirements.txt") os.system(f"{sys.executable} -m pip install -e {source_dir}") + os.system(f"{sys.executable} -m pip install -e git+https://github.com/lilycatolson/Protection-settings-optimizer.git#egg=RSO-pack") os.system(f'sudo hdiutil attach {source_dir}/omf/solvers/opendss/opendsscmd-1.7.4-osx-installer.dmg') os.system('open /Volumes/OpenDSS/opendsscmd-1.7.4-osx-installer.app') print('Please go to System Preferences to finish installing OpenDSS on Mac') diff --git a/requirements.txt b/requirements.txt index eb292948b..7b09b4111 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,5 +47,3 @@ pandapower==2.10.1 matpowercaseframes fire haversine - -git+https://github.com/lilycatolson/Protection-settings-optimizer.git \ No newline at end of file