use different python names on different platforms

openseespy-pip/build_pip.py

@@ -70,7 +70,7 @@ def copy_mac_library(so):
             os.remove(mac+'lib/Python')
 
 
-def build_pip():
+def build_pip(pyexe='python'):
 
     print('==============================================================')
     print('Did you remember to update version number in opensees source?')
@@ -81,35 +81,35 @@ def build_pip():
     subprocess.run(['rm', '-fr', 'build', 'dist', 'openseespy.egg-info'])
 
     # update tools
-    subprocess.run(['python3', '-m', 'pip', 'install', '--upgrade',
+    subprocess.run([pyexe, '-m', 'pip', 'install', '--upgrade',
                     'setuptools', 'wheel', 'twine', 'pytest'])
 
     # compile wheel
-    subprocess.run(['python3', 'setup.py', 'bdist_wheel'])
+    subprocess.run([pyexe, 'setup.py', 'bdist_wheel'])
 
 
-def upload_pip():
+def upload_pip(pyexe='python')
     # upload
-    subprocess.run(['python3', '-m', 'twine', 'upload', 'dist/*'])
+    subprocess.run([pyexe, '-m', 'twine', 'upload', 'dist/*'])
 
 
 def clean_pip():
     subprocess.run(['rm', '-fr', 'build', 'dist', 'openseespy.egg-info'])
 
 
-def upload_pip_test():
+def upload_pip_test(pyexe='python'):
     # upload
-    subprocess.run(['python3', '-m', 'twine', 'upload',
+    subprocess.run([pyexe, '-m', 'twine', 'upload',
                     '--repository', 'testpypi', 'dist/*'])
 
 
-def install_pip_test():
-    subprocess.run(['python3', '-m', 'pip', 'uninstall', '-y', 'openseespy'])
-    subprocess.run(['python3', '-m', 'pip',  'install', '--pre', '--no-cache-dir', '--index-url',
+def install_pip_test(pyexe='python'):
+    subprocess.run([pyexe, '-m', 'pip', 'uninstall', '-y', 'openseespy'])
+    subprocess.run([pyexe, '-m', 'pip',  'install', '--pre', '--no-cache-dir', '--index-url',
                     'https://test.pypi.org/simple/', 'openseespy'])
 
 
-def install_pip():
-    subprocess.run(['python3', '-m', 'pip', 'uninstall', '-y', 'openseespy'])
-    subprocess.run(['python3', '-m', 'pip', 'install',
+def install_pip(pyexe='python'):
+    subprocess.run([pyexe, '-m', 'pip', 'uninstall', '-y', 'openseespy'])
+    subprocess.run([pyexe, '-m', 'pip', 'install',
                     '--pre', '--no-cache-dir', 'openseespy'])

openseespy-pip/install_pip.py

@@ -1,8 +1,13 @@
 import subprocess
+import sys
 
 from build_pip import copy_linux_library, build_pip, upload_pip, clean_pip
 
+pyexe = 'python'
+if sys.platform.startswith('darwin'):
+    pyexe = 'python3'
+
 copy_linux_library('../../opensees/SRC/interpreter/opensees.so')
-build_pip()
-upload_pip()
+build_pip(pyexe)
+upload_pip(pyexe)
 clean_pip()

openseespy-pip/install_test.py

@@ -1,9 +1,14 @@
 import subprocess
+import sys
 
 from build_pip import copy_linux_library, build_pip, upload_pip_test, clean_pip
 
+pyexe = 'python'
+if sys.platform.startswith('darwin'):
+    pyexe = 'python3'
+
 
 copy_linux_library('../../opensees/SRC/interpreter/opensees.so')
-build_pip()
-upload_pip_test()
+build_pip(pyexe)
+upload_pip_test(pyexe)
 clean_pip()

openseespy-pip/test_pip.py

@@ -1,8 +1,13 @@
 import subprocess
+import sys
 
 from build_pip import install_pip
 
-install_pip()
+pyexe = 'python'
+if sys.platform.startswith('darwin'):
+    pyexe = 'python3'
+
+install_pip(pyexe)
 
 subprocess.run(
     ['pytest', '--pyargs', 'openseespy.test']

openseespy-pip/test_test.py

@@ -1,8 +1,13 @@
 import subprocess
+import sys
 
 from build_pip import install_pip_test
 
-install_pip_test()
+pyexe = 'python'
+if sys.platform.startswith('darwin'):
+    pyexe = 'python3'
+
+install_pip_test(pyexe)
 
 subprocess.run(
     ['pytest', '--pyargs', 'openseespy.test']