Make it build on python 3.13 with cython 3.1.

Author: ionelmc

.cookiecutterrc

@@ -1,47 +1,61 @@
-# Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
+# This file exists so you can easily regenerate your project.
+#
+# `cookiepatcher` is a convenient shim around `cookiecutter`
+# for regenerating projects (it will generate a .cookiecutterrc
+# automatically for any template). To use it:
+#
+#    pip install cookiepatcher
+#    cookiepatcher gh:ionelmc/cookiecutter-pylibrary python-hunter
+#
+# See:
+#    https://pypi.org/project/cookiepatcher
+#
+# Alternatively, you can run:
+#
+#    cookiecutter --overwrite-if-exists --config-file=python-hunter/.cookiecutterrc gh:ionelmc/cookiecutter-pylibrary
 
 default_context:
-    c_extension_optional: 'yes'
-    c_extension_support: cython
-    codacy: 'no'
-    codacy_projectid: '-'
-    codeclimate: 'no'
-    codecov: 'yes'
-    command_line_interface: argparse
-    command_line_interface_bin_name: hunter-trace
-    coveralls: 'no'
-    distribution_name: hunter
-    email: contact@ionelmc.ro
-    formatter_quote_style: single
-    full_name: Ionel Cristian Mărieș
-    function_name: compute
-    github_actions: 'yes'
-    github_actions_osx: 'yes'
-    github_actions_windows: 'yes'
-    license: BSD 2-Clause License
-    module_name: core
-    package_name: hunter
-    pre_commit: 'yes'
-    project_name: Hunter
-    project_short_description: Hunter is a flexible code tracing toolkit, not for measuring coverage, but for debugging, logging, inspection and other nefarious purposes. It has a simple Python API and a convenient terminal API (see `Environment variable activation <env-var-activation_>`_).
-    pypi_badge: 'yes'
-    pypi_disable_upload: 'no'
-    release_date: '2023-04-26'
-    repo_hosting: github.com
-    repo_hosting_domain: github.com
-    repo_main_branch: master
-    repo_name: python-hunter
-    repo_username: ionelmc
-    scrutinizer: 'no'
-    setup_py_uses_setuptools_scm: 'yes'
-    sphinx_docs: 'yes'
-    sphinx_docs_hosting: https://python-hunter.readthedocs.io/
-    sphinx_doctest: 'no'
-    sphinx_theme: furo
-    test_matrix_separate_coverage: 'yes'
-    tests_inside_package: 'no'
-    version: 3.7.0
-    version_manager: bump2version
-    website: https://blog.ionelmc.ro
-    year_from: '2015'
-    year_to: '2024'
+    c_extension_optional: "yes"
+    c_extension_support: "cython"
+    codacy: "no"
+    codacy_projectid: "-"
+    codeclimate: "no"
+    codecov: "yes"
+    command_line_interface: "argparse"
+    command_line_interface_bin_name: "hunter-trace"
+    coveralls: "no"
+    distribution_name: "hunter"
+    email: "contact@ionelmc.ro"
+    formatter_quote_style: "single"
+    full_name: "Ionel Cristian Mărieș"
+    function_name: "compute"
+    github_actions: "yes"
+    github_actions_osx: "yes"
+    github_actions_windows: "yes"
+    license: "BSD 2-Clause License"
+    module_name: "core"
+    package_name: "hunter"
+    pre_commit: "yes"
+    project_name: "Hunter"
+    project_short_description: "Hunter is a flexible code tracing toolkit, not for measuring coverage, but for debugging, logging, inspection and other nefarious purposes. It has a simple Python API and a convenient terminal API (see `Environment variable activation <env-var-activation_>`_)."
+    pypi_badge: "yes"
+    pypi_disable_upload: "no"
+    release_date: "2024-05-02"
+    repo_hosting: "github.com"
+    repo_hosting_domain: "github.com"
+    repo_main_branch: "master"
+    repo_name: "python-hunter"
+    repo_username: "ionelmc"
+    scrutinizer: "no"
+    setup_py_uses_setuptools_scm: "yes"
+    sphinx_docs: "yes"
+    sphinx_docs_hosting: "https://python-hunter.readthedocs.io/"
+    sphinx_doctest: "no"
+    sphinx_theme: "furo"
+    test_matrix_separate_coverage: "yes"
+    tests_inside_package: "no"
+    version: "3.7.0"
+    version_manager: "bump2version"
+    website: "https://blog.ionelmc.ro"
+    year_from: "2015"
+    year_to: "2025"

