Merge pull request #93685 from bcdarwin/unbreak-etelemetry

python3Packages.etelemetry: unbreak
This commit is contained in:
worldofpeace 2020-07-22 21:54:53 -04:00 committed by GitHub
commit 7d557a5d1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 3 deletions

View File

@ -0,0 +1,26 @@
{ lib, buildPythonPackage, isPy27, fetchPypi, pytest, pytestCheckHook }:
buildPythonPackage rec {
version = "0.2.0";
pname = "ci-info";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "05j6pamk8sd51qmvpkl3f7sxajmncrqm0cz6n6bqgsvzjwn66w6x";
};
checkInputs = [ pytest pytestCheckHook ];
doCheck = false; # both tests access network
pythonImportsCheck = [ "ci_info" ];
meta = with lib; {
description = "Gather continuous integration information on the fly";
homepage = "https://github.com/mgxd/ci-info";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

View File

@ -0,0 +1,26 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, pytest, pytestrunner, pytestCheckHook }:
buildPythonPackage rec {
version = "1.0.0";
pname = "ci-py";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "12ax07n81vxbyayhwzi1q6x7gfmwmvrvwm1n4ii6qa6fqlp9pzj7";
};
nativeBuildInputs = [ pytestrunner ]; # pytest-runner included in setup-requires
checkInputs = [ pytest pytestCheckHook ];
pythonImportsCheck = [ "ci" ];
meta = with lib; {
description = "Library for working with Continuous Integration services";
homepage = "https://github.com/grantmcconnaughey/ci.py";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, requests, pytest }:
{ lib, buildPythonPackage, fetchPypi, isPy27, ci-info, ci-py, requests, pytest }:
buildPythonPackage rec {
version = "0.2.1";
@ -7,10 +7,10 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "bfb58f58e98f63eae20caffb8514fb68c572332aa6e773cf3fcbde9b408d88e7";
sha256 = "1rw8im09ppnb7z7p7rx658rp5ib8zca8byxg1kiflqwgx5c8zddz";
};
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [ ci-info ci-py requests ];
# all 2 of the tests both try to pull down from a url
doCheck = false;

View File

@ -2072,6 +2072,10 @@ in {
chevron = callPackage ../development/python-modules/chevron {};
ci-info = callPackage ../development/python-modules/ci-info { };
ci-py = callPackage ../development/python-modules/ci-py { };
cli-helpers = callPackage ../development/python-modules/cli-helpers {};
cmarkgfm = callPackage ../development/python-modules/cmarkgfm { };