Silencing warnings and skippnig gemmi tests on Windows (not fully sup…

…ported at the moment)
OpenBioSim · Jun 3, 2024 · 88ee896 · 88ee896
1 parent a21e381
commit 88ee896
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/corelib/CMakeLists.txt b/corelib/CMakeLists.txt
@@ -631,7 +631,7 @@ elseif (MSVC)
 
     set ( SIRE_SMALL_FLAGS  "/O1" )
     set ( SIRE_WARNALL_FLAGS  "" )
-    set ( SIRE_RELEASE_FLAGS  "/O2 /GL /Gw" )
+    set ( SIRE_RELEASE_FLAGS  "/O2 /GL /Gw /D_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING" )
     set ( SIRE_DEBUG_FLAGS   "/Zi" )
     set ( SIRE_VISIBILITY_FLAGS "/DSIRE_NO_VISIBILITY_AVAILABLE" )
     GET_SIRE_VECTOR_FLAGS( "/openmp:experimental" "/arch:SSE2" "/arch:AVX" "/arch:AVX512" "/arch:NEON" )

diff --git a/tests/convert/test_gemmi.py b/tests/convert/test_gemmi.py
@@ -1,6 +1,7 @@
 import sire as sr
 
 import pytest
+import sys
 
 
 def _assert_equal(v0, v1, tol):
@@ -10,7 +11,8 @@ def _assert_equal(v0, v1, tol):
 
 
 @pytest.mark.skipif(
-    "gemmi" not in sr.convert.supported_formats(), reason="gemmi not available"
+    ("gemmi" not in sr.convert.supported_formats()) or (sys.platform == "win32"),
+    reason="gemmi not available",
 )
 def test_gemmi(testfile_cache_dir, pdbx_3nss):
     mols = pdbx_3nss
@@ -45,7 +47,8 @@ def test_gemmi(testfile_cache_dir, pdbx_3nss):
 
 
 @pytest.mark.skipif(
-    "gemmi" not in sr.convert.supported_formats(), reason="gemmi not available"
+    ("gemmi" not in sr.convert.supported_formats()) or (sys.platform == "win32"),
+    reason="gemmi not available",
 )
 def test_gemmi_roundtrip(tmpdir, pdbx_3nss):
     mols = pdbx_3nss.clone()
@@ -97,7 +100,8 @@ def test_gemmi_roundtrip(tmpdir, pdbx_3nss):
 
 
 @pytest.mark.skipif(
-    "gemmi" not in sr.convert.supported_formats(), reason="gemmi not available"
+    ("gemmi" not in sr.convert.supported_formats()) or (sys.platform == "win32"),
+    reason="gemmi not available",
 )
 def test_gemmi_complex_metadata(tmpdir, ala_mols):
     mols = ala_mols.clone()

diff --git a/tests/io/test_pdbx.py b/tests/io/test_pdbx.py
@@ -1,6 +1,7 @@
 import sire as sr
 
 import pytest
+import sys
 
 
 def _assert_equal(v0, v1, tol):
@@ -10,7 +11,8 @@ def _assert_equal(v0, v1, tol):
 
 
 @pytest.mark.skipif(
-    "gemmi" not in sr.convert.supported_formats(), reason="gemmi not available"
+    ("gemmi" not in sr.convert.supported_formats()) or (sys.platform == "win32"),
+    reason="gemmi not available",
 )
 def test_pdbx(tmpdir, ala_mols):
     mols = ala_mols
@@ -36,7 +38,8 @@ def test_pdbx(tmpdir, ala_mols):
 
 
 @pytest.mark.skipif(
-    "gemmi" not in sr.convert.supported_formats(), reason="gemmi not available"
+    ("gemmi" not in sr.convert.supported_formats()) or (sys.platform == "win32"),
+    reason="gemmi not available",
 )
 def test_pdbx_pdb(pdb_3nss, pdbx_3nss):
     mols = pdb_3nss