Merge branch 'master' into yggdrasil

Fix bug in parsing of bytes messages in validation when determining if a python object should be parsed or interpreted directly
Fix bugs in ObjWavefront handling of colors

Author: langmm

.bumpversion.toml

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# :Project:   python-rapidjson — Configuration for bump-my-version
+# :Created:   lun 4 nov 2024, 08:25:29
+# :Author:    Lele Gaifax <lele@metapensiero.it>
+# :License:   MIT License
+# :Copyright: © 2024 Lele Gaifax
+#
+
+[tool.bumpversion]
+current_version = "1.21"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)"
+serialize = [
+    "{major}.{minor}",
+]
+search = "{current_version}"
+replace = "{new_version}"
+regex = false
+ignore_missing_version = false
+ignore_missing_files = false
+tag = false
+sign_tags = false
+tag_name = "v{new_version}"
+tag_message = "Bump version: {current_version} → {new_version}"
+allow_dirty = false
+commit = false
+message = "Bump version: {current_version} → {new_version}"
+commit_args = ""
+
+[[tool.bumpversion.files]]
+filename = "setup.py"
+search = "VERSION = '{current_version}'"
+replace = "VERSION = '{new_version}'"

.github/workflows/main.yml

@@ -4,7 +4,7 @@
 # :Author:    Martin Thoma <info@martin-thoma.de>
 # :License:   MIT License
 # :Copyright: © 2020 Martin Thoma
-# :Copyright: © 2020, 2021, 2022, 2023, 2024 Lele Gaifax
+# :Copyright: © 2020, 2021, 2022, 2023, 2024, 2025 Lele Gaifax
 #
 
 # For more information see:
@@ -52,6 +52,10 @@ jobs:
         run: |
           make -C docs doctest -e PYTHON=$(which python3)
 
+      - name: Typing stub tests
+        run: |
+          stubtest rapidjson
+
   debug-tests:
     name: Memory leak tests, on current debug build Python
     runs-on: ubuntu-latest
@@ -65,7 +69,7 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: deadsnakes/action@v3.1.0
+      - uses: deadsnakes/action@v3.2.0
         with:
           python-version: ${{ matrix.python-version }}
           debug: true
@@ -84,15 +88,15 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04
-          - macos-12
-          - windows-2019
+          - ubuntu-24.04
+          - macos-13
+          - windows-2025
         arch:
           - auto
         include:
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
             arch: aarch64
-          # - os: ubuntu-22.04
+          # - os: ubuntu-24.04
           #   arch: ppc64le
           - os: macos-14
             arch: arm64
@@ -114,13 +118,16 @@ jobs:
         name: Set up QEMU
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v3.1.3
         env:
           CIBW_ARCHS_LINUX: ${{ matrix.arch }}
           CIBW_ARCHS_MACOS: ${{ matrix.arch }}
           CIBW_TEST_REQUIRES: "pytest pytest-benchmark pytz"
           CIBW_TEST_COMMAND: "pytest -sv {project}/tests"
-          CIBW_SKIP: "cp2* cp33* cp34* cp35* cp36* pp* cp310-manylinux_i686 cp311-manylinux_i686 cp312-manylinux_i686 *-musllinux_*"
+          CIBW_SKIP: "cp2* cp33* cp34* cp35* cp36* cp38* pp* cp310-manylinux_i686 cp311-manylinux_i686 cp312-manylinux_i686 *-musllinux_*"
+          # Skip tests on emulated hardware, take too long or not supported
+          CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le} *-macosx_*:arm64"
+          CIBW_ENABLE: cpython-prerelease
           CIBW_ENVIRONMENT: "PIP_ONLY_BINARY=numpy"
           # CIBW_BEFORE_BUILD: python -m pip install oldest-supported-numpy
           # CIBW_PRERELEASE_PYTHONS: True
@@ -136,8 +143,12 @@ jobs:
   #   needs: build_wheels
   #   runs-on: ubuntu-latest
 
-  #   # Upload to PyPI on every tag starting with 'v'
-  #   if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+    # Upload to PyPI on every tag starting with 'v'
+    # FIXME: for some reason, the job is skipped, although the configuration is
+    #        almost identical to the one I use on pglast... let's try to temporarily
+    #        remove the condition
+    # langmm: Disabled until name change for fork
+    ## if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
 
   #   steps:
   #     - uses: actions/download-artifact@v4

.gitignore

@@ -64,4 +64,10 @@ target/
 # Emacs stuff
 /.emacs.desktop.lock
 /emacs.desktop
-*~
+*~
+
+# Virtualenv
+.venv/
+
+# Git Worktree
+.wt/

