1.5.0

1.5.0

Author: Danielle Thomas

.github/workflows/build.yml

@@ -24,12 +24,13 @@ on:
 jobs:
   reusable-build:
     if: ${{ inputs.if }}
-    name: stable - ${{ inputs.target }} - node@18
+    name: stable - ${{ inputs.target }} - [email protected]
     runs-on: ${{ inputs.host }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
       - name: Cache cargo
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry/index/
@@ -38,7 +39,8 @@ jobs:
             .cargo-cache
             target/
           key: ${{ inputs.target }}-cargo-${{ inputs.host }}
-      - uses: goto-bus-stop/setup-zig@v2
+      - name: Install zig
+        uses: goto-bus-stop/setup-zig@v2
         if: ${{ inputs.target == 'armv7-unknown-linux-gnueabihf' }}
         with:
           version: 0.10.0
@@ -106,7 +108,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ inputs.target }}
-          args: --release -i python3.9 -m Cargo.toml
+          args: --release -i python3.13 -m Cargo.toml
           docker-options: |
             --mount type=bind,source=/usr/local/lib/android/sdk/ndk/25.2.9519653,target=/usr/local/lib/android/sdk/ndk/25.2.9519653
             -e CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=/usr/local/lib/android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang
@@ -120,7 +122,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ inputs.target }}
-          args: --release -i python3.9 -m Cargo.toml
+          args: --release -i python3.13 -m Cargo.toml
           docker-options: |
             --mount type=bind,source=/usr/local/lib/android/sdk/ndk/25.2.9519653,target=/usr/local/lib/android/sdk/ndk/25.2.9519653
             -e CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=/usr/local/lib/android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang
@@ -131,25 +133,25 @@ jobs:
             -e ANDROID_NDK=/usr/local/lib/android/sdk/ndk/25.2.9519653
       - name: Setup x86 Python
         if: ${{ inputs.target == 'i686-pc-windows-msvc' }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.9"
+          python-version: "3.13"
           architecture: "x86"
-      - name: Build
+      - name: Build (non-docker &&non-android)
         if: ${{ inputs.publish != 'true' && !inputs.docker && !contains(inputs.target,'android') }}
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ inputs.target }}
-          args: --release -i python3.9 -m Cargo.toml
-      - name: Publish
+          args: --release -i python3.13 -m Cargo.toml
+      - name: Publish (non-docker && non-android)
         if: ${{ inputs.publish == 'true' && !inputs.docker && !contains(inputs.target,'android') }}
         uses: PyO3/maturin-action@v1
         with:
           command: publish
           target: ${{ inputs.target }}
