From 2c8b578191820e07b343fe597876fc33285bc630 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Sun, 18 Sep 2016 18:18:45 +0100 Subject: [PATCH] Bump Falcon to 1.0.0, make the test dependencies optional, add the Hug framework falcon: 0.3.0 -> 1.0.0 hug: init at 2.1.2 --- pkgs/top-level/python-packages.nix | 32 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3bbf8a0e0e04..814526efb436 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10778,27 +10778,20 @@ in modules // { }; falcon = buildPythonPackage (rec { - name = "falcon-0.3.0"; + name = "falcon-1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/f/falcon/${name}.tar.gz"; - sha256 = "10ivzk88m8nn3bqbg6xgv6yfy2dgp6yzbcvr645y93pzlash4xpj"; + sha256 = "ddce23a2dd0abba6d19775e9bf7ba64e184b15a0e7163e65f62af63354193f63"; }; - propagatedBuildInputs = with self; [ coverage ddt nose pyyaml requests2 six testtools python_mimeparse ]; + buildInputs = with self; stdenv.lib.optionals doCheck [coverage ddt nose pyyaml requests2 testtools]; + propagatedBuildInputs = with self; [ six python_mimeparse ]; # The travis build fails since the migration from multiprocessing to threading for hosting the API under test. # OSError: [Errno 98] Address already in use doCheck = false; - # This patch is required if the tests are enabled - # See https://github.com/falconry/falcon/issues/572 - #patches = singleton (pkgs.fetchurl { - # name = "falcon-572.patch"; - # url = "https://github.com/desiderius/falcon/commit/088bd3f2204eb6368acb3a1bf6c6b54c415225c2.patch"; - # sha256 = "19102dlzc4890skmam2v20va2vk5xr56fi4nzibzfvl7vyq68060"; - #}); - meta = { description = "An unladen web framework for building APIs and app backends"; homepage = http://falconframework.org; @@ -10806,7 +10799,24 @@ in modules // { maintainers = with maintainers; [ desiderius ]; }; }); + hug = buildPythonPackage rec { + name = "hug-2.1.2"; + src = pkgs.fetchurl { + url = "mirror://pypi/h/hug/${name}.tar.gz"; + sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c"; + }; + propagatedBuildInputs = with self; [ falcon requests2 ]; + + # tests are not shipped in the tarball + doCheck = false; + + meta = { + description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; + homepage = https://github.com/timothycrosley/hug; + license = licenses.mit; + }; + }; flup = buildPythonPackage (rec { name = "flup-1.0.2"; disabled = isPy3k;