From cacd9b324d6c98ec87ff80c693a9297c3fb6eab3 Mon Sep 17 00:00:00 2001 From: Lily Olson Date: Tue, 9 Apr 2024 16:42:10 -0400 Subject: [PATCH] protsetopt - package installation name fixed --- install.py | 8 ++++---- omf/solvers/protsetopt/__init__.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install.py b/install.py index a02c1f1d6..4fdbbdd4d 100644 --- a/install.py +++ b/install.py @@ -24,7 +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"{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*****') @@ -43,7 +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"{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*****') @@ -55,7 +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"{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. @@ -74,7 +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"{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/omf/solvers/protsetopt/__init__.py b/omf/solvers/protsetopt/__init__.py index f4554512e..e0129c7b5 100644 --- a/omf/solvers/protsetopt/__init__.py +++ b/omf/solvers/protsetopt/__init__.py @@ -126,4 +126,4 @@ def _test(): run(testPath, testFile) if __name__ == "__main__": - _test() \ No newline at end of file + _test()