Skip to content

Commit

Permalink
protsetopt - package installation name fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
lilycatolson committed Apr 9, 2024
1 parent 596dcaa commit cacd9b3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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*****')
Expand All @@ -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*****')
Expand All @@ -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.
Expand All @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion omf/solvers/protsetopt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ def _test():
run(testPath, testFile)

if __name__ == "__main__":
_test()
_test()

0 comments on commit cacd9b3

Please sign in to comment.