.pre-commit-config.yaml

@@ -6,16 +6,13 @@ exclude: '^(.tox/|ci/templates/|src/hunter.(pth|embed)$|src/hunter/vendor/|.bump
 # Note the order is intentional to avoid multiple passes of the hooks
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.2
+    rev: v0.12.2
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix, --show-fixes, --unsafe-fixes]
-  - repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-      - id: black
+        args: [--fix, --exit-non-zero-on-fix, --show-fixes]
+      - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         exclude_types:
@@ -28,6 +25,6 @@ repos:
       - id: debug-statements
         exclude: '^tests/sample*|src/hunter/actions.py'
   - repo: https://github.com/MarcoGorelli/cython-lint
-    rev: v0.16.2
+    rev: v0.16.7
     hooks:
       - id: cython-lint

ci/requirements.txt

@@ -1,6 +1,5 @@
 virtualenv>=20.4.7
 pip>=19.1.1
 setuptools>=18.0.1
-six>=1.14.0
 tox
 twine

ci/templates/.github/workflows/github-actions.yml

@@ -109,7 +109,7 @@ jobs:
         !matrix.cibw_build
       run: >
         tox -e {{ '${{ matrix.tox_env }}' }} -v
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v5
       if: matrix.cover
       with:
         verbose: true
