Skip to content

update minor dependency versions #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
houqp merged 2 commits into from
Jan 1, 2025
Merged

update minor dependency versions #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dde6056
update minor dependency versions
houqp Jan 1, 2025
b4a8efd
update maturin to 1.x & fix release pipeline
houqp Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/columnq_cli_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@ jobs:
toolchain: ${{ env.RUST_TC_VER }}
target: aarch64-apple-darwin,x86_64-apple-darwin
- name: Install maturin
run: pip3 install 'maturin<0.12'
run: pip3 install 'maturin<2'
- name: Build wheels - x86_64
run: |
maturin build -m columnq-cli/Cargo.toml -b bin --target x86_64-apple-darwin --release --out dist --cargo-extra-args="--features=database-sqlite"
maturin build -m columnq-cli/Cargo.toml -b bin --target x86_64-apple-darwin --release --out dist --features=database-sqlite
- name: Build wheels - universal2
env:
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
MACOSX_DEPLOYMENT_TARGET: '10.9'
run: |
# set SDKROOT for C dependencies
export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
maturin build -m columnq-cli/Cargo.toml -b bin --release --universal2 --out dist --no-sdist --cargo-extra-args="--features=database-sqlite"
maturin build -m columnq-cli/Cargo.toml -b bin --release --target universal2-apple-darwin --out dist --features=database-sqlite
pip install columnq-cli --no-index --find-links dist --force-reinstall
columnq --help
- name: Upload wheels
Expand Down Expand Up @@ -99,10 +99,10 @@ jobs:
toolchain: ${{ env.RUST_TC_VER }}
target: ${{ matrix.platform.target }}
- name: Install maturin
run: pip3 install 'maturin<0.12'
run: pip3 install 'maturin<2'
- name: Build wheels
run: |
maturin build -m columnq-cli/Cargo.toml -b bin --release --out dist --no-sdist --target ${{ matrix.platform.target }} --cargo-extra-args="--features=${{ matrix.platform.features }}"
maturin build -m columnq-cli/Cargo.toml -b bin --release --out dist --target ${{ matrix.platform.target }} --features=${{ matrix.platform.features }}
pip install columnq-cli --no-index --find-links dist --force-reinstall
columnq --help
- name: Upload wheels
Expand Down Expand Up @@ -193,11 +193,11 @@ jobs:
apt-get install -y libssl-dev
- name: Build Wheels
run: |
sudo python3 -m pip install 'maturin<0.12'
sudo python3 -m pip install 'maturin<2'
export RUSTFLAGS='${{ matrix.platform.rustflags }}'
maturin build -m columnq-cli/Cargo.toml -b bin --no-sdist --release -o dist \
maturin build -m columnq-cli/Cargo.toml -b bin --release -o dist \
--target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }} \
--cargo-extra-args="--no-default-features --features=${{ matrix.platform.features }}"
--no-default-features --features=${{ matrix.platform.features }}
- name: Upload wheels
uses: actions/upload-artifact@v4
if: "matrix.platform.upload == 'true'"
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/roapi_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
jobs:
validate-release-tag:
name: Validate git tag
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
if: "startsWith(github.ref, 'refs/tags/')"
Expand Down Expand Up @@ -48,18 +48,18 @@ jobs:
toolchain: ${{ env.RUST_TC_VER }}
target: aarch64-apple-darwin,x86_64-apple-darwin
- name: Install maturin
run: pip3 install 'maturin<0.12'
run: pip3 install 'maturin<2'
- name: Build wheels - x86_64
run: |
maturin build -m roapi/Cargo.toml -b bin --target x86_64-apple-darwin --release --out dist --cargo-extra-args="--features=database-sqlite"
maturin build -m roapi/Cargo.toml -b bin --target x86_64-apple-darwin --release --out dist --features=database-sqlite
- name: Build wheels - universal2
env:
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
MACOSX_DEPLOYMENT_TARGET: '10.9'
run: |
# set SDKROOT for C dependencies
export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
maturin build -m roapi/Cargo.toml -b bin --release --universal2 --out dist --no-sdist --cargo-extra-args="--features=database-sqlite"
maturin build -m roapi/Cargo.toml -b bin --release --target universal2-apple-darwin --out dist --features=database-sqlite
pip install roapi --no-index --find-links dist --force-reinstall
- name: Upload wheels
uses: actions/upload-artifact@v4
Expand All @@ -86,7 +86,6 @@ jobs:
matrix:
platform: [
{ python-architecture: "x64", target: "x86_64-pc-windows-msvc", features: "database-sqlite" },
# { python-architecture: "x86", target: "i686-pc-windows-msvc", features: "" },
]
steps:
- uses: actions/checkout@v4
Expand All @@ -100,10 +99,10 @@ jobs:
toolchain: ${{ env.RUST_TC_VER }}
target: ${{ matrix.platform.target }}
- name: Install maturin
run: pip3 install 'maturin<0.12'
run: pip3 install 'maturin<2'
- name: Build wheels
run: |
maturin build -m roapi/Cargo.toml -b bin --release --out dist --no-sdist --target ${{ matrix.platform.target }} --cargo-extra-args="--features=${{ matrix.platform.features }}"
maturin build -m roapi/Cargo.toml -b bin --release --out dist --target ${{ matrix.platform.target }} --features=${{ matrix.platform.features }}
pip install roapi --no-index --find-links dist --force-reinstall
roapi --help
- name: Upload wheels
Expand Down Expand Up @@ -195,11 +194,11 @@ jobs:
apt-get install -y libssl-dev
- name: Build Wheels
run: |
sudo python3 -m pip install 'maturin<0.12'
sudo python3 -m pip install 'maturin<2'
export RUSTFLAGS='${{ matrix.platform.rustflags }}'
maturin build -m roapi/Cargo.toml -b bin --no-sdist --release -o dist \
maturin build -m roapi/Cargo.toml -b bin --release -o dist \
--target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }} \
--cargo-extra-args="--no-default-features --features=${{ matrix.platform.features }}"
--no-default-features --features=${{ matrix.platform.features }}
- name: Upload wheels
uses: actions/upload-artifact@v4
if: "matrix.platform.upload == 'true'"
Expand Down
Loading
Loading