regina 7.3.1__cp312-cp312-macosx_11_0_arm64.whl → 7.3.1.1__cp312-cp312-macosx_11_0_arm64.whl

regina/sageRegina/config.py

@@ -4,6 +4,6 @@ tokyocabinet_dir  = 'tokyocabinet-1.4.48'
 libxml_uri        = 'http://xmlsoft.org/sources/libxml2-2.9.3.tar.gz'
 libxml_dir        = 'libxml2-2.9.3'
 
-regina_hash      = '3fc31fc43'  # 7.3 + iteration speed patch
+regina_hash      = '979c943023'  # 7.3.1
 regina_uri       = 'https://github.com/regina-normal/regina.git'
 regina_dir       = 'regina_%s' % regina_hash

regina/sageRegina/testsuite/CMakeLists.txt

@@ -9,8 +9,18 @@ CONFIGURE_FILE(
   "${PROJECT_BINARY_DIR}/python/testsuite/testbasic"
   @ONLY
 )
+CONFIGURE_FILE(
+  testsub.in
+  "${PROJECT_BINARY_DIR}/python/testsuite/testsub"
+  @ONLY
+)
+CONFIGURE_FILE(
+  testcallback.in
+  "${PROJECT_BINARY_DIR}/python/testsuite/testcallback"
+  @ONLY
+)
 
-# A very basic interpreter to use for testing:
+# A very basic interpreter (and related code) to use for testing:
 INCLUDE_DIRECTORIES(${Python_INCLUDE_DIRS} ${ENGINE_INCLUDES} "${PROJECT_BINARY_DIR}/engine")
 ADD_COMPILE_DEFINITIONS(REGINA_PYTHON_USE_PYTHONPATH=1)
 ADD_LINK_OPTIONS(${Python_LINK_OPTIONS})
@@ -19,13 +29,32 @@ add_executable(basic
   ../gui/pythoninterpreter.cpp
   ../gui/pythonoutputstream.cpp)
 target_link_libraries(basic ${ENGINE_LIBRARY} ${Python_LIBRARIES})
+add_executable(basic_alltypes
+  basic_alltypes.cpp
+  ../gui/pythoninterpreter.cpp
+  ../gui/pythonoutputstream.cpp)
+target_link_libraries(basic_alltypes ${ENGINE_LIBRARY} ${Python_LIBRARIES})
+add_executable(basic_sub
+  basic_sub.cpp
+  ../gui/pythoninterpreter.cpp
+  ../gui/pythonoutputstream.cpp)
+target_link_libraries(basic_sub ${ENGINE_LIBRARY} ${Python_LIBRARIES})
+add_executable(basic_callback
+  basic_callback.cpp
+  ../gui/pythoninterpreter.cpp
+  ../gui/pythonoutputstream.cpp)
+target_link_libraries(basic_callback ${ENGINE_LIBRARY} ${Python_LIBRARIES})
 
 IF (WIN32)
   ADD_TEST(python-test bash testall)
   ADD_TEST(python-basic bash testbasic)
+  ADD_TEST(python-sub bash testsub)
+  ADD_TEST(python-callback bash testcallback)
   # We do not need to add the engine DLL location to the path, since
   # regina-python (used in testall) and testbasic (directly) do this for us.
 ELSE (WIN32)
   ADD_TEST(python-test ./testall)
   ADD_TEST(python-basic ./testbasic)
+  ADD_TEST(python-sub ./testsub)
+  ADD_TEST(python-callback ./testcallback)
 ENDIF (WIN32)

regina/sageRegina/testsuite/basic_callback.out

