diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs/development/python-modules/sqlalchemy | |
parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/sqlalchemy')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index c7ff2e56f02b..beb19b64f5ff 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,41 +1,29 @@ -{ lib -, fetchPypi -, fetchpatch -, buildPythonPackage -, pytest +{ lib, fetchPypi, buildPythonPackage, isPy3k , mock -, isPy3k , pysqlite +, pytest }: buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.2.14"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "9de7c7dabcf06319becdb7e15099c44e5e34ba7062f9ba10bc00e562f5db3d04"; + sha256 = "1zxhabcgzspwrh9l7b68p57kqx4h664a1dp9xr8mi84r472pyzi1"; }; - patches = [ - # fix for failing doc tests - # https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail - (fetchpatch { - name = "doc-test-fixes.patch"; - url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw; - sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri"; - }) - ]; - checkInputs = [ pytest mock -# Disable pytest_xdist tests for now, because our version seems to be too new. -# pytest_xdist ] ++ lib.optional (!isPy3k) pysqlite; + postInstall = '' + sed -e 's:--max-worker-restart=5::g' -i setup.cfg + ''; + checkPhase = '' - py.test -k "not test_round_trip_direct_type_affinity" + pytest test ''; meta = with lib; { |