-          args: --no-sdist -i python3.9 -m Cargo.toml -u __token__ -p ${{ secrets.MATURIN_PASSWORD }}
+          args: --no-sdist -i python3.13 -m Cargo.toml -u __token__ -p ${{ secrets.MATURIN_PASSWORD }}
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-${{ inputs.target }}
           path: target/wheels/*.whl

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ env:
 'on':
   push:
     branches:
-      - main
+      - '**'
     tags-ignore:
       - '**'
     paths-ignore:
@@ -21,7 +21,7 @@ jobs:
     name: Udeps
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: jrobsonchase/[email protected]
       - uses: ./.github/workflows/rust-cache
       - uses: actions-rs/cargo@v1
@@ -32,7 +32,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: jrobsonchase/[email protected]
       - uses: actions-rs/cargo@v1
         with:
@@ -42,7 +42,7 @@ jobs:
     name: Clippy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: jrobsonchase/[email protected]
       - uses: ./.github/workflows/rust-cache
       - uses: actions-rs/cargo@v1
@@ -53,7 +53,7 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: jrobsonchase/[email protected]
       - uses: ./.github/workflows/rust-cache
       - name: Run Tests
@@ -64,7 +64,7 @@ jobs:
     name: Decide on Publishing
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Decide
         id: decide
         run: |
@@ -94,7 +94,7 @@ jobs:
     with:
       docker: ${{ matrix.settings.docker }}
       host: ${{ matrix.settings.host }}
-      if: ${{ matrix.settings.if }}
+      if: ${{ matrix.settings.if || 'true' }}
       publish: ${{ needs.decide.outputs.publish || 'false' }}
       setup: ${{ matrix.settings.setup }}
       target: ${{ matrix.settings.target }}
@@ -104,54 +104,38 @@ jobs:
         settings:
           - host: macos-latest
             target: x86_64-apple-darwin
-            if: ${{ github.ref == 'refs/heads/main' }}
           - host: windows-latest
             target: x86_64-pc-windows-msvc
-            if: true
           - host: windows-latest
-            if: ${{ github.ref == 'refs/heads/main' }}
             target: i686-pc-windows-msvc
           - host: ubuntu-latest
-            if: true
             target: x86_64-unknown-linux-gnu
           - host: ubuntu-latest
-            if: true
             target: x86_64-unknown-linux-musl
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
           - host: macos-latest
-            if: true
             target: aarch64-apple-darwin
           - host: macos-latest
-            if: ${{ github.ref == 'refs/heads/main' }}
             target: universal2-apple-darwin
           - host: ubuntu-latest
-            if: true
             target: aarch64-unknown-linux-gnu
             docker: ghcr.io/rust-cross/manylinux2014-cross:aarch64
           - host: ubuntu-latest
-            if: ${{ github.ref == 'refs/heads/main' }}
             target: armv7-unknown-linux-gnueabihf
             setup: |
               sudo apt-get update
               sudo apt-get install gcc-arm-linux-gnueabihf -y
           - host: ubuntu-latest
-            # need to build python against the android ndk
-            if: false
             target: aarch64-linux-android
           - host: ubuntu-latest
+            target: armv7-linux-androideabi
             # need to build python against the android ndk
             if: false
-            target: armv7-linux-androideabi
           - host: ubuntu-latest
-            if: ${{ github.ref == 'refs/heads/main' }}
             target: aarch64-unknown-linux-musl
           - host: windows-latest
             target: aarch64-pc-windows-msvc
-            # target not supported by the 'ring' rust dependency (ssl library partially built by gcc)
-            # https://github.com/briansmith/ring/issues/1167
-            if: false
   build-freebsd:
-    if: github.ref == 'refs/heads/main'
     needs: decide
     runs-on: ubuntu-22.04
     name: Build FreeBSD
@@ -160,7 +144,7 @@ jobs:
     steps:
       - name: Run lscpu
         run: lscpu
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build
         id: build
         uses: vmactions/freebsd-vm@v1
@@ -175,7 +159,7 @@ jobs:
           usesh: true
           mem: 3000
           prepare: |
-            pkg install -y -f curl libnghttp2 python3 yarn
+            pkg install -y -f curl libnghttp2 python3 yarn cmake llvm
             alias curl="curl --retry 5 --retry-all-errors"
             curl https://sh.rustup.rs -sSf --output rustup.sh
             sh rustup.sh -y --profile minimal --default-toolchain beta
@@ -207,7 +191,7 @@ jobs:
             # make the rsync back faster
             rm -rf .env/ target/debug/ target/release/
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-freebsd
           path: target/wheels/*.whl
@@ -220,7 +204,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Tag Release
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: jrobsonchase/[email protected]
       - name: Tag
         run: |

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.5.0:
+- Adds `pooling_enabled` to listener builders, allowing the endpoint to pool with other endpoints with the same host/port/binding
+
 ## 1.4.0:
 
 - Rename `policy` to `traffic_policy` in Listener builders and `ngrok.forward`

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "ngrok-python"
-version = "1.4.0"
+version = "1.5.0"
 description = "The ngrok Agent SDK for Python"
 
 [lib]
@@ -16,22 +16,22 @@ lazy_static = "1.4.0"
 log = "0.4"
 # pin mio until all dependencies are also on windows-sys 0.48
 # https://github.com/microsoft/windows-rs/issues/2410#issuecomment-1490802715
-mio = { version = "=0.8.6" }
-ngrok = { version = "=0.14.0-pre.14" }
+mio = { version = "1.0.3" }
+ngrok = { version = "0.15.0" }
 pyo3 = { version = "0.18.1", features = ["abi3", "abi3-py37", "extension-module", "multiple-pymethods"]}
 pyo3-asyncio = { version = "0.18.0", features = ["attributes", "tokio-runtime"] }
 pyo3-log = { version = "0.8.1" }
 parking_lot = "0.12.1"
 regex = "1.9.5"
-rustls = "0.22.2"
+rustls = "0.23.25"
 rustls-pemfile = "2.0.0"
 tokio = { version = "1.23.0", features = ["sync"] }
 tracing = { version = "0.1.37", features = ["log", "log-always"] }
 url = "2.4.0"
 
 [build-dependencies]
-prost-build = "0.11.3"
-pyo3-build-config = "0.17.3"
+prost-build = "0.13.5"
+pyo3-build-config = "0.24.1"
 
 [profile.release]
 lto = true