Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update MSRV 1.48.0 -> 1.56.0 #8587

Merged
merged 2 commits into from
Mar 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,8 @@ jobs:
PYTHON:
- {VERSION: "3.11", TOXENV: "py311"}
RUST:
# Cover MSRV (and likely next MSRV). In-dev versions are below in
# the linux-rust-coverage section. Once our MSRV is 1.60 we can
# remove this section entirely.
- 1.48.0
# 1.49.0 is the MSRV for parking_lot 0.12
# 1.51 - const generics (for rust-asn1)
# 1.56 - new versions of once_cell and bumpalo
# Cover MSRV. 1.60+ and beta/nightly are in the linux-rust-coverage section.
- 1.56.0
# Potential future MSRVs
# 1.60 - new version of cxx
name: "${{ matrix.PYTHON.TOXENV }} with Rust ${{ matrix.RUST }}"
timeout-minutes: 15
steps:
Expand Down Expand Up @@ -260,6 +252,8 @@ jobs:
PYTHON:
- {VERSION: "3.11", TOXENV: "py311"}
RUST:
# 1.60 - new version of cxx
- 1.60.0
- beta
- nightly
name: "Rust Coverage"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Changelog
* **BACKWARDS INCOMPATIBLE:** Support for OpenSSL less than 1.1.1d has been
removed. Users on older version of OpenSSL will need to upgrade.
* **BACKWARDS INCOMPATIBLE:** Support for Python 3.6 has been removed.
* Updated the minimum supported Rust version (MSRV) to 1.56.0, from 1.48.0.

.. _v40-0-0:

Expand Down
4 changes: 2 additions & 2 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Fedora/RHEL/CentOS
.. warning::

For RHEL and CentOS you must be on version 8.3 or newer for the command
below to install a sufficiently new Rust. If your Rust is less than 1.48.0
below to install a sufficiently new Rust. If your Rust is less than 1.56.0
please see the :ref:`Rust installation instructions <installation:Rust>`
for information about installing a newer Rust.

Expand Down Expand Up @@ -315,7 +315,7 @@ Rust
a Rust toolchain.

Building ``cryptography`` requires having a working Rust toolchain. The current
minimum supported Rust version is 1.48.0. **This is newer than the Rust some
minimum supported Rust version is 1.56.0. **This is newer than the Rust some
package managers ship**, so users may need to install with the
instructions below.

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
if platform.python_implementation() == "PyPy"
else ["pyo3/abi3-py36"]
),
rust_version=">=1.48.0",
rust_version=">=1.56.0",
)
],
)
Expand Down
8 changes: 4 additions & 4 deletions src/rust/Cargo.lock

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

2 changes: 1 addition & 1 deletion src/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["The cryptography developers <cryptography-dev@python.org>"]
edition = "2018"
publish = false
# This specifies the MSRV
rust-version = "1.48.0"
rust-version = "1.56.0"

[dependencies]
once_cell = "1"
Expand Down