Merge branch 'master' into feature/enum_ns

Author: timosachsenberg

.github/workflows/ci-autowrap.yaml

@@ -31,27 +31,37 @@ jobs:
             python-version: "3.11"
           - CYTHON: "==3.1.0"
             python-version: "3.12"
+          - CYTHON: "==3.1.0"
+            python-version: "3.13"
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Upgrade pip version
-        run: |
-          python -m pip install -U pip
-      - name: Install pytest
-        run: |
-          python -m pip install pytest
-      - name: Install setuptools
+      - name: Cache pip dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-${{ matrix.python-version }}-
+            ${{ runner.os }}-pip-
+
+      - name: Upgrade pip and install build tools
         run: |
-          python -m pip install setuptools
-      - name: Upgrade cython version
+          python -m pip install -U pip build setuptools wheel
+
+      - name: Install Cython
         run: |
           python -m pip install "Cython${{ matrix.CYTHON }}"
-      - name: run tests
+
+      - name: Install package in development mode
+        run: |
+          python -m pip install -e .[test]
+
+      - name: Run tests
         run: |
-          python setup.py develop
-          py.test tests/
+          python -m pytest tests/ -v

.github/workflows/release-autowrap.yaml

@@ -18,25 +18,17 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: "3.11"
 
-      - name: Upgrade pip version
+      - name: Install build dependencies
         run: |
-          python -m pip install -U pip
-
-      - name: Install wheel
-        run: |
-          python -m pip install wheel
-
-      - name: Install setuptools
-        run: |
-          python -m pip install setuptools
+          python -m pip install -U pip build
 
       - name: Build wheel and source distribution
         run: |
-          python setup.py bdist_wheel sdist
+          python -m build
       
       - name: Publish package to PyPI
         uses: pypa/gh-action-pypi-publish@master
@@ -46,7 +38,7 @@ jobs:
           packages_dir: ${{ github.workspace }}/dist
 
       - name: Parse version
-        run: echo "version=$(python3 -c 'from autowrap.version import __version__ as v; print("%d.%d.%d" % v)')" >> $GITHUB_OUTPUT
+        run: echo "version=$(python3 -c 'from autowrap.version import __version__; print(__version__)')" >> $GITHUB_OUTPUT
         id: version
 
       - name: Create github release
@@ -71,7 +63,11 @@ jobs:
           cat CHANGELOG.md >> HISTORY.md
           echo >> HISTORY.md
           rm CHANGELOG.md && echo "autowrap $NEXT_VER" > CHANGELOG.md
-          sed -i -e "s/^[[:space:]]*__version__.*/__version__ = \(${NEXT_VER//./, }\)/g" autowrap/version.py
+          # Update string version
+          sed -i -e "s/^__version__ = \".*\"/__version__ = \"$NEXT_VER\"/g" autowrap/version.py
+          # Update tuple version for backward compatibility
+          TUPLE_VER=$(echo $NEXT_VER | sed 's/\./, /g')
+          sed -i -e "s/^__version_tuple__ = (.*)/__version_tuple__ = ($TUPLE_VER)/g" autowrap/version.py
           
       - uses: stefanzweifel/git-auto-commit-action@v4.15.2
         with:

.gitignore

@@ -1,10 +1,153 @@
-*.py[co]
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# IDEs and editors
+.idea/
+.vscode/
+*.swp
+*.swo
+*~
 
 # gvim
 .*.sw[ijklmnop]
-*~
 
-# Packages
+# OS files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Modern Python packaging
 *.egg
 *.egg-info
 dist
@@ -16,24 +159,10 @@ var
 sdist
 develop-eggs
 .installed.cfg
-.idea
-.vscode
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
 
 #Mr Developer
 .mr.developer.cfg
 
-htmlcov
-
 # generated py extensions
 tests/test_files/gil_testing_wrapper.pyx
 tests/test_files/libcpp_stl_test.pyx

CHANGELOG.md

@@ -1 +1,3 @@
-autowrap 0.22.12
+autowrap 0.23.0
+
+Support for Cython 3.1! This means the removal of some py2 compatibility code, no more python distinction between long and int, some fixes to multiline comment processing.

HISTORY.md

@@ -24,3 +24,6 @@ autowrap 0.22.11
 - Fixes some issues with typing support on python side
 - Added a real C++ bool converter. C++ bools in a pxd will now be real booleans
   on python side. Not "just" ints and will also be typed like that.
+
+autowrap 0.22.12
+

autowrap/Code.py

@@ -37,6 +37,7 @@
 import string
 import re
 
+
 class Code(object):
     def __init__(self):
         self.content: List[Union[Code, str]] = []

autowrap/CodeGenerator.py

@@ -84,6 +84,7 @@
 def namespace_handler(ns):
     return ns
 
+
 def augment_arg_names(method):
     """replaces missing arg_names with "in_%d" % i, where i is the position
     number of the arg"""
@@ -93,11 +94,12 @@ def augment_arg_names(method):
 
 
 def fixed_include_dirs(include_boost: bool) -> List[AnyStr]:
-    import pkg_resources
+    from importlib.resources import files
 
-    boost = pkg_resources.resource_filename("autowrap", "data_files/boost")
-    data = pkg_resources.resource_filename("autowrap", "data_files")
-    autowrap_internal = pkg_resources.resource_filename("autowrap", "data_files/autowrap")
+    autowrap_files = files("autowrap")
+    boost = str(autowrap_files.joinpath("data_files/boost"))
+    data = str(autowrap_files.joinpath("data_files"))
+    autowrap_internal = str(autowrap_files.joinpath("data_files/autowrap"))
 
     if not include_boost:
         return [autowrap_internal]
@@ -1650,7 +1652,7 @@ def create_special_getitem_method(self, mdcl):
 
         meth_code.add(
             """
-                     |    cdef long _idx = $call_arg
+                     |    cdef int _idx = $call_arg
                      """,
             locals(),
         )
@@ -1752,7 +1754,7 @@ def create_special_setitem_method(self, mdcl):
                      |    \"\"\"$docstring\"\"\"
                      |    assert isinstance(key, int), 'arg index wrong type'
                      |
-                     |    cdef long _idx = $call_arg
+                     |    cdef int _idx = $call_arg
                      |    if _idx < 0:
                      |        raise IndexError("invalid index %d" % _idx)
                      """,