summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2022-12-20 08:04:07 +0100
committerGitHub <noreply@github.com>2022-12-20 08:04:07 +0100
commitf4137f3e93caa09a330f86cd17696fd961e90583 (patch)
tree31ed18862ac5e5aa8a2d7f8a40ba8d0a52efc70c
parent32f12f500b54723f36f3a11e9483c1c39c57eb6b (diff)
parentffc203e4ba7cd61aaf8a0722d4a0c276494d06c5 (diff)
downloadnixpkgs-f4137f3e93caa09a330f86cd17696fd961e90583.tar
nixpkgs-f4137f3e93caa09a330f86cd17696fd961e90583.tar.gz
nixpkgs-f4137f3e93caa09a330f86cd17696fd961e90583.tar.bz2
nixpkgs-f4137f3e93caa09a330f86cd17696fd961e90583.tar.lz
nixpkgs-f4137f3e93caa09a330f86cd17696fd961e90583.tar.xz
nixpkgs-f4137f3e93caa09a330f86cd17696fd961e90583.tar.zst
nixpkgs-f4137f3e93caa09a330f86cd17696fd961e90583.zip
Merge pull request #206871 from fabaff/w3lib-bump
python310Packages.w3lib: 2.0.1 -> 2.1.1 
-rw-r--r--pkgs/development/python-modules/scrapy/default.nix1
-rw-r--r--pkgs/development/python-modules/w3lib/default.nix21
2 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 3571a783af8..4ac91771a47 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -95,6 +95,7 @@ buildPythonPackage rec {
     "test_nested_css"
     "test_nested_xpath"
     "test_flavor_detection"
+    "test_follow_whitespace"
     # Requires network access
     "AnonymousFTPTestCase"
     "FTPFeedStorageTest"
diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix
index 9c98f4d0926..ea878ac4890 100644
--- a/pkgs/development/python-modules/w3lib/default.nix
+++ b/pkgs/development/python-modules/w3lib/default.nix
@@ -1,31 +1,38 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, six
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "w3lib";
-  version = "2.0.1";
+  version = "2.1.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-E98V+MF7Fj3g/V+qiSwa0UPhkN/L25hTS7l16zfGx9Y=";
+    hash = "sha256-DhGY8bdFGVtrPdGkzWYBH7+C8wpNnauu4fnlyG8CAnQ=";
   };
 
-  propagatedBuildInputs = [ six ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  checkInputs = [ pytestCheckHook ];
-  pythonImportsCheck = [ "w3lib" ];
+  pythonImportsCheck = [
+    "w3lib"
+  ];
 
   disabledTests = [
     "test_add_or_replace_parameter"
   ];
 
   meta = with lib; {
-    description = "A library of web-related functions";
+    description = "Library of web-related functions";
     homepage = "https://github.com/scrapy/w3lib";
+    changelog = "https://github.com/scrapy/w3lib/blob/v${version}/NEWS";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ];
   };