Skip to content

Commit

Permalink
chore: expunge openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
gadomski committed Jan 2, 2025
1 parent 91aedfc commit 7245233
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 21 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/python-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,6 @@ jobs:
args: --release --out dist --find-interpreter --manifest-path crates/cli/Cargo.toml
sccache: "true"
manylinux: auto
# https://github.com/Intreecom/scyllapy/blob/05fdab32dd7468c26533de5fdfe9627fa3e38445/.github/workflows/release.yaml#L37-L50
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
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ log = "0.4.22"
mime = "0.3.17"
mockito = "1.5"
object_store = "0.11.0"
openssl = { version = "0.10.68", features = ["vendored"] }
openssl-src = "=300.4.1" # joinked from https://github.com/iopsystems/rpc-perf/commit/705b290d2105af6f33150da04b217422c6d68701#diff-2e9d962a08321605940b5a657135052fbcef87b5e360662bb527c96d9a615542R41 to cross-compile Python
parquet = { version = "53.1.0", default-features = false }
pgstac = { version = "0.2.2", path = "crates/pgstac" }
pyo3 = "0.23.3"
Expand Down
2 changes: 0 additions & 2 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ duckdb = { workspace = true, optional = true, features = [
"bundled",
] } # We have this dependency only to allow us to bundle it
object_store.workspace = true
openssl.workspace = true # same as duckdb, these openssls are just for bundling
openssl-src.workspace = true
pyo3 = { workspace = true, optional = true }
reqwest.workspace = true
serde.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions crates/cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ pub type Result<T> = std::result::Result<T, Error>;

#[cfg(feature = "duckdb")]
use duckdb as _;
use openssl as _;
use openssl_src as _;
use tracing_subscriber as _;

#[cfg(test)]
Expand Down

0 comments on commit 7245233

Please sign in to comment.