Skip to content
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
18 changes: 15 additions & 3 deletions pkgs/development/python-modules/aiogithubapi/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,26 @@
buildPythonPackage rec {
pname = "aiogithubapi";
version = "23.11.0";
format = "pyproject";
pyproject = true;

disabled = pythonOlder "3.8";

src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
repo = "aiogithubapi";
rev = "refs/tags/${version}";
hash = "sha256-SbpfHKD4QJuCe3QG0GTvsffkuFiGPLEUXOVW9f1gyTI=";
};

__darwinAllowLocalNetworking = true;

postPatch = ''
# Upstream is releasing with the help of a CI to PyPI, GitHub releases
# are not in their focus
substituteInPlace pyproject.toml \
--replace 'version = "0"' 'version = "${version}"' \
--replace 'backoff = "^1.10.0"' 'backoff = "*"'
--replace 'backoff = "^1.10.0"' 'backoff = "*"' \
--replace 'sigstore = "<2"' 'sigstore = "*"'
'';

nativeBuildInputs = [
Expand All @@ -55,10 +58,19 @@ buildPythonPackage rec {
"--asyncio-mode=auto"
];

preCheck = ''
export HOME=$(mktemp -d)
'';

pythonImportsCheck = [
"aiogithubapi"
];

disabledTests = [
# sigstore.errors.TUFError: Failed to refresh TUF metadata
"test_sigstore"
];

meta = with lib; {
description = "Python client for the GitHub API";
homepage = "https://github.com/ludeeus/aiogithubapi";
Expand Down
37 changes: 27 additions & 10 deletions pkgs/development/python-modules/betterproto/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,33 @@
, pytestCheckHook
, pytest-asyncio
, pytest-mock
, typing-extensions
, tomlkit
, grpcio-tools
}:

buildPythonPackage rec {
pname = "betterproto";
version = "2.0.0b6";
format = "pyproject";
disabled = pythonOlder "3.7";
pyproject = true;

disabled = pythonOlder "3.9";

src = fetchFromGitHub {
owner = "danielgtaylor";
repo = "python-betterproto";
rev = "v.${version}";
rev = "refs/tags/v.${version}";
hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI=";
};

nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [
poetry-core
];

propagatedBuildInputs = [
grpclib
python-dateutil
typing-extensions
];

passthru.optional-dependencies.compiler = [
Expand All @@ -43,16 +48,18 @@ buildPythonPackage rec {
isort
];

pythonImportsCheck = [ "betterproto" ];

nativeCheckInputs = [
grpcio-tools
pydantic
pytestCheckHook
pytest-asyncio
pytest-mock
pytestCheckHook
tomlkit
grpcio-tools
] ++ passthru.optional-dependencies.compiler;
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);

pythonImportsCheck = [
"betterproto"
];

# The tests require the generation of code before execution. This requires
# the protoc-gen-python_betterproto script from the package to be on PATH.
Expand All @@ -62,14 +69,24 @@ buildPythonPackage rec {
${python.interpreter} -m tests.generate
'';

disabledTestPaths = [
# https://github.com/danielgtaylor/python-betterproto/issues/530
"tests/inputs/oneof/test_oneof.py"
];

disabledTests = [
"test_pydantic_no_value"
];

meta = with lib; {
description = "Clean, modern, Python 3.6+ code generator & library for Protobuf 3 and async gRPC";
description = "Code generator & library for Protobuf 3 and async gRPC";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the upstream description. Not sure why we would want to change that.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "marketing part" or "how upstream thinks the project looks like" usually doesn't really add a lot of value to the description. If the library is modern and clean then we would not need to disable tests 😉

Sure, this change is highly opinionated.

longDescription = ''
This project aims to provide an improved experience when using Protobuf /
gRPC in a modern Python environment by making use of modern language
features and generating readable, understandable, idiomatic Python code.
'';
homepage = "https://github.com/danielgtaylor/python-betterproto";
changelog = "https://github.com/danielgtaylor/python-betterproto/blob/v.${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ nikstur ];
};
Expand Down
38 changes: 27 additions & 11 deletions pkgs/development/python-modules/sigstore/default.nix
Original file line number Diff line number Diff line change
@@ -1,38 +1,36 @@
{ lib
, appdirs
, buildPythonPackage
, cryptography
, fetchFromGitHub

# build-system
, flit-core

# dependencies
, appdirs
, cryptography
, id
, importlib-resources
, pretend
, pydantic
, pyjwt
, pyopenssl
, pytestCheckHook
, requests
, rich
, securesystemslib
, sigstore-protobuf-specs
, sigstore-rekor-types
, tuf

# tests
, pytestCheckHook
, pythonOlder
}:

buildPythonPackage rec {
pname = "sigstore-python";
version = "2.1.0";
pyproject = true;

disabled = pythonOlder "3.8";

src = fetchFromGitHub {
owner = "sigstore";
repo = "sigstore-python";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-WH6Pme8ZbfW5xqBT056eVJ3HZP1D/lAULtyN6k0uMaA=";
};

Expand All @@ -57,17 +55,35 @@ buildPythonPackage rec {
];

nativeCheckInputs = [
pretend
pytestCheckHook
];

preCheck = ''
export HOME=$(mktemp -d)
'';

pythonImportsCheck = [
"sigstore"
];

disabledTests = [
# Tests require network access
"test_fail_init_url"
"test_get_identity_token_bad_code"
"test_identity_proof_claim_lookup"
"test_init_url"
"test_production"
"test_sct_verify_keyring"
"test_sign_rekor_entry_consistent"
"test_verification_materials_retrieves_rekor_entry"
"test_verifier"
];

meta = with lib; {
description = "A codesigning tool for Python packages";
homepage = "https://github.com/sigstore/sigstore-python";
changelog = "https://github.com/sigstore/sigstore-python/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
Expand Down