@@ -0,0 +1,124 @@
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+Embedded, vertex surfaces
+Coordinates: Standard normal (tri-quad)
+Number of surfaces is 7
+0 0 1 1 ; 1 0 0 || 0 1 0 1 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0
+0 1 0 1 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0 || 1 1 0 0 ; 1 0 0
+0 1 1 0 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 1 0 1 0 ; 0 1 0 || 0 1 0 1 ; 0 1 0
+1 0 0 1 ; 0 0 1 || 1 1 0 0 ; 1 0 0 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1
+1 0 1 0 ; 0 1 0 || 1 0 1 0 ; 0 1 0 || 0 0 1 1 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1
+1 1 0 0 ; 1 0 0 || 1 0 0 1 ; 0 0 1 || 1 0 0 1 ; 0 0 1 || 0 1 1 0 ; 0 0 1 || 0 0 1 1 ; 1 0 0
+1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0 || 1 1 1 1 ; 0 0 0
+
+( 0 0 0 0 1 1 1 0 0 0 0 1 1 1 )
+( 0 0 0 0 1 1 1 1 1 1 1 0 0 0 )
+( 0 0 0 0 1 1 3 1 1 0 0 1 0 2 )
+( 0 0 0 0 2 2 0 0 0 1 1 1 2 0 )
+( 0 0 1 1 0 1 3 2 2 0 0 0 0 2 )
+( 0 0 1 1 1 2 0 0 0 0 0 1 3 1 )
+( 0 0 1 1 1 2 0 1 1 1 1 0 2 0 )
+( 0 0 2 2 0 2 0 1 1 0 0 0 3 1 )
+( 1 1 0 0 1 0 0 0 0 1 1 1 0 0 )
+( 1 1 0 0 1 0 2 0 0 0 0 2 0 2 )
+( 1 1 1 1 0 0 0 0 0 0 0 1 1 1 )
+( 1 1 1 1 0 0 0 1 1 1 1 0 0 0 )
+( 1 1 1 1 0 0 2 1 1 0 0 1 0 2 )
+

regina/sageRegina/testsuite/basic_sub.out

@@ -0,0 +1,7 @@
+Empty 3-D triangulation
+-x^8 + x^6 + x^2
+x^4 - x^2 + 1 - x^-2 + x^-4
+Caught exception!
+x^4 - x^2 + 1 - x^-2 + x^-4
+-x^3 + x - 2 x^-1 + x^-3 - 2 x^-5 + x^-7
+Caught exception!

regina/sageRegina/testsuite/docstrings.filter

@@ -1,14 +1,19 @@
 #!/bin/sh
 set -e
 
-# This filter adjusts the names of pybind11 local moduiles so that
+# This filter adjusts the names of pybind11 local modules so that
 # they are independent of the C++ compiler that was used.
 #
 # It also makes tweaks to account for differences in help() output between
-# Python 3.6 vs 3.8 and above (I'm not sure which way Python 3.7 goes).
+# Python 3.6 vs 3.8 and above (I'm not sure which way Python 3.7 goes),
+# to account for the different ways that trailing whitespace is handled in
+# Python <= 3.11 vs >= 3.12, and to account for the differerent ways that
+# the pybind11_object constructor is handled in Python <= 3.11 vs >= 3.12.
 #
 # Note that BSD sed does not support \+, which is why we use \{1,\} instead.
 # BSD sed also seems to have issues with \s and \S, so we avoid them too.
 
-sed -e 's#\( \)__pybind11_module_local_\([a-zA-Z0-9_-]\{1,\}\) = <capsule.*\.\.\.#\1__pybind11_module_local__ = ...#' \
-    -e 's#\( \)Methods\( inherited from pybind11_object:\)$#\1Static methods\2#'
+sed -e 's#\( \)__pybind11_module_local_\([a-zA-Z0-9_-]\{1,\}\) = .*\.\.\.#\1__pybind11_module_local__ = ...#' \
+    -e 's#\( \)Methods\( inherited from pybind11_builtins\.pybind11_object:\)$#\1Static methods\2#' \
+    -e 's# \{1,\}$##' \
+    -e 's# class method of pybind11_builtins\.pybind11_object# from pybind11_builtins\.pybind11_type#'