Pass PyPy status to write pyc. Correct pyc-xasm entry. And more.

Author: rocky

README.rst

@@ -54,7 +54,6 @@ Installation
 A GNU makefile is also provided so ``make install`` (possibly as root or
 sudo) will do the steps above.
 
-
 *If you are using Python before 3.11*, do not install using PyPI, but instead install using a file in the `GitHub Releases section <https://github.com/rocky/python-xasm/releases>`_. Older Python used to use `easy_install <https://python101.pythonlibrary.org/chapter29_pip.html#using-easy-install>`_. But this is no longer supported in PyPi or newer Python versions. And vice versa, *poetry* nor *pip*, (the newer ways) are not supported on older Pythons.
 
 If the Python version you are running xasm is between Python 3.6 through 3.11, use a tarball called xasm_36-*x.y.z*.tar.gz.

admin-tools/install-all-3.6-3.10.sh

@@ -21,8 +21,8 @@ fi
 
 cd ../dist/
 
-install_file="xasm_36-${__version__}.tar.gz"
 install_check_command="pyc-xasm --help"
+install_file="xasm_36-${__version__}.tar.gz"
 for version in $PYVERSIONS; do
     echo "*** Installing ${install_file} for Python ${version} ***"
     echo $version

admin-tools/install-all-newest.sh

@@ -21,8 +21,8 @@ fi
 
 cd ../dist/
 
-install_check_command="xasm --help"
-install_file="pyc-xasm-${__version__}.tar.gz"
+install_check_command="pyc-xasm --help"
+install_file="xasm-${__version__}.tar.gz"
 for pyversion in $PYVERSIONS; do
     echo "*** Installing ${install_file} for Python ${pyversion} ***"
     pyenv local $pyversion

admin-tools/make-dist-newest.sh

@@ -34,7 +34,7 @@ fi
 
 for pyversion in $PYVERSIONS; do
     case ${pyversion:0:4} in
-	"graal" )
+	"graa" )
 	    echo "$pyversion - Graal does not get special packaging"
 	    continue
 	    ;;

admin-tools/pyenv-newest-versions

@@ -1,9 +1,10 @@
 # -*- shell-script -*-
 # Sets PYVERSIONS to be pyenv versions that
 # we can use in the master branch.
-export PYVERSIONS='3.11 3.12 3.13'
 if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     typeset -p PYVERSIONS
     echo "Note: this script should be *sourced* rather than run directly through bash"
     exit 1
 fi
+
+export PYVERSIONS='3.11 pypy3.11 graalpy-24.2.2 pypy3.11 3.12 graalpy-community-25.0.0 3.13'

pyproject.toml

@@ -47,7 +47,7 @@ dev = [
 ]
 
 [project.scripts]
-python-cfg = "xasm.__main__:main"
+pyc-xasm = "xasm.xasm_cli:main"
 
 [tool.setuptools]
 packages = [

xasm/assemble.py

@@ -69,6 +69,7 @@ def __init__(self, python_version, is_pypy) -> None:
         self.codes = []  # FIXME use a better name
         self.status: str = "unfinished"
         self.size = 0  # Size of source code. Only relevant in version 3 and above
+        self.is_pypy = is_pypy
         self.python_version = python_version
         self.timestamp = None
         self.backpatch = []  # list of backpatch dicts, one for each function

xasm/write_pyc.py

@@ -1,5 +1,6 @@
 import time
 from struct import pack
+from typing import Optional
 
 import xdis
 from xdis import magic2int
@@ -8,8 +9,13 @@
 from xdis.version_info import PYTHON3, version_tuple_to_str
 
 
-def write_pycfile(fp, code_list, timestamp=None, version_triple=xdis.PYTHON_VERSION_TRIPLE) -> int:
-
+def write_pycfile(
+    fp,
+    code_list,
+    timestamp=None,
+    version_triple=xdis.PYTHON_VERSION_TRIPLE,
+    is_pypy: Optional[bool] = None,
+) -> int:
     rc = 0
     version_str = version_tuple_to_str(version_triple, end=2)
     magic_bytes = magics[version_str]
@@ -36,7 +42,7 @@ def write_pycfile(fp, code_list, timestamp=None, version_triple=xdis.PYTHON_VERS
 
     for co in code_list:
         try:
-            co_obj = dumps(co, python_version=version_triple)
+            co_obj = dumps(co, python_version=version_triple, is_pypy=is_pypy)
             if PYTHON3 and version_triple < (3, 0):
                 co_obj = str.encode(co_obj)
                 pass

xasm/xasm_cli.py

@@ -44,7 +44,9 @@ def main(pyc_file: List[str], asm_path):
         file_mode = "w"
 
     with open(pyc_file, file_mode) as fp:
-        rc = write_pycfile(fp, asm.code_list, asm.timestamp, asm.python_version)
+        rc = write_pycfile(
+            fp, asm.code_list, asm.timestamp, asm.python_version, asm.is_pypy
+        )
         size = fp.tell()
     print(
         f"""Wrote Python {version_tuple_to_str(asm.python_version)} bytecode file "{pyc_file}"; {size} bytes."""