fixup! fixup! ci,python: enable python win2022 serial build

vicentebolea · vicentebolea · commit b3b9806c1f42 · 2024-07-29T22:11:51.000-04:00
diff --git a/bindings/Matlab/test/test1_read.py b/bindings/Matlab/test/test1_read.py
@@ -11,6 +11,8 @@
 #
 
 import numpy
+
+import adios2.setup_testing
 import adios2
 
 adios = adios2.ADIOS()
diff --git a/bindings/Matlab/test/test1_read_hl.py b/bindings/Matlab/test/test1_read_hl.py
@@ -10,6 +10,7 @@
 #      Author: Norbert Podhorszki, pnorbert@ornl.gov
 #
 
+import adios2.setup_testing
 import adios2
 
 # ADIOS2 high-level API for Reading
@@ -28,6 +29,6 @@
 print("temperature2d array size = " + str(inTemperatures.size))
 
 for row in inTemperatures:
-    print(''.join(['{:7}'.format(item) for item in row]))
+    print("".join(["{:7}".format(item) for item in row]))
 
 fr.close()
diff --git a/bindings/Matlab/test/test1_write.py b/bindings/Matlab/test/test1_write.py
@@ -11,6 +11,8 @@
 #
 
 import numpy
+
+import adios2.setup_testing
 import adios2
 
 # User data
@@ -38,8 +40,7 @@
 varStr = io.DefineVariable("note")
 varCols = io.DefineVariable("ncols", npcols)
 varRows = io.DefineVariable("nrows", nprows)
-varT = io.DefineVariable(
-    "temperature2D", temperatures, shape, start, count, adios2.ConstantDims)
+varT = io.DefineVariable("temperature2D", temperatures, shape, start, count, adios2.ConstantDims)
 
 io.DefineAttribute("aaa", numpy.array([3.1415]))
 io.DefineAttribute("anote", "just a string")
diff --git a/bindings/Matlab/test/test1_write_hl.py b/bindings/Matlab/test/test1_write_hl.py
@@ -11,6 +11,8 @@
 #
 
 import numpy
+
+import adios2.setup_testing
 import adios2
 
 # User data
@@ -31,7 +33,7 @@
 
 # ADIOS2 high-level API for Write
 fw = adios2.open("test1.bp", "w")
-fw.write("note", 'This is an ADIOS2 output')
+fw.write("note", "This is an ADIOS2 output")
 fw.write("temperature2D", temperatures, shape, start, count)
 fw.write("nrows", numpy.array([NRows]))
 fw.write("ncols", numpy.array([NCols]))
diff --git a/bindings/Python/test/simple_read_write.py b/bindings/Python/test/simple_read_write.py
@@ -1,3 +1,4 @@
+import adios2.setup_testing
 from adios2 import *
 import adios2.bindings as bindings
 
@@ -7,6 +8,7 @@
 
 DATA_FILENAME = "hello-world-py.bp"
 
+
 class TestSimpleReadWrite(unittest.TestCase):
 
     def _write(self, ad, greeting):
@@ -43,5 +45,5 @@ def test_simple_read_write(self):
         return 0
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/python/adios2/setup_testing.py b/python/adios2/setup_testing.py
@@ -5,11 +5,11 @@
 
 sys.path.append(os.path.dirname(__file__))
 
-if sys.platform.startswith('win'):
+if sys.platform.startswith("win"):
     print("Inject dll")
     os.add_dll_directory(os.path.dirname(__file__))
     os.add_dll_directory(Path("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"))
-    os.add_dll_directory(Path("@CMAKE_RUNTIME_OUTPUT_DIRECTORY@\Debug"))
+    os.add_dll_directory(Path('@CMAKE_RUNTIME_OUTPUT_DIRECTORY@\Debug'))
 
 print(sys.path)
 print(os.listdir(os.path.dirname(__file__)))
diff --git a/testing/adios2/bindings/python/TestBPBlocksInfo.py b/testing/adios2/bindings/python/TestBPBlocksInfo.py
@@ -13,6 +13,8 @@
 
 from mpi4py import MPI
 import numpy as np
