pretext 2.33.3.dev20251221064246__py3-none-any.whl → 2.33.3.dev20251227064414__py3-none-any.whl

pretext/__init__.py

@@ -19,7 +19,7 @@ from single_version import get_version
 VERSION = get_version("pretext", Path(__file__).parent.parent)
 
 
-CORE_COMMIT = '306dc85ecb1f3b42733093ca5c892f83a7b2c4ab'
+CORE_COMMIT = 'aa22f79b0c98cbe210fba4ec6824ec2ce97bf11e'
 
 
 def activate() -> None:

pretext/core/pretext.py

@@ -2799,7 +2799,7 @@ def stack_extraction(xml_source, pub_file, stringparams, xmlid_root, dest_dir ):
     pub_vars = get_publisher_variable_report(xml_source, pub_file, stringparams)
     stack_server = get_publisher_variable(pub_vars, 'stack-server')
     api_url = urllib.parse.urljoin(stack_server, 'render')
-    log.info(f"Using STACK API at {api_url}")
+    log.info("Using STACK API server at {}".format(api_url))
 
     os.makedirs(dest_dir, exist_ok=True)
     msg = 'converting STACK exercises from {} to static forms for placement in {}'
@@ -2818,21 +2818,35 @@ def stack_extraction(xml_source, pub_file, stringparams, xmlid_root, dest_dir ):
 
     log.info("extracting STACK exercises from {}".format(xml_source))
     log.info("string parameters passed to extraction stylesheet: {}".format(stringparams) )
-    # place verbatim copies of STACK XML into a temporary directory
-    xsltproc(extraction_xslt, xml_source, None, tmp_dir, stringparams)
 
-    # Course over files in temporary directory,
-    # converting to PreTeXt XML. Innermosat loop
+    # Build list of stack/@source into a scratch directory/file
+    tmp_dir = get_temporary_directory()
+    source_filename = os.path.join(tmp_dir, "stack-source.txt")
+    log.debug("STACK source filenames temporarily in {}".format(source_filename))
+    xsltproc(extraction_xslt, xml_source, source_filename, None, stringparams)
+
+    # Course over (source, id) pairs in file created by
+    # extraction stylesheet, converting source STACK files
+    # to PreTeXt files based on id/label. Innermost loop
     # is modeled after work provided in
     #   https://github.com/PreTeXtBook/pretext/pull/2576
-    with working_directory(tmp_dir):
-        for stack_file in os.listdir(tmp_dir):
-            # form output file now, for diagnostic
-            # message before it is needed
-            # just change extension, easy
-            pretext_file = os.path.join(dest_dir, stack_file.replace('.xml', '.ptx'))
-            msg = 'converting STACK question file "{}/{}" to static PreTeXt XML file "{}"'
-            log.debug(msg.format(tmp_dir, stack_file, pretext_file))
+
+    # location of external directory for STACK files
+    _, external_dir = get_managed_directories(xml_source, pub_file)
+
+    with open(source_filename, "r") as source_file:
+        for source in source_file:
+
+            # source is the  stack/@source  attribute
+            # label is the "assembly-id" used for base filename
+            source, label = source.split()
+            # external directory plus authored @source is STACK question
+            stack_file = os.path.join(external_dir, source)
+            # destination directory, label/id filename, PTX extension is
+            # static version of question, to be melded in by assembly stylesheet
+            pretext_file = os.path.join(dest_dir, label + '.ptx')
+            msg = 'converting STACK question file "{}" to static PreTeXt XML file "{}"'
+            log.debug(msg.format(stack_file, pretext_file))
 
             # Open STACK XML file, send to server, unravel JSON response into
             # a text version of the static PreTeXt XML question

pretext/resources/resource_hash_table.json

@@ -523,14 +523,14 @@
     "installPandoc.sh": "a18b850870b5e2d744c99300c0643f12a81eba3e27dfd985927554af2062c967",
     "installSage.sh": "8020b532e1101c77c5681c0dfaff308a36c60e95db6b0f652bf230f7de216cb8"
   },
