Skip to content

Commit 98cdbe3

Browse files
authored
python313Packages.pluginbase: modernize, conan: 2.16.1 -> 2.21.0 (NixOS#449836)
2 parents ad79f6e + 4aed86d commit 98cdbe3

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

pkgs/by-name/co/conan/package.nix

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
{
22
lib,
33
stdenv,
4+
cmake,
45
fetchFromGitHub,
56
git,
67
pkg-config,
7-
xcbuild,
88
python3Packages,
9+
xcbuild,
910
zlib,
10-
cmake,
1111
}:
1212

1313
python3Packages.buildPythonApplication rec {
1414
pname = "conan";
15-
version = "2.16.1";
15+
version = "2.21.0";
1616
pyproject = true;
1717

1818
src = fetchFromGitHub {
1919
owner = "conan-io";
2020
repo = "conan";
2121
tag = version;
22-
hash = "sha256-b+GVFy195wwQyWaiEMg1vVcWnkTB01IbQQsOHhQY6pY=";
22+
hash = "sha256-D76K7s6zUy3hMOwkKXbsF4asrr7tGwC28MW5VaJvFBY=";
2323
};
2424

25+
pythonRelaxDeps = [
26+
"distro"
27+
"urllib3"
28+
];
29+
2530
build-system = with python3Packages; [ setuptools ];
2631

2732
dependencies =
@@ -49,24 +54,19 @@ python3Packages.buildPythonApplication rec {
4954
pyopenssl
5055
];
5156

52-
pythonRelaxDeps = [
53-
"urllib3"
54-
"distro"
55-
];
56-
5757
nativeCheckInputs = [
5858
git
5959
pkg-config
6060
zlib
6161
]
6262
++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ]
6363
++ (with python3Packages; [
64+
cmake
6465
mock
6566
parameterized
6667
pytest-xdist
6768
pytestCheckHook
6869
webtest
69-
cmake
7070
]);
7171

7272
dontUseCmakeConfigure = true;
@@ -82,8 +82,10 @@ python3Packages.buildPythonApplication rec {
8282
"test_shared_windows_find_libraries"
8383
# 'cmake' tool version 'Any' is not available
8484
"test_build"
85+
"test_conan_new_compiles"
8586
# 'cmake' tool version '3.27' is not available
8687
"test_metabuild"
88+
"test_new_template_and_different_folder"
8789
]
8890
++ lib.optionals stdenv.hostPlatform.isDarwin [
8991
# Rejects paths containing nix
@@ -115,15 +117,14 @@ python3Packages.buildPythonApplication rec {
115117
"test/functional/util/test_cmd_args_to_string.py"
116118
"test/performance/test_large_graph.py"
117119
"test/unittests/tools/env/test_env_files.py"
118-
"test/integration/ui/exit_with_code_test.py"
119120
];
120121

121122
meta = {
122123
description = "Decentralized and portable C/C++ package manager";
123-
mainProgram = "conan";
124124
homepage = "https://conan.io";
125125
changelog = "https://github.com/conan-io/conan/releases/tag/${src.tag}";
126126
license = lib.licenses.mit;
127127
maintainers = with lib.maintainers; [ HaoZeke ];
128+
mainProgram = "conan";
128129
};
129130
}

pkgs/development/python-modules/pluginbase/default.nix

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,31 @@
22
lib,
33
fetchPypi,
44
buildPythonPackage,
5-
pytest,
5+
setuptools,
66
}:
77

88
buildPythonPackage rec {
9-
version = "1.0.1";
10-
format = "setuptools";
119
pname = "pluginbase";
10+
version = "1.0.1";
11+
pyproject = true;
1212

1313
src = fetchPypi {
1414
inherit pname version;
15-
sha256 = "ff6c33a98fce232e9c73841d787a643de574937069f0d18147028d70d7dee287";
15+
hash = "sha256-/2wzqY/OIy6cc4QdeHpkPeV0k3Bp8NGBRwKNcNfe4oc=";
1616
};
1717

18-
nativeCheckInputs = [ pytest ];
18+
build-system = [ setuptools ];
19+
20+
# https://github.com/mitsuhiko/pluginbase/issues/24
21+
doCheck = false;
1922

20-
checkPhase = ''
21-
cd tests
22-
PYTHONPATH=.. pytest
23-
'';
23+
pythonImportsCheck = [ "pluginbase" ];
2424

25-
meta = with lib; {
25+
meta = {
26+
description = "Support library for building plugins systems in Python";
2627
homepage = "https://github.com/mitsuhiko/pluginbase";
27-
description = "Support library for building plugins sytems in Python";
28-
license = licenses.bsd3;
29-
platforms = platforms.all;
28+
changelog = "https://github.com/mitsuhiko/pluginbase/releases/tag/${version}";
29+
license = lib.licenses.bsd3;
30+
maintainers = [ ];
3031
};
3132
}

0 commit comments

Comments
 (0)