Merge pull request #472 from kotval/libgssapi

Libgssapi
sfu-db · Apr 7, 2023 · b94f7d6 · b94f7d6
2 parents d70b27f + b75f689
commit b94f7d6
Show file tree

Hide file tree

Showing 9 changed files with 156 additions and 38 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Install tools
         run: |
           apt-get update
-          apt-get install -y curl postgresql-client build-essential python3-dev python3-pip pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev
+          apt-get install -y curl postgresql-client build-essential python3-dev python3-pip pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev libkrb5-dev libclang-dev
         env:
           DEBIAN_FRONTEND: noninteractive
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Install tools
         run: |
           apt-get update
-          apt-get install -y curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client python3 python3-pip libicu66
+          apt-get install -y curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client python3 python3-pip libicu66 libkrb5-dev libclang-dev
           pip3 install mssql-cli
           pip3 install cli-helpers==2.2.0
           ln -s /usr/bin/python3 /usr/bin/python
@@ -181,7 +181,7 @@ jobs:
       - name: Install tools
         run: |
           apt-get update
-          apt-get install -y curl postgresql-client build-essential python3-dev python3-pip pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev python3 python3-pip libicu66
+          apt-get install -y curl postgresql-client build-essential python3-dev python3-pip pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev python3 python3-pip libicu66 libkrb5-dev libclang-dev
           pip3 install mssql-cli
           pip3 install cli-helpers==2.2.0
           ln -s /usr/bin/python3 /usr/bin/python

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   linux:
     runs-on: ubuntu-latest
-    container: quay.io/pypa/manylinux2014_x86_64
+    container: quay.io/pypa/manylinux_2_28_x86_64
     strategy:
       matrix:
         python-version: [[38, "3.8"], [39, "3.9"], [310, "3.10"], [311, "3.11"]]
@@ -18,11 +18,7 @@ jobs:
 
       - name: Set python version
         run: |
-          if [[ "${{ matrix.python-version[0] }}" == "37" ]]; then
-            echo "/opt/python/cp37-cp37m/bin" >> $GITHUB_PATH
-          else
-            echo "/opt/python/cp${{ matrix.python-version[0] }}-cp${{ matrix.python-version[0] }}/bin" >> $GITHUB_PATH
-          fi
+          echo "/opt/python/cp${{ matrix.python-version[0] }}-cp${{ matrix.python-version[0] }}/bin" >> $GITHUB_PATH
 
       - uses: actions-rs/toolchain@v1
         with:
@@ -39,18 +35,19 @@ jobs:
 
       - name: Install tools
         run: |
-          yum install -y mysql-devel postgresql-devel freetds-devel
+          yum install -y epel-release
+          yum install -y mysql-devel postgresql-devel freetds-devel krb5-libs clang-devel
 
       - name: Setup project
         run: |
           just bootstrap-python
 
-      - uses: messense/maturin-action@v1
+      - uses: PyO3/maturin-action@v1
         with:
           rust-toolchain: 1.65.0
-          maturin-version: v0.12.1
+          maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml -i python --no-sdist --release --manylinux 2014
+          args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 
@@ -59,20 +56,20 @@ jobs:
           cp -rf connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
 
       # rebuild the wheel to incorporate j4rs dependencies
-      - uses: messense/maturin-action@v1
+      - uses: PyO3/maturin-action@v1
         with:
           rust-toolchain: 1.65.0
-          maturin-version: v0.12.1
+          maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml -i python --no-sdist --release --manylinux 2014
+          args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 
-      # - uses: messense/maturin-action@v1
+      # - uses: PyO3/maturin-action@v1
       #   with:
-      #     maturin-version: v0.12.1
+      #     maturin-version: v0.14.15
       #     command: build
-      #     args: -m connectorx-python/Cargo.toml --target aarch64-unknown-linux-gnu -i python --no-sdist --release --manylinux 2014
+      #     args: -m connectorx-python/Cargo.toml --target aarch64-unknown-linux-gnu -i python --release --manylinux 2_28 --features integrated-auth-gssapi
       #   env:
       #     SQLITE3_STATIC: 1
 
@@ -87,6 +84,9 @@ jobs:
       matrix:
         os: ["windows-latest", "macos-10.15"]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
+        include:
+          - os: "macos-10.15"
+            features: "--features integrated-auth-gssapi"
     steps:
       - uses: actions/checkout@v2
 
@@ -115,12 +115,12 @@ jobs:
         run: |
           just bootstrap-python
 
-      - uses: messense/maturin-action@v1
+      - uses: PyO3/maturin-action@v1
         with:
           rust-toolchain: 1.65.0
-          maturin-version: v0.12.1
+          maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml -i python --no-sdist --release
+          args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
         env:
           SQLITE3_STATIC: 1
 
@@ -129,12 +129,12 @@ jobs:
           cp -r connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
 
       # rebuild the wheel to incorporate j4rs dependencies
-      - uses: messense/maturin-action@v1
+      - uses: PyO3/maturin-action@v1
         with:
           rust-toolchain: 1.65.0
-          maturin-version: v0.12.1
+          maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml -i python --no-sdist --release
+          args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
         env:
           SQLITE3_STATIC: 1
 
@@ -176,12 +176,12 @@ jobs:
         run: |
           just bootstrap-python
 
-      - uses: messense/maturin-action@v1
+      - uses: PyO3/maturin-action@v1
         with:
           rust-toolchain: 1.65.0
-          maturin-version: v0.12.1
+          maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --no-sdist --release
+          args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release  --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 
@@ -190,12 +190,12 @@ jobs:
           cp -rf connectorx-python/target/aarch64-apple-darwin/release/jassets connectorx-python/connectorx/dependencies
 
       # rebuild the wheel to incorporate j4rs dependencies
-      - uses: messense/maturin-action@v1
+      - uses: PyO3/maturin-action@v1
         with:
           rust-toolchain: 1.65.0
-          maturin-version: v0.12.1
+          maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --no-sdist --release
+          args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release  --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 

diff --git a/Cargo.lock b/Cargo.lock