chore: add py311, drop py36, update deps

Author: jstewmon

.github/workflows/ci.yml

@@ -1,24 +1,24 @@
 name: "Continuous Integration"
-on: [push]
+on: [ push ]
 
 jobs:
   test:
     name: "Test"
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ]
     runs-on: "${{ matrix.os }}"
     steps:
       # Check out the code
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v3"
 
       # We need node for some integration tests
-      - uses: "actions/setup-node@v1"
+      - uses: "actions/setup-node@v3"
 
       # Install python
       - name: "Set up python"
-        uses: "actions/setup-python@v2"
+        uses: "actions/setup-python@v4"
         with:
           python-version: "${{ matrix.python-version }}"
 
@@ -45,7 +45,7 @@ jobs:
       # Cache build dependencies
       - name: "Cache Build Fragments"
         id: "cache-build-fragments"
-        uses: "actions/cache@v2"
+        uses: "actions/cache@v3"
         with:
           path: |
             ~/.cargo/registry
@@ -62,16 +62,16 @@ jobs:
       # Cache `cargo install` built binaries
       - name: "Cache Built Binaries"
         id: "cache-binaries"
-        uses: "actions/cache@v2"
+        uses: "actions/cache@v3"
         with:
           path: "~/.cargo/bin"
           # In theory, this should rebuild binaries once a month
           key: "${{ runner.os }}-cargo-binaries-${{steps.get-date.outputs.date}}"
 
       - name: Install wasm-pack
-        uses: jetli/wasm-pack-action@v0.3.0
+        uses: jetli/wasm-pack-action@v0.4.0
         with:
-          version: "v0.10.1"
+          version: "v0.12.1"
 
       - name: "Run Tests"
         if: "${{ !contains(runner.os, 'windows') }}"
@@ -104,13 +104,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Check out the code
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v3"
 
       # Install python
       - name: "Set up python"
-        uses: "actions/setup-python@v2"
+        uses: "actions/setup-python@v4"
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: "Get Python Path"
         id: get-py-path
@@ -135,7 +135,7 @@ jobs:
       # Cache build dependencies
       - name: "Cache Build Fragments"
         id: "cache-build-fragments"
-        uses: "actions/cache@v2"
+        uses: "actions/cache@v3"
         with:
           path: |
             ~/.cargo/registry
@@ -148,24 +148,24 @@ jobs:
       # Cache `cargo install` built binaries
       - name: "Cache Built Binaries"
         id: "cache-binaries"
-        uses: "actions/cache@v2"
+        uses: "actions/cache@v3"
         with:
           path: "~/.cargo/bin"
           # In theory, this should rebuild binaries once a month
           key: "${{ runner.os }}-cargo-binaries-${{steps.get-date.outputs.date}}"
 
       - name: Install wasm-pack
-        uses: jetli/wasm-pack-action@v0.3.0
+        uses: jetli/wasm-pack-action@v0.4.0
         with:
-          version: "v0.10.1"
+          version: "v0.12.1"
 
       - name: "Build Rust/C Libraries"
         run: "make build"
 
       - name: "Check Rust target content"
         run: ls target/release
 
-      - uses: "actions/upload-artifact@v2"
+      - uses: "actions/upload-artifact@v3"
         name: "Upload Rust/C Libraries"
         with:
           path: target/release/libjsonlogic_rs.*
@@ -177,7 +177,7 @@ jobs:
           WINDOWS: "${{ contains(runner.os, 'windows') }}"
           PYTHON: ${{ steps.get-py-path.outputs.path }}
 
