Skip to content

Commit 0db165d

Browse files
authored
fix: vendor openssl (#4)
1 parent 2778886 commit 0db165d

File tree

5 files changed

+52
-25
lines changed

5 files changed

+52
-25
lines changed

.github/workflows/pypi.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
permissions:
1010
contents: read
1111

12+
concurrency:
13+
group: wheels
14+
cancel-in-progress: true
15+
1216
jobs:
1317
linux:
1418
runs-on: ${{ matrix.platform.runner }}
@@ -19,12 +23,8 @@ jobs:
1923
target: x86_64
2024
- runner: ubuntu-latest
2125
target: x86
22-
- runner: ubuntu-latest
23-
target: aarch64
2426
- runner: ubuntu-latest
2527
target: armv7
26-
- runner: ubuntu-latest
27-
target: s390x
2828
- runner: ubuntu-latest
2929
target: ppc64le
3030
steps:
@@ -39,6 +39,21 @@ jobs:
3939
args: --release --out dist --find-interpreter
4040
sccache: "true"
4141
manylinux: auto
42+
# https://github.com/Intreecom/scyllapy/blob/05fdab32dd7468c26533de5fdfe9627fa3e38445/.github/workflows/release.yaml#L37-L50
43+
before-script-linux: |
44+
# If we're running on rhel centos, install needed packages.
45+
if command -v yum &> /dev/null; then
46+
yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic
47+
48+
# If we're running on i686 we need to symlink libatomic
49+
# in order to build openssl with -latomic flag.
50+
if [[ ! -d "/usr/lib64" ]]; then
51+
ln -s /usr/lib/libatomic.so.1 /usr/lib/libatomic.so
52+
fi
53+
else
54+
# If we're running on debian-based system.
55+
apt update -y && apt-get install -y libssl-dev openssl pkg-config
56+
fi
4257
- name: Upload wheels
4358
uses: actions/upload-artifact@v4
4459
with:
@@ -109,7 +124,7 @@ jobs:
109124
strategy:
110125
matrix:
111126
platform:
112-
- runner: macos-12
127+
- runner: macos-13
113128
target: x86_64
114129
- runner: macos-14
115130
target: aarch64

Cargo.lock

Lines changed: 29 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "python"
2+
name = "stacrs"
33
version = "0.3.0"
44
edition = "2021"
55
publish = false
@@ -26,3 +26,4 @@ tokio = { version = "1.41.1", features = ["rt"] }
2626
# We don't use duckdb directly, but we need to pin the version to v1.0 for now: https://github.com/stac-utils/stac-rs/issues/385
2727
duckdb = { version = "=1.0.0", features = ["bundled"] }
2828
libduckdb-sys = "=1.0.0"
29+
openssl = { version = "0.10.68", features = ["vendored"] }

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ classifiers = [
1313
"Programming Language :: Python :: 3.10",
1414
"Programming Language :: Python :: 3.11",
1515
"Programming Language :: Python :: 3.12",
16-
"Programming Language :: Python :: 3.13",
1716
"Programming Language :: Python :: Implementation :: CPython",
1817
"Programming Language :: Python :: Implementation :: PyPy",
1918
"Programming Language :: Rust",

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ mod write;
1010
use duckdb as _;
1111
use error::Error;
1212
use libduckdb_sys as _;
13+
use openssl as _;
1314
use pyo3::prelude::*;
1415

1516
type Result<T> = std::result::Result<T, Error>;

0 commit comments

Comments
 (0)