-  "2.33.3.dev20251221064246": {
-    "project.ptx": "9bf8e71768dcfa88b60a6e2e3c241fa8e0921c0cb95945dea1f7e096d20fc7b9",
-    "codechat_config.yaml": "f353a4d8fbd84259495bb2d11dd7d5ef2fbcb06cc928b6803700fab5774bc123",
-    ".gitignore": "73de277de1b136536d664a97faaf7abf59c2e3e702408eeca0a102cc3e479f45",
-    "devcontainer.json": "3e9a6c934f3b047dc641050e66ff23105c9b304e76502551a7e72632b0f8f119",
-    "pretext-cli.yml": "1f05cd60fed3faa6a461b84b4091a752326930b71cda7a3bf41cbd2ce1865605",
-    "pretext-deploy.yml": "83315bdfa65c66eb492f581b0870dc66bd77a30786f8ede7befa936ee854a43e",
-    "installPandoc.sh": "3ebc5000c918689eecb220c0c0b4147885c10a6ba325f4d09ee113b40539266d",
-    "installSage.sh": "b0699be2c66b69d94a408411200b1193d822633a61efc334dae7d05f5c9ae1b3"
+  "2.33.3.dev20251227064414": {
+    "project.ptx": "7f55ca3bae8682566bbd86339076a96da3a6b5027cb4c7a8b2c9cac3c864c862",
+    "codechat_config.yaml": "588babed2d0101d80cfe02a5ccead7bd7983893ac30431d2653da1d41f2fab65",
+    ".gitignore": "50317925b357a35e6316de355bd12c6c4d9a4070ce6c9cdc3d52e9a3310bef67",
+    "devcontainer.json": "24e4e3dfc5006798628f67b7e99d756ac8e54d9c04c7a3f56744af8562c9e771",
+    "pretext-cli.yml": "140d7c4428d7fd1f05e7b338fbc73de2493a37c4916de818a2dc845cea818850",
+    "pretext-deploy.yml": "28a7451a806d307bcb769754389bfb8065cdce6327c6f015a93b1c3d2ab20afe",
+    "installPandoc.sh": "1281030858e10259fba1a2553055594303ca126d71cf64a7e0809273dde55053",
+    "installSage.sh": "35846511b1d377a5a69a6143c17233b117ee415f0ecbbda93bdd63ec82b4593d"
   }
 }