@@ -130,7 +130,10 @@ jobs:
     if: {{ '${{ always() }}' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: codecov/codecov-action@v3
+    - uses: actions/upload-artifact/merge@v4
+      with:
+        name: all-wheels
+    - uses: codecov/codecov-action@v5
       with:
         CODECOV_TOKEN: {% raw %}${{ secrets.CODECOV_TOKEN }}{% endraw %}
 {{ '' }}

docs/conf.py

@@ -17,7 +17,7 @@
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Hunter'
-year = '2015-2024'
+year = '2015-2025'
 author = 'Ionel Cristian Mărieș'
 copyright = f'{year}, {author}'
 try:
@@ -50,7 +50,3 @@
 napoleon_use_ivar = True
 napoleon_use_rtype = False
 napoleon_use_param = False
-
-autosummary_generate = True
-
-autosectionlabel_prefix_document = True

pyproject.toml

@@ -11,7 +11,8 @@ backend-path = ["build_backend"]
 extend-exclude = ["static", "ci/templates"]
 line-length = 140
 src = ["src", "tests"]
-target-version = "py38"
+target-version = "py39"
+
 [tool.cython-lint]
 max-line-length = 140
 
@@ -26,6 +27,7 @@ ignore = [
     "S307",
     "S308", # flake8-bandit suspicious-mark-safe-usage
     "E501", # pycodestyle line-too-long
+    "PLC0415", # import-outside-top-level
 ]
 select = [
     "B", # flake8-bugbear
@@ -40,7 +42,6 @@ select = [
     "PLC", # pylint convention
     "PLE", # pylint errors
     "PT", # flake8-pytest-style
-    "Q", # flake8-quotes
     "RSE", # flake8-raise
     "RUF", # ruff-specific rules
     "S", # flake8-bandit
@@ -52,15 +53,10 @@ select = [
 fixture-parentheses = false
 mark-parentheses = false
 
-[tool.ruff.lint.flake8-quotes]
-inline-quotes = "single"
-
 [tool.ruff.lint.isort]
 extra-standard-library = ["opcode"]
 forced-separate = ["conftest"]
 force-single-line = true
 
-[tool.black]
-line-length = 140
-target-version = ["py38"]
-skip-string-normalization = true
+[tool.ruff.format]
+quote-style = "single"

setup.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 
 from setuptools import Extension
-from setuptools import find_packages
+from setuptools import find_namespace_packages
 from setuptools import setup
 from setuptools.command.build import build
 from setuptools.command.build_ext import build_ext
@@ -23,14 +23,23 @@
     Cython = None
 
 # Enable code coverage for C code: we cannot use CFLAGS=-coverage in tox.ini, since that may mess with compiling
-# dependencies (e.g. numpy). Therefore we set SETUPPY_CFLAGS=-coverage in tox.ini and copy it to CFLAGS here (after
+# dependencies (e.g. numpy). Therefore, we set SETUPPY_CFLAGS=-coverage in tox.ini and copy it to CFLAGS here (after
 # deps have been safely installed).
 if 'TOX_ENV_NAME' in os.environ and os.environ.get('SETUPPY_EXT_COVERAGE') == 'yes':
     CFLAGS = os.environ['CFLAGS'] = '-DCYTHON_TRACE=1'
     LFLAGS = os.environ['LFLAGS'] = ''
 else:
     CFLAGS = ''
     LFLAGS = ''
+
+allow_extensions = True
+if '__pypy__' in sys.builtin_module_names:
+    print('NOTICE: C extensions disabled on PyPy (would be broken)!')
+    allow_extensions = False
+if os.environ.get('SETUPPY_FORCE_PURE'):
+    print('NOTICE: C extensions disabled (SETUPPY_FORCE_PURE)!')
+    allow_extensions = False
+
 pth_file = str(Path(__file__).parent.joinpath('src', 'hunter.pth'))
 
 
@@ -70,8 +79,6 @@ class OptionalBuildExt(build_ext):
 
     def run(self):
         try:
-            if os.environ.get('SETUPPY_FORCE_PURE'):
-                raise Exception('C extensions disabled (SETUPPY_FORCE_PURE)!')
             super().run()
         except Exception as e:
             self._unavailable(e)
@@ -121,29 +128,30 @@ def read(*names, **kwargs):
         re.compile('^.. start-badges.*^.. end-badges', re.M | re.S).sub('', read('README.rst')),
         re.sub(':[a-z]+:`~?(.*?)`', r'``\1``', read('CHANGELOG.rst')),
     ),
+    long_description_content_type='text/x-rst',
     author='Ionel Cristian Mărieș',
     author_email='contact@ionelmc.ro',
     url='https://github.com/ionelmc/python-hunter',
-    packages=find_packages('src'),
+    packages=find_namespace_packages('src'),
     package_dir={'': 'src'},
     py_modules=[path.stem for path in Path('src').glob('*.py')],
+    include_package_data=True,
     zip_safe=False,
     classifiers=[
         # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
         'Operating System :: Unix',
         'Operating System :: POSIX',
         'Operating System :: Microsoft :: Windows',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',
@@ -163,7 +171,7 @@ def read(*names, **kwargs):
         'code',
         'source',
     ],
-    python_requires='>=3.8',
+    python_requires='>=3.9',
     install_requires=[],
     extras_require={
         ':platform_system != "Windows"': ['manhole >= 1.5'],
@@ -190,19 +198,17 @@ def read(*names, **kwargs):
         'develop': DevelopWithPTH,
         'build_ext': OptionalBuildExt,
     },
-    ext_modules=(
-        []
-        if hasattr(sys, 'pypy_version_info')
-        else [
-            Extension(
-                str(path.relative_to('src').with_suffix('')).replace(os.sep, '.'),
-                sources=[str(path)],
-                extra_compile_args=CFLAGS.split(),
-                extra_link_args=LFLAGS.split(),
-                include_dirs=[str(path.parent)],
-            )
-            for path in Path('src').glob('**/*.pyx' if Cython else '**/*.c')
-        ]
-    ),
-    distclass=BinaryDistribution,
+    ext_modules=[
+        Extension(
+            str(path.relative_to('src').with_suffix('')).replace(os.sep, '.'),
+            sources=[str(path)],
+            extra_compile_args=CFLAGS.split(),
+            extra_link_args=LFLAGS.split(),
+            include_dirs=[str(path.parent)],
+        )
+        for path in Path('src').glob('**/*.pyx' if Cython else '**/*.c')
+    ]
+    if allow_extensions
+    else [],
+    distclass=BinaryDistribution if allow_extensions else None,
 )

src/hunter/__init__.py

@@ -341,7 +341,7 @@ def Backlog(*conditions, **kwargs):
     vars = kwargs.pop('vars', False)
     if not conditions and not kwargs:
         raise TypeError(
-            'Backlog needs at least 1 condition ' "(it doesn't have any effect without one besides making everything incredibly slow)."
+            "Backlog needs at least 1 condition (it doesn't have any effect without one besides making everything incredibly slow)."
         )
     return _Backlog(
         _merge(*conditions, **kwargs),