From 9974c90a1597a7b2b009e798374615899d57db7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 May 2021 23:53:47 +0200 Subject: [PATCH] python3Packages.sqlalchemy: 1.3.23 -> 1.4.15 --- .../python-modules/sqlalchemy/default.nix | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 5964e382084f..0e03b17963ee 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, isPy3k +, pythonOlder +, greenlet +, importlib-metadata , mock , pysqlite ? null , pytestCheckHook @@ -7,19 +14,17 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.3.23"; + version = "1.4.15"; src = fetchPypi { inherit pname version; - sha256 = "6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b"; + sha256 = "1rj9h3mcxrgh5q8qvz7m39diyil27l5mldr49mgz6xfibk3h1w8g"; }; - patches = [ - # fix test_pyodbc_extra_connect_azure test failure - (fetchpatch { - url = "https://github.com/sqlalchemy/sqlalchemy/commit/7293b3dc0e9eb3dae84ffd831494b85355df8e73.patch"; - sha256 = "1z61lzxamz74771ddlqmbxba1dcr77f016vqfcmb44dxb228w2db"; - }) + propagatedBuildInputs = [ + greenlet + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; checkInputs = [ @@ -28,7 +33,9 @@ buildPythonPackage rec { mock ] ++ lib.optional (!isPy3k) pysqlite; - pytestFlagsArray = [ "-n auto" ]; + pytestFlagsArray = [ + "-n auto" + ]; postInstall = '' sed -e 's:--max-worker-restart=5::g' -i setup.cfg @@ -37,8 +44,10 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; # disable mem-usage tests on mac, has trouble serializing pickle files - disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "] - ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ]; + disabledTests = lib.optionals stdenv.isDarwin [ + "MemUsageWBackendTest" + "MemUsageTest" + ]; meta = with lib; { homepage = "http://www.sqlalchemy.org/";