diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-29 16:56:31 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-29 16:56:31 +0100 |
commit | b56e839c45f370ffa4a9fa3d22bbfb997c175400 (patch) | |
tree | 40b6734bd69997cc486a036b07629804186fa433 /pkgs/development/python-modules | |
parent | bcf59bbfcb6c8507b6664d06e75ef7b1249e6f40 (diff) | |
parent | a3d3864b02ca4f1c8428f0f7ed3f8f71e03d3164 (diff) | |
download | nixpkgs-b56e839c45f370ffa4a9fa3d22bbfb997c175400.tar nixpkgs-b56e839c45f370ffa4a9fa3d22bbfb997c175400.tar.gz nixpkgs-b56e839c45f370ffa4a9fa3d22bbfb997c175400.tar.bz2 nixpkgs-b56e839c45f370ffa4a9fa3d22bbfb997c175400.tar.lz nixpkgs-b56e839c45f370ffa4a9fa3d22bbfb997c175400.tar.xz nixpkgs-b56e839c45f370ffa4a9fa3d22bbfb997c175400.tar.zst nixpkgs-b56e839c45f370ffa4a9fa3d22bbfb997c175400.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/dogpile.cache/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/python-modules/snuggs/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/python-modules/weboob/default.nix | 16 |
3 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 4ecd0731ecb..86180a609bb 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -19,6 +19,11 @@ buildPythonPackage rec { rm tests/cache/test_memcached_backend.py ''; + dontUseSetuptoolsCheck = true; + checkPhase = '' + pytest + ''; + checkInputs = [ pytest pytestcov mock Mako ]; propagatedBuildInputs = [ decorator ]; diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix index 017ea7e0d5f..a97bbf4012c 100644 --- a/pkgs/development/python-modules/snuggs/default.nix +++ b/pkgs/development/python-modules/snuggs/default.nix @@ -1,23 +1,23 @@ { buildPythonPackage, lib, fetchFromGitHub , click, numpy, pyparsing -, pytest +, pytest, hypothesis }: buildPythonPackage rec { pname = "snuggs"; - version = "1.4.3"; + version = "1.4.7"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = pname; rev = version; - sha256 = "198nbgkhlg4ik2i1r2cp900iqlairh2hnii2y8v5wy1qk3rv0s9g"; + sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf"; }; propagatedBuildInputs = [ click numpy pyparsing ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest hypothesis ]; checkPhase = "pytest test_snuggs.py"; meta = with lib; { diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index d78cb7f3de9..e938cdaa3fb 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -1,19 +1,18 @@ -{ buildPythonPackage, fetchurl, stdenv, isPy27 +{ buildPythonPackage, fetchPypi, stdenv , nose, pillow, prettytable, pyyaml, dateutil, gdata , requests, mechanize, feedparser, lxml, gnupg, pyqt5 -, libyaml, simplejson, cssselect, futures, pdfminer +, libyaml, simplejson, cssselect, pdfminer , termcolor, google_api_python_client, html2text , unidecode }: buildPythonPackage rec { pname = "weboob"; - version = "1.3"; - disabled = ! isPy27; + version = "1.5"; - src = fetchurl { - url = "https://symlink.me/attachments/download/356/${pname}-${version}.tar.gz"; - sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9"; + src = fetchPypi { + inherit pname version; + sha256 = "1c9z9gid1mbm1cakb2wj6jjkbrmji8y8ac46iqpih9x1h498bhbs"; }; postPatch = '' @@ -37,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow prettytable pyyaml dateutil gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml - simplejson cssselect futures pdfminer termcolor + simplejson cssselect pdfminer termcolor google_api_python_client html2text unidecode ]; checkPhase = '' @@ -50,4 +49,3 @@ buildPythonPackage rec { license = stdenv.lib.licenses.agpl3; }; } - |