Merge pull request #148692 from fabaff/bump-pkutils
python3Packages.pkutils: 1.1.1. -> 2.0.0
This commit is contained in:
commit
bf324e8fe8
2 changed files with 48 additions and 17 deletions
|
@ -1,35 +1,48 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, isPy3k
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, semver
|
|
||||||
# Check Inputs
|
|
||||||
, nose
|
, nose
|
||||||
|
, pythonOlder
|
||||||
|
, semver
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pkutils";
|
pname = "pkutils";
|
||||||
version = "1.1.1";
|
version = "2.0.0";
|
||||||
disabled = !isPy3k; # some tests using semver fail due to unicode errors on Py2.7
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "reubano";
|
owner = "reubano";
|
||||||
repo = "pkutils";
|
repo = "pkutils";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "01yaq9sz6vyxk8yiss6hsmy70qj642cr2ifk0sx1mlh488flcm62";
|
sha256 = "sha256-jvRUjuxlcfmJOX50bnZR/pP2Axe1KDy9/KGXTL4yPxA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ semver ];
|
propagatedBuildInputs = [
|
||||||
|
semver
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
nose
|
||||||
|
];
|
||||||
|
|
||||||
# Remove when https://github.com/reubano/pkutils/pull/4 merged
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace requirements.txt --replace "semver>=2.2.1,<2.7.3" "semver"
|
# Remove when https://github.com/reubano/pkutils/pull/4 merged
|
||||||
|
substituteInPlace requirements.txt \
|
||||||
|
--replace "semver>=2.2.1,<2.7.3" "semver"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkInputs = [ nose ];
|
checkPhase = ''
|
||||||
pythonImportsCheck = [ "pkutils" ];
|
runHook preCheck
|
||||||
|
nosetests
|
||||||
|
runHook postCheck
|
||||||
|
'';
|
||||||
|
|
||||||
checkPhase = "nosetests";
|
pythonImportsCheck = [
|
||||||
|
"pkutils"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A Python packaging utility library";
|
description = "A Python packaging utility library";
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pygogo";
|
pname = "pygogo";
|
||||||
version = "0.13.2";
|
version = "0.13.2";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
@ -20,14 +21,31 @@ buildPythonPackage rec {
|
||||||
sha256 = "19rdf4sjrm5lp1vq1bki21a9lrkzz8sgrfwgjdkq4sgy90hn1jn9";
|
sha256 = "19rdf4sjrm5lp1vq1bki21a9lrkzz8sgrfwgjdkq4sgy90hn1jn9";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkutils ];
|
nativeBuildInputs = [
|
||||||
|
pkutils
|
||||||
|
];
|
||||||
|
|
||||||
checkInputs = [ nose ];
|
checkInputs = [
|
||||||
checkPhase = "nosetests";
|
nose
|
||||||
pythonImportsCheck = [ "pygogo" ];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace dev-requirements.txt \
|
||||||
|
--replace "pkutils>=1.0.0,<2.0.0" "pkutils>=1.0.0"
|
||||||
|
'';
|
||||||
|
|
||||||
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
nosetests
|
||||||
|
runHook postCheck
|
||||||
|
'';
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"pygogo"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A Python logging library with super powers";
|
description = "Python logging library";
|
||||||
homepage = "https://github.com/reubano/pygogo/";
|
homepage = "https://github.com/reubano/pygogo/";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ drewrisinger ];
|
maintainers = with maintainers; [ drewrisinger ];
|
||||||
|
|
Loading…
Reference in a new issue