+
+import adios2.setup_testing
 import adios2.bindings as adios2
 
 # MPI
diff --git a/testing/adios2/bindings/python/TestBPReadMultisteps.py b/testing/adios2/bindings/python/TestBPReadMultisteps.py
@@ -9,6 +9,7 @@
 #      Author: William F Godoy godoywf@ornl.gov
 
 
+import adios2.setup_testing
 from adios2NPTypes import SmallTestData
 from mpi4py import MPI
 import numpy as np
diff --git a/testing/adios2/bindings/python/TestBPSelectSteps.py b/testing/adios2/bindings/python/TestBPSelectSteps.py
@@ -10,6 +10,8 @@
 import unittest
 import numpy as np
 from mpi4py import MPI
+
+import adios2.setup_testing
 import adios2.bindings as adios2
 
 TESTDATA_FILENAME = "steps_int32.bp"
diff --git a/testing/adios2/bindings/python/TestBPWriteRead2D.py b/testing/adios2/bindings/python/TestBPWriteRead2D.py
@@ -12,6 +12,8 @@
 
 from mpi4py import MPI
 import numpy as np
+
+import adios2.setup_testing
 import adios2.bindings as adios2
 
 # MPI
diff --git a/testing/adios2/bindings/python/TestBPWriteReadString.py b/testing/adios2/bindings/python/TestBPWriteReadString.py
@@ -9,6 +9,8 @@
 #      Author: Dmitry Ganyushin ganyushindi@ornl.gov
 import unittest
 from mpi4py import MPI
+
+import adios2.setup_testing
 import adios2.bindings as adios2
 
 N_STEPS = 3
diff --git a/testing/adios2/bindings/python/TestBPWriteReadTypes.py b/testing/adios2/bindings/python/TestBPWriteReadTypes.py
@@ -9,6 +9,7 @@
 #      Author: William F Godoy godoywf@ornl.gov
 
 
+import adios2.setup_testing
 from adios2NPTypes import SmallTestData
 from mpi4py import MPI
 import adios2.bindings as adios2
diff --git a/testing/adios2/bindings/python/TestBPWriteReadTypes_nompi.py b/testing/adios2/bindings/python/TestBPWriteReadTypes_nompi.py
@@ -9,6 +9,7 @@
 #      Author: William F Godoy godoywf@ornl.gov
 
 
+import adios2.setup_testing
 from adios2NPTypes import SmallTestData
 import adios2.bindings as adios2
 
diff --git a/testing/adios2/bindings/python/TestGetException_nompi.py b/testing/adios2/bindings/python/TestGetException_nompi.py
@@ -1,5 +1,7 @@
 import numpy as np
 import logging
+
+import adios2.setup_testing
 import adios2.bindings as adios2
 
 if __name__ == "__main__":
diff --git a/testing/adios2/bindings/python/TestNullEngine.py b/testing/adios2/bindings/python/TestNullEngine.py
@@ -11,6 +11,8 @@
 
 from mpi4py import MPI
 import numpy as np
+
+import adios2.setup_testing
 import adios2.bindings as adios2
 
 # MPI
diff --git a/testing/adios2/bindings/python/TestQuery.py b/testing/adios2/bindings/python/TestQuery.py
@@ -1,6 +1,8 @@
 #
 from mpi4py import MPI
 import numpy as np
+
+import adios2.setup_testing
 import adios2.bindings as adios2
 import sys
 
diff --git a/testing/adios2/bindings/python/TestQueryLocalArray.py b/testing/adios2/bindings/python/TestQueryLocalArray.py
@@ -1,6 +1,8 @@
 #
 from mpi4py import MPI
 import numpy as np
+
+import adios2.setup_testing
 import adios2.bindings as adios2
 import sys
 
diff --git a/testing/adios2/engine/dataman/TestDataMan1D.py b/testing/adios2/engine/dataman/TestDataMan1D.py
@@ -9,6 +9,8 @@
 import multiprocessing
 import unittest
 import numpy as np
+
+import adios2.setup_testing
 import adios2
 
 