-      - uses: "actions/upload-artifact@v2"
+      - uses: "actions/upload-artifact@v3"
         name: "Upload Python sdist"
         with:
           path: dist/*.tar.gz
@@ -186,7 +186,7 @@ jobs:
       - name: "Build WASM Node Package"
         run: "make build-wasm"
 
-      - uses: "actions/upload-artifact@v2"
+      - uses: "actions/upload-artifact@v3"
         name: "Upload node package"
         with:
           path: js/
@@ -196,46 +196,41 @@ jobs:
     name: >
       Build Wheel
       (${{ matrix.platform.os }}, ${{ matrix.platform.name }}, ${{ matrix.py }})
-#    needs: test
+    #    needs: test
     runs-on: ${{ matrix.platform.os }}
     strategy:
       fail-fast: false
       matrix:
         platform:
-        - {os: ubuntu-latest, name: manylinux}
-        - {os: ubuntu-latest, name: musllinux}
-        - {os: macos-latest, name: macosx}
-        - {os: windows-latest, name: win}
+          - { os: ubuntu-latest, name: manylinux }
+          - { os: ubuntu-latest, name: musllinux }
+          - { os: macos-latest, name: macosx }
+          - { os: windows-latest, name: win }
         py:
-        - cp36
-        - cp37
-        - cp38
-        - cp39
-        - cp310
+          - cp37
+          - cp38
+          - cp39
+          - cp310
+          - cp311
 
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.10'
+      - uses: actions/checkout@v3
 
       - name: Set up QEMU
         if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.3.1
+        uses: pypa/cibuildwheel@v2.14.1
         env:
           # configure cibuildwheel to build native archs ('auto'), and some
           # emulated ones
           CIBW_ARCHS_LINUX: x86_64 aarch64
           # cross-compiling wheels for discrete architectures not working OOTB
           # see: https://github.com/PyO3/setuptools-rust/issues/206
-          CIBW_ARCHS_MACOS: x86_64 universal2
+          CIBW_ARCHS_MACOS: x86_64 universal2 arm64
           CIBW_ARCHS_WINDOWS: AMD64
           CIBW_BEFORE_ALL_LINUX: >
             curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
@@ -245,26 +240,25 @@ jobs:
           CIBW_BUILD: ${{ matrix.py }}-${{ matrix.platform.name }}_*
           CIBW_TEST_COMMAND: python {project}/tests/test_py.py
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: py-wheels
           path: ./wheelhouse/*.whl
 
   distribute:
     name: "Distribute Cargo, WASM, and Python Sdist Packages"
-    needs:
-      ["build", "build-wheels"]
+    needs: [ "build", "build-wheels" ]
     runs-on: ubuntu-latest
     if: "${{ github.ref == 'refs/heads/master' }}"
     steps:
       # Check out the code
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v3"
 
       # Install python
       - name: "Set up python"
-        uses: "actions/setup-python@v2"
+        uses: "actions/setup-python@v4"
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       # Generate the lockfile
       - name: "Generate Cargo Lockfile"
@@ -309,7 +303,7 @@ jobs:
         run: |
           echo "${{ steps.cargo-version.outputs.new }}" > tmp-new-cargo-ver
 
-      - uses: "actions/upload-artifact@v2"
+      - uses: "actions/upload-artifact@v3"
         with:
           path: "tmp-new-cargo-ver"
           name: "new-cargo"
@@ -377,7 +371,7 @@ jobs:
               owner: "${{ github.repository_owner }}",
               repo: "json-logic-rs",
               tag: "v${{ steps.get-version.outputs.version }}",
-              message: "Vesrion ${{ steps.get-version.outputs.version }}",
+              message: "Version ${{ steps.get-version.outputs.version }}",
               object: "${{ github.sha }}",
               type: "commit",
               tagger: {
@@ -388,21 +382,21 @@ jobs:
 
   distribute-py-wheels:
     name: "Distribute Python Wheels"
-    needs: ["distribute"]
+    needs: [ "distribute" ]
     if: "${{ github.ref == 'refs/heads/master' }}"
-#    needs: [build_wheels, build_sdist]
+    #    needs: [build_wheels, build_sdist]
     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')
+    #    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
     # alternatively, to publish when a GitHub Release is created, use the following rule:
     # if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: py-wheels
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@v1.4.2
+      - uses: pypa/gh-action-pypi-publish@v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}

Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT"
 name = "jsonlogic-rs"
 readme = "README.md"
 repository = "https://github.com/bestowinc/json-logic-rs"
-version = "0.2.3"
+version = "0.3.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -42,7 +42,7 @@ version = "~0.2.62"
 [dependencies.cpython]
 features = ["extension-module"]
 optional = true
-version = "0.5"
+version = "0.7"
 
 [dependencies.anyhow]
 optional = true

build-wheels.sh

@@ -13,13 +13,13 @@ export PATH=/root/.cargo/bin:$PATH
 
 mkdir -p build && rm -rf build/*
 
-for PYBIN in /opt/python/{cp36-cp36m,cp37-cp37m,cp38-cp38,cp39-cp39,cp310-cp310}/bin; do
+for PYBIN in /opt/python/{cp37-cp37m,cp38-cp38,cp39-cp39,cp310-cp310,cp311-cp311}/bin; do
 	export PYTHON_SYS_EXECUTABLE="$PYBIN/python"
 
 	"${PYBIN}/python" -m ensurepip
 	# Note: please change both here and in the makefile if specifying a particular
 	# version or removing the version pin.
-	"${PYBIN}/python" -m pip install -U setuptools wheel setuptools-rust==0.10.6
+	"${PYBIN}/python" -m pip install -U setuptools wheel setuptools-rust==1.6.0
 	"${PYBIN}/python" setup.py bdist_wheel
 done
 

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools", "wheel", "setuptools-rust>=1.1.2"]
+requires = ["setuptools", "wheel", "setuptools-rust>=1.2.0"]
 
 [tool.black]
 line-length = 80
-target-version = ['py36']
+target-version = ['py37']

setup.py

@@ -27,7 +27,7 @@ def get_version():
     out, err = tuple(map(bytes.decode, proc.communicate()))
     if proc.returncode != 0:
         raise RuntimeError(f"Could not get Cargo package info: {err}")
-    version = out.split(":")[-1]
+    version = out.split("@")[-1]
     return version.strip()
 
 
@@ -51,34 +51,20 @@ def get_version():
     classifiers=[
         # See https://pypi.python.org/pypi?%3Aaction=list_classifiers for all
         # available setup classifiers
-        # "Development Status :: 1 - Planning",
-        # 'Development Status :: 2 - Pre-Alpha',
-        # "Development Status :: 3 - Alpha",
-        # "Development Status :: 4 - Beta",
         'Development Status :: 5 - Production/Stable',
-        # 'Development Status :: 6 - Mature',
-        # 'Framework :: AsyncIO',
-        # 'Framework :: Flask',
-        # 'Framework :: Sphinx',
-        # 'Environment :: Web Environment',
         "Intended Audience :: Developers",
-        # 'Intended Audience :: End Users/Desktop',
-        # 'Intended Audience :: Science/Research',
-        # 'Intended Audience :: System Administrators',
-        # 'License :: Other/Proprietary License',
-        # 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         "License :: OSI Approved :: MIT License",
-        # "License :: OSI Approved :: Apache Software License",
         "Natural Language :: English",
         "Operating System :: POSIX :: Linux",
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Rust",
         # 'Programming Language :: Python :: Implementation :: PyPy',
     ],

src/js_op.rs

@@ -900,7 +900,7 @@ mod abstract_operations {
 
     #[test]
     fn test_to_string_number() {
-        assert_eq!(&to_string(&json!(1.0)), "1");
+        assert_eq!(&to_string(&json!(1.0)), "1.0");
         assert_eq!(&to_string(&json!(1)), "1");
     }
 

tests/data/tests.json

@@ -217,6 +217,10 @@
     [{"if":[true, "apple", true, "banana", false, "carrot", "date"]}, null, "apple"],
     [{"if":[true, "apple", true, "banana", true, "carrot", "date"]}, null, "apple"],
 
+    "Arrays with logic",
+    [[1, {"var": "x"}, 3], {"x": 2}, [1, 2, 3]],
+    [{"if": [{"var": "x"}, [{"var": "y"}], 99]}, {"x": true, "y": 42}, [42]],
+
     "# Compound Tests",
     [ {"and":[{">":[3,1]},true]}, {}, true ],
     [ {"and":[{">":[3,1]},false]}, {}, false ],