Fix/python linear solver py (#23)

* fix linear_solver.i

* enable CI for fix branches

* try activate python tests for windows

* fix python tests for windows

* fix type yml

.github/workflows/ubuntu-windows.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - feature/*
+      - merge*
       - fix/*
   release:
     types: [ created ]
@@ -307,7 +308,7 @@ jobs:
         working-directory: ./build
         run: ctest --output-on-failure -C Release -R cxx_cpp -E cxx_cpp_linear_programming
       - name: Run other python tests
-        if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.python == 'ON' && matrix.xprs == 'ON' && matrix.sirius == 'ON' }}
+        if: ${{ matrix.python == 'ON' && matrix.xprs == 'ON' && matrix.sirius == 'ON' }}
         working-directory: ./build
         run: ctest --output-on-failure -C Release -R python_python -E python_python_linear_programming
       - name: Run other java tests

ortools/linear_solver/python/linear_solver.i

@@ -31,16 +31,13 @@
 %pythonbegin %{
 import os as _os
 if hasattr(_os, 'add_dll_directory'):
-    try:
-        _os.add_dll_directory(_os.getenv('SIRIUS'))
-    except AttributeError:
-        pass
-    try:
-        _os.add_dll_directory(_os.getenv('XPRESS'))
-    except AttributeError:
-        pass
+    sirius=_os.getenv('SIRIUS')
+    if sirius:
+        _os.add_dll_directory(sirius)
+    xpress=_os.getenv('XPRESS')
+    if xpress:
+        _os.add_dll_directory(xpress)
 %}
-
 %include "ortools/base/base.i"
 
 %include "std_string.i"