@@ -49,8 +51,7 @@ def thread_send(self):
 
         wan.SetParameters(self.conf)
         writer = wan.Open("testdata", adios2.Mode.Write)
-        sendbuffer = wan.DefineVariable("np_data", data, shape,
-                                        start, count, adios2.ConstantDims)
+        sendbuffer = wan.DefineVariable("np_data", data, shape, start, count, adios2.ConstantDims)
         self.assertIsNotNone(sendbuffer)
         if sendbuffer:
             writer.BeginStep()
@@ -83,10 +84,9 @@ def thread_receive(self):
                 raise StopIteration()
             reader.EndStep()
         reader.Close()
-        self.assertTrue(all([data[i] == self.fill_value for i
-                             in range(len(data))]))
+        self.assertTrue(all([data[i] == self.fill_value for i in range(len(data))]))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     multiprocessing.set_start_method("fork")
     unittest.main()
diff --git a/testing/adios2/engine/dataman/TestDataMan1xN.py b/testing/adios2/engine/dataman/TestDataMan1xN.py
@@ -9,6 +9,8 @@
 from multiprocessing import Process
 import unittest
 import numpy as np
+
+import adios2.setup_testing
 import adios2
 
 
@@ -49,8 +51,7 @@ def thread_send(self):
 
         wan.SetParameters(self.conf)
         writer = wan.Open("testdata", adios2.Mode.Write)
-        sendbuffer = wan.DefineVariable("np_data", data, shape,
-                                        start, count, adios2.ConstantDims)
+        sendbuffer = wan.DefineVariable("np_data", data, shape, start, count, adios2.ConstantDims)
         self.assertIsNotNone(sendbuffer)
         if sendbuffer:
             writer.BeginStep()
@@ -84,9 +85,8 @@ def thread_receive(self):
                 raise StopIteration()
             reader.EndStep()
         reader.Close()
-        self.assertTrue(all([data[0][i] == self.fill_value for i
-                             in range(len(data))]))
+        self.assertTrue(all([data[0][i] == self.fill_value for i in range(len(data))]))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/testing/adios2/engine/dataman/TestDataManSingleValues.py b/testing/adios2/engine/dataman/TestDataManSingleValues.py
@@ -9,6 +9,8 @@
 from multiprocessing import Process
 import unittest
 import numpy as np
+
+import adios2.setup_testing
 import adios2
 
 
@@ -49,8 +51,7 @@ def thread_send(self):
 
         wan.SetParameters(self.conf)
         writer = wan.Open("testdata", adios2.Mode.Write)
-        sendbuffer = wan.DefineVariable("np_data", data, shape,
-                                        start, count, adios2.ConstantDims)
+        sendbuffer = wan.DefineVariable("np_data", data, shape, start, count, adios2.ConstantDims)
         self.assertIsNotNone(sendbuffer)
         if sendbuffer:
             writer.BeginStep()
@@ -81,9 +82,8 @@ def thread_receive(self):
                 raise StopIteration()
             reader.EndStep()
         reader.Close()
-        self.assertTrue(all([data[i] == self.fill_value for i
-                             in range(len(data))]))
+        self.assertTrue(all([data[i] == self.fill_value for i in range(len(data))]))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/testing/adios2/python/TestADIOS.py b/testing/adios2/python/TestADIOS.py
@@ -1,3 +1,4 @@
+import adios2.setup_testing
 from adios2.adios import Adios
 import unittest
 
diff --git a/testing/adios2/python/TestAttribute.py b/testing/adios2/python/TestAttribute.py
@@ -1,6 +1,4 @@
-# This should go first
 import adios2.setup_testing
-
 from adios2.adios import Adios
 
 import adios2.bindings as bindings
diff --git a/testing/adios2/python/TestBPChangingShapeHighLevelAPI.py b/testing/adios2/python/TestBPChangingShapeHighLevelAPI.py
@@ -11,6 +11,8 @@
 
 import numpy as np
 from mpi4py import MPI
+
+import adios2.setup_testing
 from adios2 import Stream
 
 comm = MPI.COMM_WORLD
