Upgrade to 1.9.z to fix GCC-15 compilation issues

.github/actions/setup-msys2/action.yml

@@ -0,0 +1,18 @@
+name: 'Setup msys2'
+inputs:
+  arch:
+    required: true
+runs:
+  using: "composite"
+  steps:
+  - name: Set up MSYS2
+    id: set-up-msys2
+    uses: msys2/setup-msys2@v2
+    with:
+      msystem: ${{ inputs.arch == 'x86' && 'mingw32' || 'ucrt64' }}
+      install: make mingw-w64-${{ inputs.arch == 'x86' && 'i686' || 'ucrt-x86_64' }}-gcc patch
+
+  - name: Set PATH for x86
+    if: ${{ inputs.arch == 'x86' }}
+    shell: msys2 {0}
+    run: echo "${{ steps.set-up-msys2.outputs.msys2-location }}/mingw32/bin" >> "$GITHUB_PATH"

.github/workflows/build.yml

@@ -8,36 +8,47 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-10.15]
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11-dev", pypy3]
+        os: [ubuntu-22.04, macos-13]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12", "3.13", "pypy-3.9", "pypy-3.10"]
+        use-system-libs: [false]
+        include:
+          - os: ubuntu-22.04
+            python-version: "3.11"
+            use-system-libs: true
 
     steps:
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Use Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
     - run: pip install tox virtualenv
 
-    - run: "make jq.c"
-
     - run: tox -e py
+      if: ${{ !matrix.use-system-libs }}
+
+    - run: |
+        # Remove deps to make sure they're not being used
+        rm -r deps
+
+        sudo apt-get install -y libjq-dev libonig-dev
+
+        JQPY_USE_SYSTEM_LIBS=1 tox -e py
+      if: ${{ matrix.use-system-libs }}
 
   build_sdist:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v2
-        name: Use Python 3.7
+      - uses: actions/setup-python@v5
+        name: Use Python 3.11
         with:
-          python-version: '3.7'
-
-      - run: make jq.c
+          python-version: '3.11'
 
       - run: pip install build twine
 
@@ -47,8 +58,9 @@ jobs:
       - name: Check metadata
         run: python -m twine check dist/*
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
+          name: dist-sdist
           path: dist/*.tar.gz
 
   build_wheels_matrix:
@@ -60,53 +72,129 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Use Python 3.10
-        uses: actions/setup-python@v2
+      - name: Use Python 3.11
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.9.0
+        run: python -m pip install cibuildwheel==2.23.3
 
       - id: set-matrix
-        run: python build-wheels-matrix.py
+        env:
+          CIBW_ARCHS_LINUX: "auto aarch64"
+          CIBW_ARCHS_MACOS: "auto"
+          CIBW_SKIP: "cp36-win_amd64 cp36-win32 pp*-win_amd64 pp*-win32 pp38-*"
+        run: |
+          MATRIX=$(
+            {
+              cibuildwheel --print-build-identifiers --platform linux \
+                | sed 's/.*/{"cibw-only": "&", "os": "ubuntu-22.04"}/' \
+              && cibuildwheel --print-build-identifiers --platform macos \
+                | sed 's/.*/{"cibw-only": "&", "os": "macos-13" }/' \
+              && CIBW_ARCHS_WINDOWS=AMD64 cibuildwheel --print-build-identifiers --platform windows \
+                | sed 's/.*/{"cibw-only": "&", "os": "windows-2022", "arch": "AMD64" }/' \
+              && CIBW_ARCHS_WINDOWS=x86 cibuildwheel --print-build-identifiers --platform windows \
+                | sed 's/.*/{"cibw-only": "&", "os": "windows-2022", "arch": "x86" }/'
+            } | jq --slurp --compact-output '{"include": .}'
+          )
+          echo matrix="$MATRIX" >> $GITHUB_OUTPUT
 
   build_wheels:
-    name: Build ${{ matrix.CIBW_BUILD }} wheel
+    name: Build ${{ matrix.cibw-only }} wheel
 
     needs: build_wheels_matrix
-    runs-on: ${{ matrix.os }}
-    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
 
     strategy:
       matrix: ${{ fromJson(needs.build_wheels_matrix.outputs.matrix) }}
 
-    steps:
+    runs-on: ${{ matrix.os }}
 
-    - uses: actions/checkout@v2
+    steps:
 
