Skip to content

Commit 0e6166e

Browse files
committed
python312Packages.softlayer: fix on darwin
1 parent 47755f0 commit 0e6166e

File tree

1 file changed

+31
-18
lines changed

1 file changed

+31
-18
lines changed

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

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,52 @@
11
{
22
lib,
3+
stdenv,
34
buildPythonPackage,
4-
click,
55
fetchFromGitHub,
6-
mock,
6+
7+
# build-system
8+
setuptools,
9+
10+
# dependencies
11+
click,
712
prettytable,
813
prompt-toolkit,
914
ptable,
1015
pygments,
11-
pytestCheckHook,
12-
pythonOlder,
1316
requests,
1417
rich,
18+
urllib3,
19+
20+
# tests
21+
mock,
22+
pytestCheckHook,
1523
sphinx,
1624
testtools,
1725
tkinter,
18-
urllib3,
1926
zeep,
2027
}:
2128

2229
buildPythonPackage rec {
2330
pname = "softlayer";
2431
version = "6.2.5";
25-
format = "setuptools";
26-
27-
disabled = pythonOlder "3.7";
32+
pyproject = true;
2833

2934
src = fetchFromGitHub {
30-
owner = pname;
35+
owner = "softlayer";
3136
repo = "softlayer-python";
32-
rev = "refs/tags/v${version}";
37+
tag = "v${version}";
3338
hash = "sha256-wDLMVonPUexoaZ60kRBILmr5l46yajzACozCp6uETGY=";
3439
};
3540

36-
postPatch = ''
37-
substituteInPlace setup.py \
38-
--replace "rich ==" "rich >="
39-
'';
41+
build-system = [
42+
setuptools
43+
];
4044

41-
propagatedBuildInputs = [
45+
pythonRelaxDeps = [
46+
"rich"
47+
];
48+
49+
dependencies = [
4250
click
4351
prettytable
4452
prompt-toolkit
@@ -66,18 +74,23 @@ buildPythonPackage rec {
6674
export HOME=$(mktemp -d)
6775
'';
6876

77+
pytestFlagsArray = lib.optionals stdenv.hostPlatform.isDarwin [
78+
# SoftLayer.exceptions.TransportError: TransportError(0): ('Connection aborted.', ConnectionResetError(54, 'Connection reset by peer'))
79+
"--deselect=tests/CLI/modules/hardware/hardware_basic_tests.py::HardwareCLITests"
80+
];
81+
6982
disabledTestPaths = [
7083
# Test fails with ConnectionError trying to connect to api.softlayer.com
7184
"tests/transports/soap_tests.py.unstable"
7285
];
7386

7487
pythonImportsCheck = [ "SoftLayer" ];
7588

76-
meta = with lib; {
89+
meta = {
7790
description = "Python libraries that assist in calling the SoftLayer API";
7891
homepage = "https://github.com/softlayer/softlayer-python";
7992
changelog = "https://github.com/softlayer/softlayer-python/releases/tag/v${version}";
80-
license = licenses.mit;
81-
maintainers = with maintainers; [ onny ];
93+
license = lib.licenses.mit;
94+
maintainers = with lib.maintainers; [ onny ];
8295
};
8396
}

0 commit comments

Comments
 (0)