regina 6.1.0a3__cp38-cp38-macosx_10_9_x86_64.whl → 7.3.1.1__cp38-cp38-macosx_10_9_x86_64.whl

regina/__init__.py

@@ -1,7 +1,7 @@
 # Regina - A Normal Surface Theory Calculator
 # Python Module Initialisation
 #
-# Copyright (c) 2003-2021, Ben Burton
+# Copyright (c) 2003-2023, Ben Burton
 # For further details contact Ben Burton (bab@debian.org).
 #
 # This program is free software; you can redistribute it and/or

regina/sageRegina/config.py

@@ -1,9 +1,9 @@
-tokyocabinet_uri  = 'http://sageRegina.unhyperbolic.org/sources/tokyocabinet-1.4.48.tar.gz'
+tokyocabinet_uri  = 'https://dbmx.net/tokyocabinet/tokyocabinet-1.4.48.tar.gz'
 tokyocabinet_dir  = 'tokyocabinet-1.4.48'
 
-libxml_uri        = 'http://sageRegina.unhyperbolic.org/sources/libxml2-2.9.3.tar.gz'
+libxml_uri        = 'http://xmlsoft.org/sources/libxml2-2.9.3.tar.gz'
 libxml_dir        = 'libxml2-2.9.3'
 
-regina_hash      = '8972311'
+regina_hash      = '979c943023'  # 7.3.1
 regina_uri       = 'https://github.com/regina-normal/regina.git'
 regina_dir       = 'regina_%s' % regina_hash

regina/sageRegina/test.py

@@ -7,15 +7,11 @@ from . version import version
 
 import sys
 import os
+import re
 import glob
 import difflib
 import traceback
-try:
-    # Python 3
-    from io import StringIO
-except:
-    # Python 2
-    from StringIO import StringIO
+from io import StringIO
 
 base_path = os.path.split(__file__)[0]
 testsuite_path = os.path.join(base_path, 'testsuite')
@@ -76,13 +72,26 @@ def runTest(testName, testFile):
         # <boost.python.function at 0x34534345345>
         output   = '\n'.join(  output.split('\n')[:-2])
         baseline = '\n'.join(baseline.split('\n')[:-2])
-                           
+
+    if testName == 'docstrings':
+        output = re.subn(r'(\s*)__pybind11_module_local_([a-zA-Z0-9_-]+) = <capsule.*\.\.\.',
+                         r'\1__pybind11_module_local__ = ...', output)[0]
+        output = re.subn(r'(\s*)Methods( inherited from pybind11_object:)',
+                         r'\1Static methods\2', output)[0]
+        output = re.subn(r'__new__\(\*args, \*\*kwargs\) class method of pybind11_builtins.pybind11_object',
+                         r'__new__(*args, **kwargs) from pybind11_builtins.pybind11_type',
+                         output)[0]
+
+    # For Python 3.12, there are trailing whitespace issues, so we
+    # normalize.
+    baseline = [line.strip() for line in baseline.split('\n')]
+    output = [line.strip() for line in output.split('\n')]
     if output != baseline:
         failed += "Difference between baseline and output:\n"
         failed += '\n'.join(
             difflib.context_diff(
-                baseline.split('\n'),
-                output.split('\n'),
+                baseline,
+                output,
                 fromfile = os.path.basename(testFile),
                 tofile = 'OUTPUT'))
 

regina/sageRegina/testsuite/CMakeLists.txt

@@ -4,11 +4,57 @@ CONFIGURE_FILE(
   "${PROJECT_BINARY_DIR}/python/testsuite/testall"
   @ONLY
 )
+CONFIGURE_FILE(
+  testbasic.in
+  "${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 (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})
+add_executable(basic
+  basic.cpp
+  ../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 does this for us.
+  # 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/README.txt

@@ -8,4 +8,13 @@ operating correctly under different compilers or on different platforms.
 To build and run the test suite, move to the top-level build directory
 and type: make test ARGS=-V
 
+The *.test scripts within this directory should, where possible, be written
+to simultaneously work both as full scripts and also as line-by-line command
+execution (simulating a human typing commands into a Python interpreter).
+This puts extra requirements on the formatting and syntax; e.g.:
+- blank lines must be added between successive indented blocks;
+- blank lines within an indented block must include the indent also;
+- return values should be assigned to dummy variables, not discarded
+  (which would create spurious output in line-by-line execution).
+
 See also the C++ test suite in ../../testsuite/.