-    - name: Use Python 3.10
-      uses: actions/setup-python@v2
+    - name: Check whether to build wheel
+      id: should-build-wheel
+      if: |
+        (github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')) ||
+        matrix.cibw-only == 'cp310-manylinux_x86_64' ||
+        matrix.cibw-only == 'cp310-musllinux_x86_64' ||
+        matrix.cibw-only == 'cp310-macosx_x86_64' ||
+        matrix.cibw-only == 'cp310-win_amd64' ||
+        matrix.cibw-only == 'cp310-win32'
+      shell: bash
+      run: echo true=1 >> $GITHUB_OUTPUT
+
+    - uses: actions/checkout@v4
+      if: steps.should-build-wheel.outputs.true
+
+    - name: Set up MSYS2
+      if: steps.should-build-wheel.outputs.true && runner.os == 'Windows'
+      uses: ./.github/actions/setup-msys2
       with:
-        python-version: '3.10'
+        arch: ${{ matrix.arch }}
 
     - name: Set up QEMU
-      if: runner.os == 'Linux'
-      uses: docker/setup-qemu-action@v1
+      if: steps.should-build-wheel.outputs.true && runner.os == 'Linux'
+      uses: docker/setup-qemu-action@v3
       with:
         platforms: all
 
     - name: Build wheels
-      uses: pypa/[email protected]
+      if: steps.should-build-wheel.outputs.true
+      uses: pypa/[email protected]
+      with:
+        only: ${{ matrix.cibw-only }}
+      env:
+        CIBW_ENVIRONMENT: ${{ runner.os == 'Windows' && matrix.arch == 'x86' && 'CC=i686-w64-mingw32-gcc.exe' || '' }}
+
+    - uses: actions/upload-artifact@v4
+      if: steps.should-build-wheel.outputs.true
+      with:
+        name: dist-wheel-${{ matrix.cibw-only }}
+        path: ./wheelhouse/*.whl
+
+  build_wheels_macosx_arm64:
+    name: Build macOS arm64 wheels
+    runs-on: macos-14
+
+    steps:
+
+    - uses: actions/checkout@v4
+
+    - name: Use Python 3.11
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+
+    - name: Print build identifiers
+      run: |
+        python -m pip install cibuildwheel==2.23.3
+        CIBW_SKIP=cp38-macosx_arm64 python -m cibuildwheel --print-build-identifiers
+
+    - name: Build wheels
+      if: ${{ (github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')) }}
+      uses: pypa/[email protected]
       env:
-        CIBW_ARCHS: ${{ matrix.CIBW_ARCHS }}
-        CIBW_BUILD: ${{ matrix.CIBW_BUILD }}
-        CIBW_BEFORE_BUILD: "pip install cython==0.29.32 && cython {project}/jq.pyx"
-        CIBW_TEST_REQUIRES: "-r test-requirements.txt"
-        CIBW_TEST_COMMAND: "py.test {project}/tests"
+        CIBW_SKIP: cp38-macosx_arm64
 
-    - uses: actions/upload-artifact@v2
+    - name: Build wheels
+      if: ${{ !(github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')) }}
+      uses: pypa/[email protected]
+      with:
+        only: cp310-macosx_arm64
+
+    - uses: actions/upload-artifact@v4
       with:
+        name: dist-wheels-macos-arm64
         path: ./wheelhouse/*.whl
+
+  merge_dist_artifacts:
+    runs-on: ubuntu-latest
+    needs: [build_sdist, build_wheels, build_wheels_macosx_arm64]
+    steps:
+    - uses: actions/upload-artifact/merge@v4
+      with:
+        name: dist
+        pattern: dist-*

.gitignore

@@ -6,3 +6,4 @@
 /.tox
 /*.egg-info
 /_deps
+/deps/_build

CHANGELOG.rst

@@ -1,6 +1,84 @@
 Changelog
 =========
 
+1.9.1
+-----
+
+* Apply a patch to jq to fix musl builds.
+
+* Drop support for Python 3.7 and PyPy 3.8.
+
+1.9.0
+-----
+
+Note: this version was never released due a bug in jq breaking builds with musl.
+
+* Update to jq 1.8.0.
+
+* Drop support for Python 3.6.
+
+* Distribute Cython sources instead of C sources to improve compatibility.
+
+1.8.0
+-----
+
+* Drop support for Python 3.5.
+
+* Add support for Python 3.13.
+
+* Build Windows wheels.
+
+1.7.0
+-----
+
+* Update to jq 1.7.1.
+
+* Include tox.ini in sdist.
+
+* Use the version of oniguruma distributed with jq.
+
+1.6.0
+-----
+
+* Update to jq 1.7.
+
+* Add support for building with Cython 3.
+
+* Add support for building with the system libjq and libonig instead of building
+  using the bundled source.
+
+* Include tests in sdist.
+
+1.5.0
+-----
+
+* Add input_value, input_values and input_text methods as replacements for the
+  input method. The input method is still supported.
+
+* Add support for slurp when calling input_text.
+
+* Add support for Python 3.12.
+
+* Build macOS arm64 wheels.
+
+1.4.1
+-----
+
+* Improve handling of null bytes in program inputs and outputs.
+
+1.4.0
+-----
+
+* Update handling of non-finite numbers to match the behaviour jq 1.6.
+  Specifically, NaN is outputted as None, Inf is outputted as DBL_MAX,
+  and -Inf is outputted as DBL_MIN.
+
+1.3.0
+-----
+
+* The jq and oniguruma libraries that these Python bindings rely on are now
+  included in the source distribution, instead of being downloaded.
+
 1.2.3
 -----
 

MANIFEST.in

@@ -1,2 +1,8 @@
 include README.rst
 include LICENSE
+include deps/*.tar.gz
+include deps/jq-1.8.0-Makefile.patch
+recursive-include tests *.py
+include tox.ini
+include jq.pyx
+exclude *.c