Merge pull request #108572 from fabaff/bump-sortedcollections

This commit is contained in:
Sandro 2021-01-11 01:36:33 +01:00 committed by GitHub
commit 39229a3398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions

View file

@ -1,27 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, pytestCheckHook
, sortedcontainers
}:
buildPythonPackage rec {
pname = "sortedcollections";
version = "1.2.1";
version = "1.2.3";
src = fetchPypi {
inherit pname version;
sha256 = "0sihzm5aqz7r3irh4jn6rzicb7lf81d27z7vl6kaslnhwcsizhsq";
src = fetchFromGitHub {
owner = "grantjenks";
repo = "python-sortedcollections";
rev = "v${version}";
sha256 = "06ifkbhkj5fpsafibw0fs7b778g7q0gd03crvbjk04k0f3wjxc5z";
};
propagatedBuildInputs = [ sortedcontainers ];
# No tests in PyPi tarball
doCheck = false;
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "sortedcollections" ];
meta = with stdenv.lib; {
description = "Python Sorted Collections";
homepage = "http://www.grantjenks.com/docs/sortedcollections/";
license = licenses.asl20;
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -26,11 +26,11 @@ buildPythonApplication rec {
sha256 = "0apwgj86whrc077dfymvyb4qwj19bawyrx49g4kg364895v0rbbq";
};
# pendulum pinning was to prevent PEP517 from trying to build from source
# there are already later releases present
postPatch = ''
substituteInPlace setup.py \
--replace "tomlkit>=0.5,<0.6" "tomlkit" \
--replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum"
--replace "attrs>=18.2,<19.4" "attrs"
'';
propagatedBuildInputs = [