Merge pull request #115388 from dotlambda/agate-sql-0.5.6

authored by Sandro and committed by GitHub b4ef31d2 4d51984b

+25 -10
+25 -8
pkgs/development/python-modules/agate-sql/default.nix
··· 1 - { lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: 1 + { lib 2 + , buildPythonPackage 3 + , isPy27 4 + , fetchFromGitHub 5 + , agate 6 + , sqlalchemy 7 + , crate 8 + , nose 9 + , geojson 10 + }: 2 11 3 12 buildPythonPackage rec { 4 13 pname = "agate-sql"; 5 - version = "0.5.5"; 14 + version = "0.5.6"; 6 15 7 - src = fetchPypi { 8 - inherit pname version; 9 - sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; 16 + disabled = isPy27; 17 + 18 + src = fetchFromGitHub { 19 + owner = "wireservice"; 20 + repo = "agate-sql"; 21 + rev = version; 22 + sha256 = "16rijcnvxrvw9mmyk4228dalrr2qb74y649g1l6qifiabx5ij78s"; 10 23 }; 11 24 12 - propagatedBuildInputs = [ agate sqlalchemy crate ]; 25 + propagatedBuildInputs = [ agate sqlalchemy ]; 26 + 27 + checkInputs = [ crate nose geojson ]; 28 + 29 + checkPhase = '' 30 + nosetests 31 + ''; 13 32 14 33 pythonImportsCheck = [ "agatesql" ]; 15 34 ··· 18 37 homepage = "https://github.com/wireservice/agate-sql"; 19 38 license = with licenses; [ mit ]; 20 39 maintainers = with maintainers; [ vrthra ]; 21 - # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) 22 - broken = true; 23 40 }; 24 41 }
-2
pkgs/tools/text/csvkit/default.nix
··· 38 38 maintainers = with maintainers; [ vrthra ]; 39 39 license = licenses.mit; 40 40 homepage = "https://github.com/wireservice/csvkit"; 41 - # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) 42 - broken = true; 43 41 }; 44 42 }