Skip to content

Commit 024201c

Browse files
authored
rename ssl-vendor (#7989)
1 parent e675d69 commit 024201c

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
if: runner.os == 'Linux'
142142

143143
- name: Test vendored OpenSSL build
144-
run: cargo build --no-default-features --features ssl-vendor
144+
run: cargo build --no-default-features --features ssl-openssl-vendor
145145
if: runner.os == 'Linux'
146146

147147
# - name: Install tk-dev for tkinter build

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ssl-rustls = ["ssl", "rustpython-stdlib/ssl-rustls"]
2727
ssl-rustls-aws-lc = ["ssl-rustls", "dep:rustls", "rustls/aws_lc_rs"]
2828
ssl-rustls-aws-lc-fips = ["ssl-rustls-aws-lc", "rustls/fips"]
2929
ssl-openssl = ["ssl", "rustpython-stdlib/ssl-openssl"]
30-
ssl-vendor = ["ssl-openssl", "rustpython-stdlib/ssl-vendor"]
30+
ssl-openssl-vendor = ["ssl-openssl", "rustpython-stdlib/ssl-openssl-vendor"]
3131
tkinter = ["rustpython-stdlib/tkinter"]
3232

3333
[build-dependencies]

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $ python # now `python` is the alias of the RustPython for the new env
8080

8181
If you'd like to make https requests, you can enable the `ssl` feature, which
8282
also lets you install the `pip` package manager. Note that on Windows, you may
83-
need to install OpenSSL, or you can enable the `ssl-vendor` feature instead,
83+
need to install OpenSSL, or you can enable the `ssl-openssl-vendor` feature instead,
8484
which compiles OpenSSL for you but requires a C compiler, perl, and `make`.
8585
OpenSSL version 3 is expected and tested in CI. Older versions may not work.
8686

@@ -103,7 +103,7 @@ rustpython
103103
### SSL provider
104104

105105
For HTTPS requests, `ssl-rustls-aws-lc` is enabled by default for the RustPython binary. Embedders can use `rustpython-stdlib`'s provider-agnostic `ssl-rustls` feature and install their own rustls crypto provider, or replace rustls with `ssl-openssl` if their environment requires OpenSSL.
106-
Note that to use OpenSSL on Windows, you may need to install OpenSSL, or you can enable the `ssl-vendor` feature instead,
106+
Note that to use OpenSSL on Windows, you may need to install OpenSSL, or you can enable the `ssl-openssl-vendor` feature instead,
107107
which compiles OpenSSL for you but requires a C compiler, perl, and `make`.
108108
OpenSSL version 3 is expected and tested in CI. Older versions may not work.
109109

‎crates/stdlib/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ sqlite = ["dep:libsqlite3-sys"]
2020
ssl = ["host_env"]
2121
ssl-rustls = ["__ssl-rustls", "rustls/custom-provider"]
2222
ssl-openssl = ["ssl", "openssl", "openssl-sys", "foreign-types-shared", "openssl-probe"]
23-
ssl-vendor = ["ssl-openssl", "openssl/vendored"]
23+
ssl-openssl-vendor = ["ssl-openssl", "openssl/vendored"]
2424
tkinter = ["dep:tk-sys", "dep:tcl-sys", "dep:widestring"]
2525
flame-it = ["flame"]
2626

0 commit comments

Comments
 (0)