Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 78d9dad6dff7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d557a5d1b3b
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Jul 23, 2020

  1. python3Packages.ci-info: init at 0.2.0

    @bcdarwin
    bcdarwin committed Jul 23, 2020
    Copy the full SHA
    87479d7 View commit details

  2. python3Packages.ci-py: init at 1.0.0

    @bcdarwin
    bcdarwin committed Jul 23, 2020
    Copy the full SHA
    14feaae View commit details

  3. python3Packages.etelemetry: unbreak by adding correct dependencies

    @bcdarwin
    bcdarwin committed Jul 23, 2020
    Copy the full SHA
    323ba8a View commit details

  4. Merge pull request #93685 from bcdarwin/unbreak-etelemetry 

    python3Packages.etelemetry: unbreak
    @worldofpeace
    worldofpeace authored Jul 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7d557a5 View commit details
26 changes: 26 additions & 0 deletions pkgs/development/python-modules/ci-info/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
26 changes: 26 additions & 0 deletions pkgs/development/python-modules/ci-py/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/etelemetry/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 4 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };