Merge pull request #296931 from fabaff/azure-keyvault-keys-bump

python312Packages.azure-keyvault-keys: 4.8.0 -> 4.9.0
This commit is contained in:
Fabian Affolter 2024-04-16 22:11:58 +02:00 committed by GitHub
commit f7e20b2e09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 200 additions and 196 deletions

View File

@ -1,45 +1,41 @@
{ lib {
, buildPythonPackage lib,
, pythonOlder azure-common,
, fetchPypi azure-core,
, aiohttp buildPythonPackage,
, azure-common cryptography,
, azure-core fetchPypi,
, cryptography isodate,
, msrest pythonOlder,
, pytestCheckHook setuptools,
typing-extensions,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-keyvault-keys"; pname = "azure-keyvault-keys";
version = "4.8.0"; version = "4.9.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; hash = "sha256-CGMtzW7OKGVyBOmiVq1kNp/isOOF7UM0n5MvAH2J93Q=";
hash = "sha256-bAuy94MgKjSj5ex0hm5iEuWRrHEk8DuWadGwm2giS8Q=";
}; };
propagatedBuildInputs = [ build-system = [ setuptools ];
dependencies = [
azure-common azure-common
azure-core azure-core
msrest
cryptography cryptography
isodate
typing-extensions
]; ];
nativeCheckInputs = [ pythonNamespaces = [ "azure.keyvault" ];
aiohttp
pytestCheckHook
];
pythonNamespaces = [ # Tests require relative paths to utilities in the mono-repo
"azure.keyvault"
];
# requires relative paths to utilities in the mono-repo
doCheck = false; doCheck = false;
pythonImportsCheck = [ pythonImportsCheck = [
@ -52,7 +48,8 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Microsoft Azure Key Vault Keys Client Library for Python"; description = "Microsoft Azure Key Vault Keys Client Library for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-keys";
changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-keys_${version}/sdk/keyvault/azure-keyvault-keys";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ jonringer ]; maintainers = with maintainers; [ jonringer ];
}; };

View File