.readthedocs.yaml

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# :Project:   python-rapidjson — Configuration for Read the Docs
+# :Created:   sab 18 mag 2024, 15:59:36
+# :Author:    Lele Gaifax <lele@metapensiero.it>
+# :License:   MIT License
+# :Copyright: © 2024 Lele Gaifax
+#
+
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+submodules:
+  include: all
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+python:
+  install:
+    - requirements: requirements.txt
+    - method: pip
+      path: .
+
+sphinx:
+  configuration: docs/conf.py

CHANGES.rst

@@ -1,6 +1,84 @@
 Changes
 -------
 
+1.21 (2025-07-10)
+~~~~~~~~~~~~~~~~~
+
+* Use `current master`__ version of rapidjson, thanks to Kyle Gottfried (although I didn't
+  merge his `PR #224`__)
+
+  __ https://github.com/Tencent/rapidjson/compare/ab1842a2dae061284c0a62dca1cc6d5e7e37e346..24b5e7a8b27f42fa16b96fc70aade9106cf7102f
+  __ https://github.com/python-rapidjson/python-rapidjson/pull/224
+
+* Recompute comparison table with latest versions of other libraries, using Python 3.13
+
+* Typing stubs: specify default value for ``stream`` argument of ``Encoder.__call__()``
+  (`issue #215`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/215
+
+* Use more recent OS images on GH Actions to test and build wheels
+
+
+1.20 (2024-08-05)
+~~~~~~~~~~~~~~~~~
+
+* Rectify type hints of ``loads()`` and ``Decoder.__call__()`` (`issue #214`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/214
+
+* Ensure ``Validator`` receives valid UTF-8 ``bytes``/``bytearray`` arguments
+
+* Generate wheels on PyPI using Python 3.13.0rc1 release, thanks to cibuildwheel `2.20.0`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v2200
+
+
+1.19 (2024-07-28)
+~~~~~~~~~~~~~~~~~
+
+* Properly dump subclasses of ``float`` with custom ``__repr__()`` method ( `issue #213`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/213
+
+
+1.18 (2024-06-29)
+~~~~~~~~~~~~~~~~~
+
+* Expose PEP-484 typing stubs, thanks to Rodion Kosianenko and GoodWasHere (`PR #204`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/pull/204
+
+
+1.17 (2024-05-18)
+~~~~~~~~~~~~~~~~~
+
+* Use `current master`__ version of rapidjson
+
+  __ https://github.com/Tencent/rapidjson/compare/5e17dbed34eef33af8f3e734820b5dc547a2a3aa...ab1842a2dae061284c0a62dca1cc6d5e7e37e346
+
+* Generate wheels on PyPI using Python 3.13b1 release, thanks to cibuildwheel `2.18.0`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v2180
+
+
+1.16 (2024-02-28)
+~~~~~~~~~~~~~~~~~
+
+* Produce Python 3.8 wheels again, I deactivated it too eagerly, it's in *security fixes
+  only* mode, not yet reached its `end-of-life` state
+
+
+1.15 (2024-02-28)
+~~~~~~~~~~~~~~~~~
+
+* Honor the `recursion limit`__ also at parse time, to avoid attacks as described by
+  `CVE-2024-27454`__
+
+  __ https://docs.python.org/3.12/library/sys.html#sys.setrecursionlimit
+  __ https://monicz.dev/CVE-2024-27454
+
+
 1.14 (2023-12-14)
 ~~~~~~~~~~~~~~~~~
 
@@ -30,7 +108,7 @@ Changes
 
 * Use `current master`__ version of rapidjson
 
-  __ https://github.com/Tencent/rapidjson/compare/083f359f5c36198accc2b9360ce1e32a333231d9...5e17dbed34eef33af8f3e734820b5dc547a2a3aa9
+  __ https://github.com/Tencent/rapidjson/compare/083f359f5c36198accc2b9360ce1e32a333231d9...5e17dbed34eef33af8f3e734820b5dc547a2a3aa
 
 * Use cibuildwheel `2.15.0`__
 

LICENSE

@@ -3,6 +3,7 @@ python-rapidjson is licensed under the MIT license.
 The MIT License (MIT)
 
 Copyright (c) 2015, 2016, 2017 Ken Robbins
+Copyright (c) 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Lele Gaifax
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -2,6 +2,7 @@ include .dir-locals.el
 include LICENSE MANIFEST.in *.cfg *.ini *.py *.rst *.txt
 include python-rapidjson/*.cpp python-rapidjson/*.h
 include benchmarks/*.py tests/*.py
+include typings/*.pyi
 
 exclude .github .gitmodules
 

Makefile.release

@@ -2,13 +2,12 @@
 # :Project:   python-rapidjson -- Release specific targets
 # :Author:    Lele Gaifax <lele@metapensiero.it>
 # :License:   MIT License
-# :Copyright: © 2017, 2019, 2020 Lele Gaifax
+# :Copyright: © 2017, 2019, 2020, 2024 Lele Gaifax
 #
 
-BUMPER = $(VENVDIR)/bin/bump_version -s simple2
-VERSION_TXT := version.txt
-VERSION = $(shell cat $(VERSION_TXT))
-PACKAGE_NAME = $(shell $(PYTHON) setup.py --name)
+BUMPER = $(VENVDIR)/bin/bump-my-version bump
+VERSION = $(shell bump-my-version show current_version 2>/dev/null)
+PACKAGE_NAME = python_rapidjson
 TWINE := $(BINDIR)twine
 
 help::
@@ -30,7 +29,7 @@ help::
 
 .PHONY: release
 release: assert-master-branch assert-clean-tree
-	$(BUMPER) $(VERSION_TXT)
+	$(BUMPER) minor
 	@echo ">>>"
 	@echo ">>> Do your duties (update CHANGES.rst for example), then"
 	@echo ">>> execute “make tag-release”."

README.rst

@@ -3,7 +3,7 @@
 .. :Author:    Ken Robbins <ken@kenrobbins.com>
 .. :License:   MIT License
 .. :Copyright: © 2015 Ken Robbins
-.. :Copyright: © 2016, 2017, 2018, 2020, 2022 Lele Gaifax
+.. :Copyright: © 2016, 2017, 2018, 2020, 2022, 2024, 2025 Lele Gaifax
 ..
 
 ==================
@@ -75,6 +75,26 @@ Basic usage looks like this:
     Chunk: b'":"ba'
     Chunk: b'z"}'
 
+Most functionalities are exposed both as *functions* and as *classes*.
+
+The following uses a *relaxed syntax* ``Decoder`` instance, that handles JSONC__ and
+*trailing commas*:
+
+__ https://jsonc.org/
+
+.. code-block:: python
+
+    >>> from rapidjson import Decoder
+    >>> from rapidjson import PM_COMMENTS, PM_TRAILING_COMMAS
+    >>> decoder = Decoder(parse_mode=PM_COMMENTS | PM_TRAILING_COMMAS)
+    >>> decoder('''
+    ... {
+    ...     "bar": /* Block comment */ "baz",
+    ...     "foo":100, // Trailing comma and comment
+    ... }
+    ... ''')
+    {'bar': 'baz', 'foo': 100}
+
 
 Development
 -----------
@@ -108,7 +128,7 @@ Performance
 ``python-rapidjson`` tries to be as performant as possible while staying
 compatible with the ``json`` module.
 
-See the `this section`__ in the documentation for a comparison with other JSON libraries.
+See `this section`__ in the documentation for a comparison with other JSON libraries.
 
 __ https://python-rapidjson.readthedocs.io/en/latest/benchmarks.html
 

benchmarks/conftest.py

@@ -2,7 +2,7 @@
 # :Project:   python-rapidjson -- Benchmarks specific pytest configuration
 # :Author:    Lele Gaifax <lele@metapensiero.it>
 # :License:   MIT License
-# :Copyright: © 2016, 2017, 2018, 2020 Lele Gaifax
+# :Copyright: © 2016, 2017, 2018, 2020, 2024 Lele Gaifax
 #
 
 from collections import namedtuple
@@ -56,6 +56,32 @@ def pytest_addoption(parser):
                             rj.Encoder(number_mode=rj.NM_NATIVE),
                             rj.Decoder(number_mode=rj.NM_NATIVE)))
 
+
+
+class DecoderPython(rj.Decoder):
+    def end_array(self, a):
+        return a
+
+    def start_object(self):
+        return {}
+
+    def end_object(self, d):
+        return d
+
+    def string(self, s):
+        return s
+
+
+class EncoderPython(rj.Encoder):
+    def default(self, obj):
+        return repr(obj)
+
+
+contenders.append(Contender('rapidjson_p',
+                            EncoderPython(),
+                            DecoderPython()))
+
+
 numbers_contenders = [
     Contender('Wide numbers', rj.dumps, rj.loads),
     Contender('Native numbers',
@@ -147,7 +173,9 @@ def pytest_generate_tests(metafunc):
         if metafunc.config.option.compare_other_engines:
             metafunc.parametrize('contender', contenders, ids=attrgetter('name'))
         else:
-            metafunc.parametrize('contender', contenders[:1], ids=attrgetter('name'))
+            metafunc.parametrize('contender', [c for c in contenders
+                                               if c.name.startswith('rapidjson')],
+                                 ids=attrgetter('name'))
 
     if 'datetimes_loads_contender' in metafunc.fixturenames:
         metafunc.parametrize('datetimes_loads_contender',