From 45c2057059a8db33627c6e2c7e6720758454de19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 13:53:57 +0100 Subject: [PATCH 1/2] python310Packages.oci: update homepage and add changelog --- pkgs/development/python-modules/oci/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 3a8df43b31b8..e67c716bd37a 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -49,7 +49,8 @@ buildPythonPackage rec { meta = with lib; { description = "Oracle Cloud Infrastructure Python SDK"; - homepage = "https://oracle-cloud-infrastructure-python-sdk.readthedocs.io/"; + homepage = "https://github.com/oracle/oci-python-sdk"; + changelog = "https://github.com/oracle/oci-python-sdk/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 /* or */ upl ]; maintainers = with maintainers; [ ilian ]; }; From fc14705f97f6f42de392b3a61e5d4a6f9614d6e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 13:59:58 +0100 Subject: [PATCH 2/2] python310Packages.oci: 2.92.0 -> 2.93.0 Diff: https://github.com/oracle/oci-python-sdk/compare/refs/tags/v2.92.0...v2.93.0 Changelog: https://github.com/oracle/oci-python-sdk/blob/v2.93.0/CHANGELOG.rst --- .../python-modules/oci/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index e67c716bd37a..7b1232decd61 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -7,23 +7,33 @@ , pyopenssl , python-dateutil , pythonOlder +, pythonRelaxDepsHook , pytz }: buildPythonPackage rec { pname = "oci"; - version = "2.92.0"; + version = "2.93.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-evxY/1MhSCZOTjhH/2tI5amnZpd+fCdSdFBD4W9uZ+c="; + hash = "sha256-yH9SCrTASP+O9VLVs6tliteCOWi+Pc7nDOgiboHQE4s="; }; + pythonRelaxDeps = [ + "cryptography" + "pyOpenSSL" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ certifi circuitbreaker @@ -33,13 +43,6 @@ buildPythonPackage rec { pytz ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "configparser==4.0.2 ; python_version < '3'" "" \ - --replace "cryptography>=3.2.1,<=37.0.2" "cryptography" \ - --replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" - ''; - # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 doCheck = false;