{pretext-2.33.3.dev20251221064246.dist-info → pretext-2.33.3.dev20251227064414.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pretext
-Version: 2.33.3.dev20251221064246
+Version: 2.33.3.dev20251227064414
 Summary: A package to author, build, and deploy PreTeXt projects.
 Home-page: https://pretextbook.org
 License: GPL-3.0-or-later

{pretext-2.33.3.dev20251221064246.dist-info → pretext-2.33.3.dev20251227064414.dist-info}/RECORD

@@ -1,11 +1,11 @@
-pretext/__init__.py,sha256=6_kEfcaeakXKF4bueg4vvdtm_lxMxt8LTLEijBXBEzc,1453
+pretext/__init__.py,sha256=luvaeUyDmSp_csVF6fXwshfFGiM4FRZscktQ5tH0Yvc,1453
 pretext/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
 pretext/cli.py,sha256=VkDFWViY4Wa8aYdXC4rIHaAEq5-UUuVZR4Pw8mqp1f0,40546
 pretext/codechat.py,sha256=7FCz_TLf8yVSG5doGRvJ0rrpShZEejtlZ3ZyaWJrm9I,6305
 pretext/constants.py,sha256=cKxyUUy0SNX1M41CtJJtBpaHXTrKrZQPLrrbOJpCoU8,6843
 pretext/core/__init__.py,sha256=CmOXWPslsSiVzldc2UXNRug-xL8Ax601zGrp_3VhWxQ,739
 pretext/core/braille_format.py,sha256=ra1zVsyoUSUuGWCtY0VGF0FuEfHQ34oXtJvgKiiImdg,36377
-pretext/core/pretext.py,sha256=QT0j80YoBGDLOXGjUZsroqAoC9W5MoqcekFTOwaHsTk,272536
+pretext/core/pretext.py,sha256=51GDW1ERfMZKfq3dMDod8__NWq1AUwlIw-Q4DYxfvl0,273225
 pretext/logger.py,sha256=b58izYIs9xEmVOXd3wvKpQ-AH1mRsGFG2FDjJM_MyOE,1456
 pretext/plastex/Alignment.jinja2s,sha256=AfFPeWxhTo6H6MDWogYTGylWfZed4BX5BgkWLCObBqI,409
 pretext/plastex/Arrays.jinja2s,sha256=MHWFbO7CoYzIRWwg5QH38dhrU20N5x7BxEnzuIQ0rfU,294
@@ -50,16 +50,16 @@ pretext/project/__init__.py,sha256=Q4Met0dWYgoIA-hma8xiJipbQU48zEeubQJ8-joXOqk,8
 pretext/project/generate.py,sha256=Qn79ap89dSHKYhFUw494nkMVCN4qJUQjZBnJOhAbyqQ,9158
 pretext/project/xml.py,sha256=wtaXS2isRG6QlfyfNNccAbFt6Izwm7yxAledwd1Q6AA,3456
 pretext/resources/__init__.py,sha256=1qPohIxCtL1_sUtlAoFrWzhl31l-oFj4RrBBsb3RzQQ,4081
-pretext/resources/core.zip,sha256=iTh24ejUhmZd4k4rHNJhIUIAzIzfoGjmVszEeHyOoeI,1758215
-pretext/resources/pelican.zip,sha256=OaWS3b-R6NAlZowKbuz4a-OoD2-PdLjumMD6EsrMgic,15974
-pretext/resources/resource_hash_table.json,sha256=qsCkCTRdm29_vt5yMooXZeLMSpMLalriCwjtq_bVmcU,39814
-pretext/resources/rs_cache.zip,sha256=Xz0xxyDlR6-8X17TInsBq3mKX1s-9TFYuG7qha37NFA,14934918
-pretext/resources/templates.zip,sha256=hNgpKO2GOfVv_ASeJeEPn88QZfOZWzMActQZfUM4ioA,375353
+pretext/resources/core.zip,sha256=agbyIPw62W6lt7zjeW0q6r7GUe6GmhmiX0zHicsPZKI,1757887
+pretext/resources/pelican.zip,sha256=0w1Gb59Pa2KNc352qDME4VxGdK6_x-URlUNzuJMOqUI,15974
+pretext/resources/resource_hash_table.json,sha256=k2c_u_JjDndkVlWzi54gg8hhCht3ApykdtcC1OG0aw0,39814
+pretext/resources/rs_cache.zip,sha256=SrmIWzNvuC4phGikSv0NxodtfqQeNOl9ERQ2S8TdBO0,14940790
+pretext/resources/templates.zip,sha256=Oo_Fqwo_zCLxbtRlzto3j13tIl5zvi3ko9nJBksN3sc,375357
 pretext/server.py,sha256=B90NC6kevNeJNbwtUh3iVxF_BH5tiA4522XsjONsGSc,10800
 pretext/types.py,sha256=Eyyu6xmmCYnKBfvzBZzZMWZMa3yNjZ8NnGmlFGj9p5I,168
 pretext/utils.py,sha256=xAOsqcJo3Z6v3UlRbZeQN9nFWTNdhBpfUZ_BwqJFpio,45029
-pretext-2.33.3.dev20251221064246.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-pretext-2.33.3.dev20251221064246.dist-info/METADATA,sha256=ySWDkFWZ2bACS56rCcC-NVRpvHBSYlKwwolaXFYJvvM,11492
-pretext-2.33.3.dev20251221064246.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pretext-2.33.3.dev20251221064246.dist-info/entry_points.txt,sha256=L-rrQFUIWZhdOdu-XBQ9iuFK3X1cMVOtC-0I7T87II8,44
-pretext-2.33.3.dev20251221064246.dist-info/RECORD,,
+pretext-2.33.3.dev20251227064414.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+pretext-2.33.3.dev20251227064414.dist-info/METADATA,sha256=f2YBPAsyieHtRoKG_v6oQ6D2ApYqwy_v919_PTC9fYA,11492
+pretext-2.33.3.dev20251227064414.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pretext-2.33.3.dev20251227064414.dist-info/entry_points.txt,sha256=L-rrQFUIWZhdOdu-XBQ9iuFK3X1cMVOtC-0I7T87II8,44
+pretext-2.33.3.dev20251227064414.dist-info/RECORD,,