Skip to content

Commit

Permalink
Remove the openssl dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
mihai-dinculescu committed Oct 18, 2024
1 parent 607b416 commit bb4439b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 34 deletions.
22 changes: 4 additions & 18 deletions .github/workflows/py-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter --manifest-path ./tapo-py/Cargo.toml --features openssl-vendored
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
args: --release --out dist --find-interpreter --manifest-path ./tapo-py/Cargo.toml
sccache: "true"
manylinux: auto
- name: Upload wheels
Expand Down Expand Up @@ -89,7 +75,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter --manifest-path ./tapo-py/Cargo.toml --features openssl-vendored
args: --release --out dist --find-interpreter --manifest-path ./tapo-py/Cargo.toml
sccache: "true"
manylinux: musllinux_1_2
- name: Upload wheels
Expand Down Expand Up @@ -117,7 +103,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter --manifest-path ./tapo-py/Cargo.toml --features openssl-vendored
args: --release --out dist --find-interpreter --manifest-path ./tapo-py/Cargo.toml
sccache: "true"
- name: Upload wheels
uses: actions/upload-artifact@v4
Expand All @@ -143,7 +129,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter --manifest-path ./tapo-py/Cargo.toml --features openssl-vendored
args: --release --out dist --find-interpreter --manifest-path ./tapo-py/Cargo.toml
sccache: "true"
- name: Upload wheels
uses: actions/upload-artifact@v4
Expand Down
12 changes: 0 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion tapo-py/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ doc = false

[features]
default = []
openssl-vendored = ["tapo/openssl-vendored"]

[dependencies]
anyhow = { workspace = true }
Expand Down
3 changes: 0 additions & 3 deletions tapo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ repository = "https://github.com/mihai-dinculescu/tapo"
[features]
default = []
python = ["dep:pyo3"]
openssl-vendored = ["openssl/vendored"]

[dependencies]
anyhow = { workspace = true }
Expand All @@ -38,8 +37,6 @@ aes = "0.8"
base16ct = { version = "0.2", features = ["alloc"] }
base64 = "0.22"
cbc = { version = "0.1", features = ["alloc"] }
openssl = "0.10"
openssl-src = "=300.2.3"
rand = "0.8"
rsa = "0.9"
sha1 = "0.10"
Expand Down

0 comments on commit bb4439b

Please sign in to comment.