@ -1,21 +1,22 @@
{ buildPythonPackage {
, fetchFromGitHub buildPythonPackage,
, lib fetchFromGitHub,
, pythonOlder lib,
, poetry-core pythonOlder,
, grpclib poetry-core,
, python-dateutil grpclib,
, black python-dateutil,
, jinja2 black,
, isort jinja2,
, python isort,
, pydantic python,
, pytestCheckHook pydantic,
, pytest-asyncio pytestCheckHook,
, pytest-mock pytest-asyncio,
, typing-extensions pytest-mock,
, tomlkit typing-extensions,
, grpcio-tools tomlkit,
grpcio-tools,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -32,11 +33,9 @@ buildPythonPackage rec {
hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI="; hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI=";
}; };
nativeBuildInputs = [ build-system = [ poetry-core ];
poetry-core
];
propagatedBuildInputs = [ dependencies = [
grpclib grpclib
python-dateutil python-dateutil
typing-extensions typing-extensions
@ -57,9 +56,7 @@ buildPythonPackage rec {
tomlkit tomlkit
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
pythonImportsCheck = [ pythonImportsCheck = [ "betterproto" ];
"betterproto"
];
# The tests require the generation of code before execution. This requires # The tests require the generation of code before execution. This requires
# the protoc-gen-python_betterproto script from the package to be on PATH. # the protoc-gen-python_betterproto script from the package to be on PATH.
@ -76,6 +73,8 @@ buildPythonPackage rec {
disabledTests = [ disabledTests = [
"test_pydantic_no_value" "test_pydantic_no_value"
# Test is flaky
"test_binary_compatibility"
]; ];
meta = with lib; { meta = with lib; {

View File

@ -1,22 +1,45 @@
{ lib, fetchPypi, buildPythonPackage, pythonAtLeast }: {
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
pythonOlder,
setuptools,
versioneer,
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "ed25519"; pname = "ed25519";
version = "1.5"; version = "1.5";
format = "setuptools"; pyproject = true;
# last commit in 2019, various compat issues with 3.12 disabled = pythonOlder "3.7";
disabled = pythonAtLeast "3.12";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "warner";
sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182"; repo = "python-ed25519";
rev = "refs/tags/${version}";
hash = "sha256-AwnhB5UGycQliNndbqd0JlI4vKSehCSy0qHv2EiB+jA=";
}; };
postPatch = ''
rm versioneer.py
'';
build-system = [
setuptools
versioneer
];
pythonImportsCheck = [
"ed25519"
];
meta = with lib; { meta = with lib; {
description = "Ed25519 public-key signatures"; description = "Ed25519 public-key signatures";
mainProgram = "edsig"; mainProgram = "edsig";
homepage = "https://github.com/warner/python-ed25519"; homepage = "https://github.com/warner/python-ed25519";
changelog = "https://github.com/warner/python-ed25519/blob/${version}/NEWS";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ np ]; maintainers = with maintainers; [ np ];
}; };

View File

@ -1,33 +1,36 @@
{ buildPythonPackage {
, fetchFromGitHub lib,
, lib async-timeout,
, pythonOlder buildPythonPackage,
, h2 certifi,
, multidict faker,
, pytestCheckHook fetchFromGitHub,
, pytest-asyncio googleapis-common-protos,
, async-timeout h2,
, faker multidict,
, googleapis-common-protos pytest-asyncio,
, certifi pytestCheckHook,
pythonOlder,
setuptools,
}: }:
let
buildPythonPackage rec {
pname = "grpclib"; pname = "grpclib";
version = "0.4.4"; version = "0.4.7";
format = "setuptools"; pyproject = true;
in
buildPythonPackage {
inherit pname version;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vmagamedov"; owner = "vmagamedov";
repo = pname; repo = "grpclib";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-bCLyBfsNdIGdpz9l/r2iYIQ5TitKmsctekeOthIkXhw="; hash = "sha256-5221hVjD0TynCsTdruiUZkTsb7uOi49tZ8M/YqdWreE=";
}; };
propagatedBuildInputs = [ build-system = [ setuptools ];
dependencies = [
h2 h2
multidict multidict
]; ];
@ -46,6 +49,7 @@ buildPythonPackage {
meta = with lib; { meta = with lib; {
description = "Pure-Python gRPC implementation for asyncio"; description = "Pure-Python gRPC implementation for asyncio";
homepage = "https://github.com/vmagamedov/grpclib"; homepage = "https://github.com/vmagamedov/grpclib";
changelog = "https://github.com/vmagamedov/grpclib/blob/v${version}/docs/changelog/index.rst";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ nikstur ]; maintainers = with maintainers; [ nikstur ];
}; };

View File

@ -1,15 +1,16 @@
{ lib {
, stdenv lib,
, aiohttp stdenv,
, buildPythonPackage aiohttp,
, ed25519 buildPythonPackage,
, fetchFromGitHub ed25519,
, nats-server fetchFromGitHub,
, nkeys nats-server,
, pytestCheckHook nkeys,
, pythonOlder pytestCheckHook,
, setuptools pythonOlder,
, uvloop setuptools,
uvloop,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -26,21 +27,13 @@ buildPythonPackage rec {
hash = "sha256-5lvdt1JbOmdts0CYU00bSmv0LsMQsOe//yUgyevBULE="; hash = "sha256-5lvdt1JbOmdts0CYU00bSmv0LsMQsOe//yUgyevBULE=";
}; };
nativeBuildInputs = [ build-system = [ setuptools ];
setuptools
];
propagatedBuildInputs = [ dependencies = [ ed25519 ];
ed25519
];
passthru.optional-dependencies = { passthru.optional-dependencies = {
aiohttp = [ aiohttp = [ aiohttp ];
aiohttp nkeys = [ nkeys ];
];
nkeys = [
nkeys
];
# fast_parse = [ # fast_parse = [
# fast-mail-parser # fast-mail-parser
# ]; # ];
@ -52,20 +45,24 @@ buildPythonPackage rec {
uvloop uvloop
]; ];
disabledTests = [ disabledTests =
# AssertionError: assert 5 == 0 [
"test_pull_subscribe_limits" # AssertionError: assert 5 == 0
"test_fetch_n" "test_pull_subscribe_limits"
"test_subscribe_no_echo" "test_fetch_n"
"test_stream_management" "test_subscribe_no_echo"
] ++ lib.optionals stdenv.isDarwin [ "test_stream_management"
"test_subscribe_iterate_next_msg" # Tests fail on hydra, often Time-out
"test_buf_size_force_flush_timeout" "test_subscribe_iterate_next_msg"
]; "test_ordered_consumer_larger_streams"
"test_object_file_basics"
]
++ lib.optionals stdenv.isDarwin [
"test_subscribe_iterate_next_msg"
"test_buf_size_force_flush_timeout"
];
pythonImportsCheck = [ pythonImportsCheck = [ "nats" ];
"nats"
];
meta = with lib; { meta = with lib; {
description = "Python client for NATS.io"; description = "Python client for NATS.io";

View File

@ -1,19 +1,20 @@
{ lib {
, asn1crypto lib,
, azure-identity asn1crypto,
, azure-keyvault-keys azure-identity,
, boto3 azure-keyvault-keys,
, botocore boto3,
, buildPythonPackage botocore,
, cryptography buildPythonPackage,
, ed25519 cryptography,
, fetchFromGitHub ed25519,
, google-cloud-kms fetchFromGitHub,
, hatchling google-cloud-kms,
, pynacl hatchling,
, pyspx pynacl,
, pytestCheckHook pyspx,
, pythonOlder pytestCheckHook,
pythonOlder,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -32,17 +33,13 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace "hatchling==1.18.0" "hatchling" --replace-fail "hatchling==1.18.0" "hatchling"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [ hatchling ];
hatchling
];
passthru.optional-dependencies = { passthru.optional-dependencies = {
PySPX = [ PySPX = [ pyspx ];
pyspx
];
awskms = [ awskms = [
boto3 boto3
botocore botocore
@ -53,9 +50,7 @@ buildPythonPackage rec {
azure-keyvault-keys azure-keyvault-keys
cryptography cryptography
]; ];
crypto = [ crypto = [ cryptography ];
cryptography
];
gcpkms = [ gcpkms = [
cryptography cryptography
google-cloud-kms google-cloud-kms
@ -63,11 +58,9 @@ buildPythonPackage rec {
hsm = [ hsm = [
asn1crypto asn1crypto
cryptography cryptography
# pykcs11 # pykcs11
];
pynacl = [
pynacl
]; ];
pynacl = [ pynacl ];
# Circular dependency # Circular dependency
# sigstore = [ # sigstore = [
# sigstore # sigstore
@ -79,9 +72,7 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
pythonImportsCheck = [ pythonImportsCheck = [ "securesystemslib" ];
"securesystemslib"
];
disabledTestPaths = [ disabledTestPaths = [
# pykcs11 is not available # pykcs11 is not available
@ -98,4 +89,3 @@ buildPythonPackage rec {
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
}; };
} }

View File

@ -1,14 +1,15 @@
{ lib {
, pythonOlder lib,
, pydantic buildPythonPackage,
, flit-core fetchFromGitHub,
, fetchFromGitHub flit-core,
, buildPythonPackage pydantic,
pythonOlder,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "sigstore-rekor-types"; pname = "sigstore-rekor-types";
version = "0.0.12"; version = "0.0.11";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,16 +18,12 @@ buildPythonPackage rec {
owner = "trailofbits"; owner = "trailofbits";
repo = "sigstore-rekor-types"; repo = "sigstore-rekor-types";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-B6u2YbtZtgjYJoWL2DfgP7LL20onNaaTTFbC6JIA4bE="; hash = "sha256-oOFdRiDp9USc3A+aaPExprEO2i/RERNahiyi2kVpkns=";
}; };
nativeBuildInputs = [ build-system = [ flit-core ];
flit-core
];
propagatedBuildInputs = [ dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email;
pydantic
] ++ pydantic.optional-dependencies.email;
# Module has no tests # Module has no tests
doCheck = false; doCheck = false;

View File

@ -1,28 +1,29 @@
{ lib {
, appdirs lib,
, buildPythonPackage appdirs,
, cryptography buildPythonPackage,
, fetchFromGitHub cryptography,
, flit-core fetchFromGitHub,
, id flit-core,
, importlib-resources id,
, pretend importlib-resources,
, pydantic pretend,
, pyjwt pydantic,
, pyopenssl pyjwt,
, pytestCheckHook pyopenssl,
, requests pytestCheckHook,
, rich pythonOlder,
, securesystemslib requests,
, sigstore-protobuf-specs rich,
, sigstore-rekor-types securesystemslib,
, tuf sigstore-protobuf-specs,
, pythonOlder sigstore-rekor-types,
tuf,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "sigstore-python"; pname = "sigstore-python";
version = "2.1.0"; version = "2.1.5";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -31,14 +32,12 @@ buildPythonPackage rec {
owner = "sigstore"; owner = "sigstore";
repo = "sigstore-python"; repo = "sigstore-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-WH6Pme8ZbfW5xqBT056eVJ3HZP1D/lAULtyN6k0uMaA="; hash = "sha256-lqmrM4r1yPVCcvWNC9CKYMyryuIyliI2Y+TAYgAwA1Y=";
}; };
nativeBuildInputs = [ build-system = [ flit-core ];
flit-core
];
propagatedBuildInputs = [ dependencies = [
appdirs appdirs
cryptography cryptography
id id
@ -63,9 +62,7 @@ buildPythonPackage rec {
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
''; '';
pythonImportsCheck = [ pythonImportsCheck = [ "sigstore" ];
"sigstore"
];
disabledTests = [ disabledTests = [
# Tests require network access # Tests require network access
@ -82,10 +79,10 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "A codesigning tool for Python packages"; description = "A codesigning tool for Python packages";
mainProgram = "sigstore";
homepage = "https://github.com/sigstore/sigstore-python"; homepage = "https://github.com/sigstore/sigstore-python";
changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md"; changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
mainProgram = "sigstore";
}; };
} }