Merge branch 'main' into prerelease

sfu-db · Feb 14, 2025 · e42beab · e42beab
2 parents 5fedd5f + f63424f
commit e42beab
Show file tree

Hide file tree

Showing 63 changed files with 2,465 additions and 4,686 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -64,33 +64,6 @@ jobs:
         env:
           SQLITE3_STATIC: 1
 
-      - name: Copy j4rs dependencies into dist
-        run: |
-          cp -rf connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
-
-      # rebuild the wheel to incorporate j4rs dependencies
-      - uses: PyO3/maturin-action@v1
-        with:
-          rust-toolchain: stable
-          command: build
-          args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
-          before-script-linux: |
-            # If we're running on rhel centos, install needed packages.
-            if command -v yum &> /dev/null; then
-                yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic
-
-                # If we're running on i686 we need to symlink libatomic
-                # in order to build openssl with -latomic flag.
-                if [[ ! -d "/usr/lib64" ]]; then
-                    ln -s /usr/lib/libatomic.so.1 /usr/lib/libatomic.so
-                fi
-            else
-                # If we're running on debian-based system.
-                apt update -y && apt-get install -y libssl-dev openssl pkg-config
-            fi
-        env:
-          SQLITE3_STATIC: 1
-
       - uses: actions/upload-artifact@v4
         with:
           name: "ubuntu-latest-${{ matrix.python-version[1] }}"
@@ -139,19 +112,6 @@ jobs:
   #       env:
   #         SQLITE3_STATIC: 1
 
-  #     - name: Copy j4rs dependencies into dist
-  #       run: |
-  #         cp -rf connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
-
-  #     # rebuild the wheel to incorporate j4rs dependencies
-  #     - uses: PyO3/maturin-action@v1
-  #       with:
-  #         rust-toolchain: 1.71.1
-  #         command: build
-  #         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
-
   #     - uses: actions/upload-artifact@v3
   #       with:
   #         name: "aarch-${{ matrix.python-version[1] }}"
@@ -203,20 +163,6 @@ jobs:
         env:
           SQLITE3_STATIC: 1
 
-      - name: Copy j4rs dependencies into dist
-        run: |
-          cp -r connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
-
-      # rebuild the wheel to incorporate j4rs dependencies
-      - uses: PyO3/maturin-action@v1
-        with:
-          rust-toolchain: stable
-          maturin-version: v0.14.15
-          command: build
-          args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
-        env:
-          SQLITE3_STATIC: 1
-
       - uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.os }}-${{ matrix.python-version }}"
@@ -264,20 +210,6 @@ jobs:
         env:
           SQLITE3_STATIC: 1
 
-      - name: Copy j4rs dependencies into dist
-        run: |
-          cp -rf connectorx-python/target/aarch64-apple-darwin/release/jassets connectorx-python/connectorx/dependencies
-
-      # rebuild the wheel to incorporate j4rs dependencies
-      - uses: PyO3/maturin-action@v1
-        with:
-          rust-toolchain: stable
-          maturin-version: v0.14.15
-          command: build
-          args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release  --features integrated-auth-gssapi
-        env:
-          SQLITE3_STATIC: 1
-
       - uses: actions/upload-artifact@v4
         with:
           name: "macos-arm-${{ matrix.python-version }}"