update openseespy pip for windows

zhuminjie · Aug 10, 2020 · eef221c · eef221c
1 parent 67a7284
commit eef221c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/openseespy-pip/install_test.py b/openseespy-pip/install_test.py
@@ -3,8 +3,8 @@
 from build_pip import copy_library, build_pip, upload_pip_test, clean_pip
 
 
-copy_library('../OpenSeesPy/SRC/interpreter/opensees.so',
-             '../OpenSeesPy/SRC/interpreter/opensees.pyd')
+copy_library('../../opensees/SRC/interpreter/opensees.so',
+             '../../opensees/SRC/interpreter/opensees.pyd')
 build_pip()
 upload_pip_test()
 clean_pip()
diff --git a/openseespy-pip/openseespy/opensees/__init__.py b/openseespy-pip/openseespy/opensees/__init__.py
@@ -14,20 +14,24 @@
 
 elif sys.platform.startswith('win'):
 
+    try:
+        from openseespy.opensees.win.opensees import *
+    except: 
+        raise RuntimeError('Failed to import openseespy.')
     # python 3.7 is required
-    if sys.version_info[0] == 3 and sys.version_info[1] == 7:
+    # if sys.version_info[0] == 3 and sys.version_info[1] == 7:
 
-        try:
-            from openseespy.opensees.win.opensees import *
+    #     try:
+    #         from openseespy.opensees.win.opensees import *
 
-        except:
+    #     except:
 
-            raise RuntimeError(
-                'Failed to import openseespy. Anaconda is recommended https://www.anaconda.com/distribution/')
+    #         raise RuntimeError(
+    #             'Failed to import openseespy. Anaconda is recommended https://www.anaconda.com/distribution/')
 
-    else:
-        raise RuntimeError(
-            'Python version 3.7 is needed for Windows (Anaconda is recommended https://www.anaconda.com/distribution/)')
+    # else:
+    #     raise RuntimeError(
+    #         'Python version 3.7 is needed for Windows (Anaconda is recommended https://www.anaconda.com/distribution/)')
 
     # if sys.version_info[1] == 6:
 

diff --git a/openseespy-pip/openseespy/test/__init__.py b/openseespy-pip/openseespy/test/__init__.py
diff --git a/openseespy-pip/openseespy/test/test_plot/__init__.py b/openseespy-pip/openseespy/test/test_plot/__init__.py
diff --git a/openseespy-pip/openseespy/version.py b/openseespy-pip/openseespy/version.py
@@ -1 +1 @@
-version = "3.2.1"
+version = "3.2.2.3"