diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-07-21 22:05:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-21 22:05:24 -0500 |
commit | 83291846802c7b77351508992e01caccf9bae2cb (patch) | |
tree | 90b40bee7603caee54fb1199e2d2ee4c172f1ae0 /pkgs/development | |
parent | baa7f63a5a7e8452de0b50af64091e917d45b285 (diff) | |
parent | 8d1a3c78c437815c0659ac47647c22ef4553b750 (diff) |
Merge pull request #92389 from marsam/update-scrapy
pythonPackages.scrapy: 2.1.0 -> 2.2.0
Diffstat (limited to 'pkgs/development')
3 files changed, 28 insertions, 33 deletions
diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix new file mode 100644 index 0000000000000..92cc794dc2f2a --- /dev/null +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 }: + +buildPythonPackage rec { + pname = "itemadapter"; + version = "0.1.0"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "52159b4f97d82aa2968000ee8371b2114af56a2f44e4cd9142580d46eea39020"; + }; + + doCheck = false; # infinite recursion with Scrapy + + pythonImportsCheck = [ "itemadapter" ]; + + meta = with lib; { + description = "Common interface for data container classes"; + homepage = "https://github.com/scrapy/itemadapter"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 2827f7151f4dc..177531e64f77b 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -23,10 +23,11 @@ , sybil , pytest-twisted , botocore +, itemadapter }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.1"; pname = "Scrapy"; disabled = isPy27; @@ -55,14 +56,7 @@ buildPythonPackage rec { w3lib zope_interface protego - ]; - - patches = [ - # Scrapy is usually installed via pip where copying all - # permissions makes sense. In Nix the files copied are owned by - # root and readonly. As a consequence scrapy can't edit the - # project templates. - ./permissions-fix.patch + itemadapter ]; LC_ALL = "en_US.UTF-8"; @@ -78,7 +72,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "640aea0f9be9b055f5cfec5ab78ee88bb37a5be3809b138329bd2af51392ec7f"; + sha256 = "6a09beb5190bfdee2d72cf261822eae5d92fe8a86ac9ee1f55fc44b4864ca583"; }; postInstall = '' diff --git a/pkgs/development/python-modules/scrapy/permissions-fix.patch b/pkgs/development/python-modules/scrapy/permissions-fix.patch deleted file mode 100644 index 53038cf74e5f3..0000000000000 --- a/pkgs/development/python-modules/scrapy/permissions-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/scrapy/commands/startproject.py b/scrapy/commands/startproject.py -index 5941066..89f8edb 100644 ---- a/scrapy/commands/startproject.py -+++ b/scrapy/commands/startproject.py -@@ -4,7 +4,7 @@ import os - import string - from importlib import import_module - from os.path import join, exists, abspath --from shutil import ignore_patterns, move, copy2, copystat -+from shutil import ignore_patterns, move, copyfile, copystat - - import scrapy - from scrapy.commands import ScrapyCommand -@@ -76,8 +76,7 @@ class Command(ScrapyCommand): - if os.path.isdir(srcname): - self._copytree(srcname, dstname) - else: -- copy2(srcname, dstname) -- copystat(src, dst) -+ copyfile(srcname, dstname) - - def run(self, args, opts): - if len(args) not in (1, 2): |