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: 2fd359c978ea
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 76ea4df5f9aa
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 18, 2017

  1. oslo-config: fix argparse dependencies

    @Mic92
    Mic92 committed Jun 18, 2017
    Copy the full SHA
    f79d21d View commit details

  2. pythonPackages.keystoneauth1: fix missing argparse dep

    @Mic92
    Mic92 committed Jun 18, 2017
    Copy the full SHA
    76ea4df View commit details
Showing with 51 additions and 33 deletions.
  1. +27 −0 pkgs/development/python-modules/keystoneauth1/default.nix
  2. +22 −0 pkgs/development/python-modules/oslo-config/default.nix
  3. +2 −33 pkgs/top-level/python-packages.nix
27 changes: 27 additions & 0 deletions pkgs/development/python-modules/keystoneauth1/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ buildPythonPackage, isPyPy, fetchPypi, python
, pbr, testtools, testresources, testrepository, mock
, pep8, fixtures, mox3, requests-mock
, iso8601, requests, six, stevedore, webob, oslo-config
}:

buildPythonPackage rec {
pname = "keystoneauth1";
version = "1.1.0";
name = "${pname}-${version}";
disabled = isPyPy; # a test fails

src = fetchPypi {
inherit pname version;
sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
};

buildInputs = [ pbr testtools testresources testrepository mock
pep8 fixtures mox3 requests-mock ];
propagatedBuildInputs = [ iso8601 requests six stevedore
webob oslo-config ];

postPatch = ''
sed -i 's@python@${python.interpreter}@' .testr.conf
substituteInPlace requirements.txt --replace "argparse"
'';
}
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/oslo-config/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock }:

buildPythonPackage rec {
pname = "oslo.config";
version = "2.5.0";
name = "${pname}-${version}";

src = fetchPypi {
inherit pname version;
sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz";
};

propagatedBuildInputs = [ pbr six netaddr stevedore ];
buildInputs = [ mock ];

# TODO: circular import on oslo-i18n
doCheck = false;

postPatch = ''
substituteInPlace requirements.txt --replace "argparse"
'';
}
35 changes: 2 additions & 33 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17006,21 +17006,7 @@ in {
'';
};

oslo-config = buildPythonPackage rec {
name = "oslo.config-${version}";
version = "2.5.0";

src = pkgs.fetchurl {
url = "mirror://pypi/o/oslo.config/${name}.tar.gz";
sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz";
};

propagatedBuildInputs = with self; [ argparse pbr six netaddr stevedore ];
buildInputs = [ self.mock ];

# TODO: circular import on oslo-i18n
doCheck = false;
};
oslo-config = callPackage ../development/python-modules/oslo-config { };

oslotest = buildPythonPackage rec {
name = "oslotest-${version}";
@@ -17060,24 +17046,7 @@ in {
'';
};

keystoneauth1 = buildPythonPackage rec {
name = "keystoneauth1-${version}";
version = "1.1.0";
disabled = isPyPy; # a test fails

src = pkgs.fetchurl {
url = "mirror://pypi/k/keystoneauth1/${name}.tar.gz";
sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
};

buildInputs = with self; [ pbr testtools testresources testrepository mock
pep8 fixtures mox3 requests-mock ];
propagatedBuildInputs = with self; [ argparse iso8601 requests six stevedore
webob oslo-config ];
patchPhase = ''
sed -i 's@python@${python.interpreter}@' .testr.conf
'';
};
keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 {};

requests-mock = buildPythonPackage rec {
name = "requests-mock-${version}";