Something went wrong on our end
-
Studer Gabriel authored
This commit doesn't make OpenStructure work with Python 3. The goal of this commit was to perform an automated port of the Python code and make it compile. The performed steps: - Edited CMakeLists.txt to search for Python with 3.6 as min version 3.6 is the Python version shipped by default with Ubuntu 18.04 LTS - Add version 3.6 to cmake_support/FindPython.cmake - Adapt setup_boost macro in cmake_support/OST.cmake to prefer versioned libraries and not first check for boost_python.so. In the example of Ubuntu 18.04, libboost_python.so is specific for Python 2 but libboost_python3.so is the one we want. - apply the following command: 2to3-2.7 -n -w <OST_DIR> - adapt base/pymod/wrap_base.cc, gui/pymod/wrap_gui.cc and gui/pymod/export_message_widget.cc as PyString functionalities do not exist anymore in the Python 3 interpreter (replaced by PyUnicode) - adapt gui/src/python_shell/python_interpreter_worker.hh to resolve issue discussed in https://stackoverflow.com/questions/23068700/embedding-python3-in-qt-5 Long story short: Qt does a typedef for "slots" which causes trouble with other headers that are pulled in from the Python interpreter
Studer Gabriel authoredThis commit doesn't make OpenStructure work with Python 3. The goal of this commit was to perform an automated port of the Python code and make it compile. The performed steps: - Edited CMakeLists.txt to search for Python with 3.6 as min version 3.6 is the Python version shipped by default with Ubuntu 18.04 LTS - Add version 3.6 to cmake_support/FindPython.cmake - Adapt setup_boost macro in cmake_support/OST.cmake to prefer versioned libraries and not first check for boost_python.so. In the example of Ubuntu 18.04, libboost_python.so is specific for Python 2 but libboost_python3.so is the one we want. - apply the following command: 2to3-2.7 -n -w <OST_DIR> - adapt base/pymod/wrap_base.cc, gui/pymod/wrap_gui.cc and gui/pymod/export_message_widget.cc as PyString functionalities do not exist anymore in the Python 3 interpreter (replaced by PyUnicode) - adapt gui/src/python_shell/python_interpreter_worker.hh to resolve issue discussed in https://stackoverflow.com/questions/23068700/embedding-python3-in-qt-5 Long story short: Qt does a typedef for "slots" which causes trouble with other headers that are pulled in from the Python interpreter
test_geom.py 6.06 KiB
#------------------------------------------------------------------------------
# This file is part of the OpenStructure project <www.openstructure.org>
#
# Copyright (C) 2008-2011 by the OpenStructure authors
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3.0 of the License, or (at your option)
# any later version.
# This library is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
import unittest
if __name__== '__main__':
import sys
sys.path.insert(0,"../../../stage/lib64/openstructure/")
sys.path.insert(0,"../../../stage/lib/openstructure/")
import ost
import ost.geom as geom
# this terrible hack is required for older version of Python/Boost
# which do not convert std::out_of_range to IndexError correctly.
try:
geom.Vec2()[3]
except Exception as e:
pass
IndexError = type(e)
class TestGeom(unittest.TestCase):
def runTest(self):
self.test_repr()
self.test_data()
def test_repr(self):
v=geom.Vec2(1,2)
v2=eval(repr(v))
self.assertTrue(geom.Equal(v, v2))
v=geom.Vec3(1,2,3)
v2=eval(repr(v))
self.assertTrue(geom.Equal(v, v2))
v=geom.Vec4(1,2,3,4)
v2=eval(repr(v))
self.assertTrue(geom.Equal(v, v2))
m=geom.Mat2(1,2,3,4)
m2=eval(repr(m))
self.assertTrue(geom.Equal(m, m2))
m=geom.Mat3(1,2,3,4,5,6,7,8,9)
m2=eval(repr(m))
self.assertTrue(geom.Equal(m, m2))
m=geom.Mat4(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
m2=eval(repr(m))
self.assertTrue(geom.Equal(m, m2))
def test_data(self):
self.assertEqual(geom.Vec2(1,2).data,[1,2])
self.assertEqual(geom.Vec3(1,2,3).data,[1,2,3])
self.assertEqual(geom.Vec4(1,2,3,4).data,[1,2,3,4])
self.assertEqual(geom.Mat2(1,2,
3,4).data,
[1,2,
3,4])
self.assertEqual(geom.Mat3(1,2,3,
4,5,6,
7,8,9).data,
[1,2,3,
4,5,6,
7,8,9])
self.assertEqual(geom.Mat4(1,2,3,4,
5,6,7,8,
9,10,11,12,
13,14,15,16).data,
[1,2,3,4,
5,6,7,8,
9,10,11,12,
13,14,15,16])
def test_boundary_checks_vec2(self):
v = geom.Vec2()
v[0] = v[0]
v[1] = v[1]
self.assertRaises(IndexError, v.__setitem__, (-1), 1)
self.assertRaises(IndexError, v.__setitem__, ( 2), 1)
self.assertRaises(IndexError, v.__getitem__, (-1))
self.assertRaises(IndexError, v.__getitem__, ( 2))
def test_boundary_checks_vec3(self):
v = geom.Vec3()
v[0] = v[0]
v[1] = v[1]
v[2] = v[2]
self.assertRaises(IndexError, v.__setitem__, (-1), 1)
self.assertRaises(IndexError, v.__setitem__, ( 3), 1)
self.assertRaises(IndexError, v.__getitem__, (-1))
self.assertRaises(IndexError, v.__getitem__, ( 3))
def test_boundary_checks_vec4(self):
v = geom.Vec4()
v[0] = v[0]
v[1] = v[1]
v[2] = v[2]
v[3] = v[3]
self.assertRaises(IndexError, v.__setitem__, (-1), 1)
self.assertRaises(IndexError, v.__setitem__, ( 4), 1)
self.assertRaises(IndexError, v.__getitem__, (-1))
self.assertRaises(IndexError, v.__getitem__, ( 4))
def test_boundary_checks_mat2(self):
m = geom.Mat2()
m[0,0] = m[0,0]
m[0,1] = m[0,1]
m[1,0] = m[1,0]
m[1,1] = m[1,1]
self.assertRaises(IndexError, m.__setitem__, (-1,0), 1)
self.assertRaises(IndexError, m.__setitem__, ( 2,0), 1)
self.assertRaises(IndexError, m.__setitem__, (0,-1), 1)
self.assertRaises(IndexError, m.__setitem__, (-1,2), 1)
self.assertRaises(IndexError, m.__getitem__, (-1,0))
self.assertRaises(IndexError, m.__getitem__, ( 2,0))
self.assertRaises(IndexError, m.__getitem__, (0,-1))
self.assertRaises(IndexError, m.__getitem__, (0,2))
def test_boundary_checks_mat3(self):
m = geom.Mat3()
m[0,0] = m[0,0]
m[0,1] = m[0,1]
m[0,2] = m[0,2]
m[1,0] = m[1,0]
m[1,1] = m[1,1]
m[1,2] = m[1,2]
m[2,0] = m[2,0]
m[2,1] = m[2,1]
m[2,2] = m[2,2]
self.assertRaises(IndexError, m.__setitem__, (-1,0), 1)
self.assertRaises(IndexError, m.__setitem__, ( 3,0), 1)
self.assertRaises(IndexError, m.__setitem__, (0,-1), 1)
self.assertRaises(IndexError, m.__setitem__, (-1,3), 1)
self.assertRaises(IndexError, m.__getitem__, (-1,0))
self.assertRaises(IndexError, m.__getitem__, ( 3,0))
self.assertRaises(IndexError, m.__getitem__, (0,-1))
self.assertRaises(IndexError, m.__getitem__, (0,3))
def test_boundary_checks_mat4(self):
m = geom.Mat4()
m[0,0] = m[0,0]
m[0,1] = m[0,1]
m[0,2] = m[0,2]
m[0,3] = m[0,3]
m[1,0] = m[1,0]
m[1,1] = m[1,1]
m[1,2] = m[1,2]
m[1,3] = m[1,3]
m[2,0] = m[2,0]
m[2,1] = m[2,1]
m[2,2] = m[2,2]
m[2,3] = m[2,3]
m[3,0] = m[3,0]
m[3,1] = m[3,1]
m[3,2] = m[3,2]
m[3,3] = m[3,3]
self.assertRaises(IndexError, m.__setitem__, (-1,0), 1)
self.assertRaises(IndexError, m.__setitem__, ( 4,0), 1)
self.assertRaises(IndexError, m.__setitem__, (0,-1), 1)
self.assertRaises(IndexError, m.__setitem__, (-1,4), 1)
self.assertRaises(IndexError, m.__getitem__, (-1,0))
self.assertRaises(IndexError, m.__getitem__, ( 4,0))
self.assertRaises(IndexError, m.__getitem__, (0,-1))
self.assertRaises(IndexError, m.__getitem__, (0,4))
if __name__== '__main__':
from ost import testutils
testutils.RunTests()