Compare commits
11 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1a3a50b8d3 | ||
|
|
5e1fd8e20d | ||
|
|
5e51185593 | ||
|
|
22e34bf150 | ||
|
|
8034f94f77 |
||
|
|
65da927d85 | ||
|
|
2fadd7bb9a | ||
|
|
adc63ac786 |
||
|
|
f06f4c2804 |
||
|
|
683f73c2b8 | ||
|
|
25b75b110c |
4 changed files with 30 additions and 49 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -69,3 +69,9 @@
|
||||||
/cryptography-43.0.0-vendor.tar.bz2
|
/cryptography-43.0.0-vendor.tar.bz2
|
||||||
/cryptography-44.0.0.tar.gz
|
/cryptography-44.0.0.tar.gz
|
||||||
/cryptography-44.0.0-vendor.tar.bz2
|
/cryptography-44.0.0-vendor.tar.bz2
|
||||||
|
/cryptography-45.0.2.tar.gz
|
||||||
|
/cryptography-45.0.2-vendor.tar.bz2
|
||||||
|
/cryptography-45.0.3.tar.gz
|
||||||
|
/cryptography-45.0.3-vendor.tar.bz2
|
||||||
|
/cryptography-45.0.4.tar.gz
|
||||||
|
/cryptography-45.0.4-vendor.tar.bz2
|
||||||
|
|
|
||||||
34
12091.patch
34
12091.patch
|
|
@ -1,34 +0,0 @@
|
||||||
From 68369a6dbae71a9314ac0ecc8b88c435600cb4e9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Johan Andersson <johan.andersson@lime.tech>
|
|
||||||
Date: Tue, 3 Dec 2024 00:43:31 +0100
|
|
||||||
Subject: [PATCH] build: remove cargo.toml files from wheels
|
|
||||||
|
|
||||||
---
|
|
||||||
pyproject.toml | 8 +++++---
|
|
||||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pyproject.toml b/pyproject.toml
|
|
||||||
index 4266e3bd5ba4..0378e78815e3 100644
|
|
||||||
--- a/pyproject.toml
|
|
||||||
+++ b/pyproject.toml
|
|
||||||
@@ -101,15 +101,17 @@ include = [
|
|
||||||
"src/_cffi_src/**/*.c",
|
|
||||||
"src/_cffi_src/**/*.h",
|
|
||||||
|
|
||||||
- "**/Cargo.toml",
|
|
||||||
- "**/Cargo.lock",
|
|
||||||
+ "Cargo.toml",
|
|
||||||
+ "Cargo.lock",
|
|
||||||
+ "src/rust/**/Cargo.toml",
|
|
||||||
+ "src/rust/**/Cargo.lock",
|
|
||||||
"src/rust/**/*.rs",
|
|
||||||
|
|
||||||
"tests/**/*.py",
|
|
||||||
]
|
|
||||||
exclude = [
|
|
||||||
"vectors/**/*",
|
|
||||||
- "src/rust/target/**/*",
|
|
||||||
+ "target/**/*",
|
|
||||||
"docs/_build/**/*",
|
|
||||||
".github/**/*",
|
|
||||||
".readthedocs.yml",
|
|
||||||
|
|
@ -5,24 +5,26 @@
|
||||||
%global srcname cryptography
|
%global srcname cryptography
|
||||||
|
|
||||||
Name: python-%{srcname}
|
Name: python-%{srcname}
|
||||||
Version: 44.0.0
|
Version: 45.0.4
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
Summary: PyCA's cryptography library
|
Summary: PyCA's cryptography library
|
||||||
|
|
||||||
# cryptography is dual licensed under the Apache-2.0 and BSD-3-Clause,
|
# cryptography is dual licensed under the Apache-2.0 and BSD-3-Clause,
|
||||||
# as well as the Python Software Foundation license for the OS random
|
# as well as the Python Software Foundation license for the OS random
|
||||||
# engine derived by CPython.
|
# engine derived by CPython.
|
||||||
License: (Apache-2.0 OR BSD-3-Clause) AND PSF-2.0
|
# Rust crate dependency licenses:
|
||||||
|
# Apache-2.0
|
||||||
|
# Apache-2.0 OR MIT
|
||||||
|
# BSD-3-Clause
|
||||||
|
# MIT
|
||||||
|
# MIT OR Apache-2.0
|
||||||
|
License: (Apache-2.0 OR BSD-3-Clause) AND PSF-2.0 AND Apache-2.0 AND BSD-3-Clause AND MIT AND (MIT OR Apache-2.0)
|
||||||
URL: https://cryptography.io/en/latest/
|
URL: https://cryptography.io/en/latest/
|
||||||
Source0: https://github.com/pyca/cryptography/archive/%{version}/%{srcname}-%{version}.tar.gz
|
Source0: https://github.com/pyca/cryptography/archive/%{version}/%{srcname}-%{version}.tar.gz
|
||||||
# created by ./vendor_rust.py helper script
|
# created by ./vendor_rust.py helper script
|
||||||
Source1: cryptography-%{version}-vendor.tar.bz2
|
Source1: cryptography-%{version}-vendor.tar.bz2
|
||||||
Source2: conftest-skipper.py
|
Source2: conftest-skipper.py
|
||||||
|
|
||||||
# Merged for 45.0.0+
|
|
||||||
# https://github.com/pyca/cryptography/pull/12091
|
|
||||||
Patch: 12091.patch
|
|
||||||
|
|
||||||
ExclusiveArch: %{rust_arches}
|
ExclusiveArch: %{rust_arches}
|
||||||
|
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
|
|
@ -47,7 +49,6 @@ BuildRequires: python%{python3_pkgversion}-iso8601
|
||||||
BuildRequires: python%{python3_pkgversion}-pretend
|
BuildRequires: python%{python3_pkgversion}-pretend
|
||||||
BuildRequires: python%{python3_pkgversion}-pytest-benchmark
|
BuildRequires: python%{python3_pkgversion}-pytest-benchmark
|
||||||
BuildRequires: python%{python3_pkgversion}-pytest-xdist
|
BuildRequires: python%{python3_pkgversion}-pytest-xdist
|
||||||
BuildRequires: python%{python3_pkgversion}-pytz
|
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: python%{python3_pkgversion}-pytest >= 6.2.0
|
BuildRequires: python%{python3_pkgversion}-pytest >= 6.2.0
|
||||||
%endif
|
%endif
|
||||||
|
|
@ -71,13 +72,13 @@ cryptography is a package designed to expose cryptographic primitives and
|
||||||
recipes to Python developers.
|
recipes to Python developers.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n %{srcname}-%{version}
|
%autosetup -p1 %{!?fedora:-a1} -n %{srcname}-%{version}
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%cargo_prep
|
%cargo_prep
|
||||||
sed -i 's/locked = true//g' pyproject.toml
|
sed -i 's/locked = true//g' pyproject.toml
|
||||||
%else
|
%else
|
||||||
# RHEL: use vendored Rust crates
|
# RHEL: use vendored Rust crates
|
||||||
%cargo_prep -V 1
|
%cargo_prep -v vendor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if ! 0%{?fedora}
|
%if ! 0%{?fedora}
|
||||||
|
|
@ -89,9 +90,7 @@ sed -i 's,--benchmark-disable,,' pyproject.toml
|
||||||
%pyproject_buildrequires
|
%pyproject_buildrequires
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
# Fedora: use RPMified crates
|
# Fedora: use RPMified crates
|
||||||
cd src/rust
|
|
||||||
%cargo_generate_buildrequires
|
%cargo_generate_buildrequires
|
||||||
cd ../..
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -101,6 +100,12 @@ export OPENSSL_NO_VENDOR=1
|
||||||
export CFLAGS="${CFLAGS} -DOPENSSL_NO_ENGINE=1 "
|
export CFLAGS="${CFLAGS} -DOPENSSL_NO_ENGINE=1 "
|
||||||
%pyproject_wheel
|
%pyproject_wheel
|
||||||
|
|
||||||
|
%cargo_license_summary
|
||||||
|
%{cargo_license} > LICENSE.dependencies
|
||||||
|
%if ! 0%{?fedora}
|
||||||
|
%cargo_vendor_manifest
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# Actually other *.c and *.h are appropriate
|
# Actually other *.c and *.h are appropriate
|
||||||
|
|
@ -114,8 +119,8 @@ find . -name Cargo.toml -print -delete
|
||||||
%check
|
%check
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
# skip benchmark, hypothesis, and pytz tests on RHEL
|
# skip benchmark and hypothesis tests on RHEL
|
||||||
rm -rf tests/bench tests/hypothesis tests/x509
|
rm -rf tests/bench tests/hypothesis
|
||||||
# append skipper to skip iso8601 and pretend tests
|
# append skipper to skip iso8601 and pretend tests
|
||||||
cat < %{SOURCE2} >> tests/conftest.py
|
cat < %{SOURCE2} >> tests/conftest.py
|
||||||
%endif
|
%endif
|
||||||
|
|
@ -139,6 +144,10 @@ PYTHONPATH=${PWD}/vectors:%{buildroot}%{python3_sitearch} \
|
||||||
%files -n python%{python3_pkgversion}-%{srcname} -f %{pyproject_files}
|
%files -n python%{python3_pkgversion}-%{srcname} -f %{pyproject_files}
|
||||||
%doc README.rst docs
|
%doc README.rst docs
|
||||||
%license LICENSE LICENSE.APACHE LICENSE.BSD
|
%license LICENSE LICENSE.APACHE LICENSE.BSD
|
||||||
|
%license LICENSE.dependencies
|
||||||
|
%if ! 0%{?fedora}
|
||||||
|
%license cargo-vendor.txt
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|
|
||||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (cryptography-44.0.0.tar.gz) = 6a0320ef3ece42e5b501d5381f719e01cb20b2971f0334a8a37f7b9a941482399901500f59817bffb1da579673e7785741a3016f51ac3bbf9bec55ff5df611ad
|
SHA512 (cryptography-45.0.4.tar.gz) = 08b35f414d81f83ee242f5d208f8aabc12dc53f1a0cbffc5be1ed7f9173e9c9863225a7eb5cff4e9f3dacf5e9fcb3e8701e33c441e1562ee13f9e3927fafb3df
|
||||||
SHA512 (cryptography-44.0.0-vendor.tar.bz2) = 53b52a5aac5de01ac878e5fb477e890b093e6886d8a0b210801402900000560d7a3b8a85414b81f0ff22aadf6f7bbd94ccace70666709197b97424207942af2b
|
SHA512 (cryptography-45.0.4-vendor.tar.bz2) = 5ff616412e65bd342d2b98110d0b058aaa1719ddf0d1a1164b49451b8f5bc49def81cf4913b6b4c2917f28a33cef28a74ad4391b303c2e36752b81f491a4da06
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue