oci-cli: drop toplevel with, use relaxDeps

This commit is contained in:
Adam C. Stephens
2025-02-21 23:12:44 -05:00
parent dea873294a
commit e77888cca5
+11 -14
View File
@@ -35,9 +35,8 @@ let
};
};
in
with py.pkgs;
buildPythonApplication rec {
py.pkgs.buildPythonApplication rec {
pname = "oci-cli";
version = "3.14.0";
format = "setuptools";
@@ -51,7 +50,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ installShellFiles ];
propagatedBuildInputs = [
propagatedBuildInputs = with py.pkgs; [
arrow
certifi
click
@@ -68,15 +67,14 @@ buildPythonApplication rec {
terminaltables
];
postPatch = ''
substituteInPlace setup.py \
--replace "cryptography>=3.2.1,<=37.0.2" "cryptography" \
--replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" \
--replace "PyYAML>=5.4,<6" "PyYAML" \
--replace "prompt-toolkit==3.0.29" "prompt-toolkit" \
--replace "terminaltables==3.1.0" "terminaltables" \
--replace "oci==2.78.0" "oci"
'';
pythonRelaxDeps = [
"PyYAML"
"cryptography"
"oci"
"prompt-toolkit"
"pyOpenSSL"
"terminaltables"
];
postInstall = ''
cat >oci.zsh <<EOF
@@ -96,8 +94,7 @@ buildPythonApplication rec {
--zsh oci.zsh
'';
# https://github.com/oracle/oci-cli/issues/187
doCheck = false;
doCheck = true;
pythonImportsCheck = [
" oci_cli "