diff --git a/testing/adios2/python/TestBPPNGHighLevelAPI.py b/testing/adios2/python/TestBPPNGHighLevelAPI.py
@@ -12,6 +12,8 @@
 import numpy as np
 import random
 from mpi4py import MPI
+
+import adios2.setup_testing
 from adios2 import Stream
 
 
diff --git a/testing/adios2/python/TestBPWriteReadString.py b/testing/adios2/python/TestBPWriteReadString.py
@@ -9,6 +9,8 @@
 #      Author: Dmitry Ganyushin ganyushindi@ornl.gov
 import unittest
 from mpi4py import MPI
+
+import adios2.setup_testing
 from adios2 import Stream
 
 N_STEPS = 3
diff --git a/testing/adios2/python/TestBPWriteTypesHighLevelAPI.py b/testing/adios2/python/TestBPWriteTypesHighLevelAPI.py
@@ -9,6 +9,7 @@
 #  Created on: March 12, 2018
 #      Author: William F Godoy godoywf@ornl.gov
 
+import adios2.setup_testing
 from adios2NPTypes import SmallTestData
 from mpi4py import MPI
 import numpy as np
diff --git a/testing/adios2/python/TestBPWriteTypesHighLevelAPILocal.py b/testing/adios2/python/TestBPWriteTypesHighLevelAPILocal.py
@@ -8,6 +8,7 @@
 #  Created on: March 12, 2018
 #      Author: William F Godoy godoywf@ornl.gov
 
+import adios2.setup_testing
 from adios2NPTypes import SmallTestData
 from mpi4py import MPI
 from adios2 import Stream
diff --git a/testing/adios2/python/TestBPWriteTypesHighLevelAPI_HDF5.py b/testing/adios2/python/TestBPWriteTypesHighLevelAPI_HDF5.py
@@ -9,6 +9,7 @@
 #  Created on: March 12, 2018
 #      Author: William F Godoy godoywf@ornl.gov
 
+import adios2.setup_testing
 from adios2NPTypes import SmallTestData
 import numpy as np
 from adios2 import Adios, Stream
diff --git a/testing/adios2/python/TestBPZfpHighLevelAPI.py b/testing/adios2/python/TestBPZfpHighLevelAPI.py
@@ -11,6 +11,8 @@
 
 import numpy as np
 from mpi4py import MPI
+
+import adios2.setup_testing
 from adios2 import Stream
 
 
diff --git a/testing/adios2/python/TestEngine.py b/testing/adios2/python/TestEngine.py
@@ -1,3 +1,4 @@
+import adios2.setup_testing
 from adios2.adios import Adios
 
 import adios2.bindings as bindings
diff --git a/testing/adios2/python/TestFileReader.py b/testing/adios2/python/TestFileReader.py
@@ -1,3 +1,4 @@
+import adios2.setup_testing
 from adios2 import FileReader, Stream, LocalValueDim
 from random import randint
 
diff --git a/testing/adios2/python/TestIO.py b/testing/adios2/python/TestIO.py
@@ -1,3 +1,4 @@
+import adios2.setup_testing
 from adios2.adios import Adios
 import adios2.bindings as bindings
 
diff --git a/testing/adios2/python/TestOperator.py b/testing/adios2/python/TestOperator.py
@@ -1,3 +1,4 @@
+import adios2.setup_testing
 from adios2.adios import Adios
 
 import adios2.bindings as bindings
diff --git a/testing/adios2/python/TestStream.py b/testing/adios2/python/TestStream.py
@@ -1,3 +1,4 @@
+import adios2.setup_testing
 from adios2 import Stream, LocalValueDim
 from random import randint
 
diff --git a/testing/adios2/python/TestVariable.py b/testing/adios2/python/TestVariable.py
@@ -1,3 +1,4 @@
+import adios2.setup_testing
 from adios2.adios import Adios
 
 import adios2.bindings as bindings

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`#`
`12`	`12`
`13`	`13`	`import numpy`
	`14`	`+`
	`15`	`+import adios2.setup_testing`
`14`	`16`	`import adios2`
`15`	`17`
`16`	`18`	`adios = adios2.ADIOS()`