Skip to content

Commit

Permalink
V0.4.2: Replace openssl with rustls (#7)
Browse files Browse the repository at this point in the history
* Replace openssl with rustls

* Test using different manylinux version

* Test removing sccache

* Remove 32 bit linux
  • Loading branch information
Sh1nku authored Dec 15, 2023
1 parent 1973a4b commit c869446
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/python_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ on:
push:
tags:
- '*'
pull_request:
branches:
- master

permissions:
contents: read
Expand All @@ -18,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
target: [x86_64, aarch64, armv7, s390x, ppc64le]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
Expand All @@ -29,10 +32,10 @@ jobs:
with:
target: ${{ matrix.target }}
args: --release --out dist --find-interpreter --manifest-path ./wrappers/python/Cargo.toml
sccache: 'true'
manylinux: auto
manylinux: 2_28
- name: Upload wheels
uses: actions/upload-artifact@v3
if: "startsWith(github.ref, 'refs/tags/')"
with:
name: wheels
path: dist
Expand All @@ -55,6 +58,7 @@ jobs:
args: --release --out dist --find-interpreter --manifest-path ./wrappers/python/Cargo.toml
sccache: 'true'
- name: Upload wheels
if: "startsWith(github.ref, 'refs/tags/')"
uses: actions/upload-artifact@v3
with:
name: wheels
Expand All @@ -77,6 +81,7 @@ jobs:
args: --release --out dist --find-interpreter --manifest-path ./wrappers/python/Cargo.toml
sccache: 'true'
- name: Upload wheels
if: "startsWith(github.ref, 'refs/tags/')"
uses: actions/upload-artifact@v3
with:
name: wheels
Expand All @@ -92,6 +97,7 @@ jobs:
command: sdist
args: --out dist --manifest-path ./wrappers/python/Cargo.toml
- name: Upload sdist
if: "startsWith(github.ref, 'refs/tags/')"
uses: actions/upload-artifact@v3
with:
name: wheels
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# v0.4.2
* Switch out openssl for rustls
* Run publish CI when creating PRs

# v0.4.1
* Relax version requirements.
* Add Python 3.12 to CI
* Note: Not released to PyPi due to relying on openssl which could not run in manylinux

# v0.4.0
* Make authentication error into its own error, instead of Json decode error
Expand Down
4 changes: 2 additions & 2 deletions framework/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "solrstice"
description = "A Solr 8+ client"
version = "0.4.1"
version = "0.4.2"
edition = "2021"
license = "MIT OR Apache-2.0"
keywords = ["solr", "search"]
Expand All @@ -14,7 +14,7 @@ repository = "https://github.com/Sh1nku/solrstice"
[dependencies]
serde_json = { version = "1", features = ["raw_value"]}
serde = { version = "1", features = ["derive"]}
reqwest = { version = "0.11", features = ["serde_json", "json"]}
reqwest = { version = "0.11", default-features = false, features = ["serde_json", "json", "rustls-tls"]}
async-trait = "0.1"
thiserror = { version = "1", features = []}
zookeeper-async = "4.2"
Expand Down
8 changes: 3 additions & 5 deletions wrappers/python/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solrstice-py"
version = "0.4.1"
version = "0.4.2"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -15,7 +15,5 @@ pythonize = "0.20.0"
solrstice = { path = "../../framework", features = ["blocking"] }
serde = "1.0"
serde_json = "1.0"
reqwest = "0.11"
async-trait = "0.1"
# Needed for manylinux
openssl = {version = "0.10", features = ["vendored"]}
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"]}
async-trait = "0.1"

0 comments on commit c869446

Please sign in to comment.