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

Commits on Feb 5, 2018

  1. pythonPackages.nose-parameterized: create parameterized alias 

    `pythonPackages.parameterized` is the successor of `nose-parameterized`
as the authors of the module decided to support more testing frameworks
and stopped focusing on `noes` only. `nose-parameterized` is still
available in `pypi` with version `0.6.0`, but is officially deprecated.

However the renaming happened quite recently so it is possible that
there are still folks relying on `nose-parameterized`. Therefore I moved
the expression to provide a `pythonPackages.parameterized` derivation
and added a package override which builds `nose-parameterized` after
yielding a deprecation warning.
    @Ma27
    Ma27 committed Feb 5, 2018
    Copy the full SHA
    9d188f9 View commit details

  2. pythonPackages.pybase64: init at 0.2.1 

    `pybase64` is a tiny wrapper for `libbase64` written in python.

/cc @ironpinguin
    @Ma27
    Ma27 committed Feb 5, 2018
    Copy the full SHA
    14da2e2 View commit details

  3. Merge pull request #34589 from Ma27/package-pybase64 

    pythonPackages.pybase64: init at 0.2.1
    @FRidh
    FRidh authored Feb 5, 2018
    Copy the full SHA
    422f99b View commit details
22 changes: 3 additions & 19 deletions pkgs/development/python-modules/nose-parameterized/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,11 @@
{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }:
{ fetchPypi, parameterized }:

buildPythonPackage rec {
parameterized.overrideAttrs (o: rec {
pname = "nose-parameterized";
version = "0.6.0";

src = fetchPypi {
inherit pname version;
sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk";
};

# Tests require some python3-isms but code works without.
doCheck = isPy3k;

buildInputs = [ nose glibcLocales ];
propagatedBuildInputs = [ six ];

checkPhase = ''
LC_ALL="en_US.UTF-8" nosetests -v
'';

meta = with stdenv.lib; {
description = "Parameterized testing with any Python test framework";
homepage = https://pypi.python.org/pypi/nose-parameterized;
license = licenses.bsd3;
};
}
})
28 changes: 28 additions & 0 deletions pkgs/development/python-modules/parameterized/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }:

buildPythonPackage rec {
pname = "parameterized";
version = "0.6.1";

src = fetchPypi {
inherit pname version;
sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa";
};

# Tests require some python3-isms but code works without.
doCheck = isPy3k;

checkInputs = [ nose glibcLocales ];
propagatedBuildInputs = [ six ];

checkPhase = ''
LC_ALL="en_US.UTF-8" nosetests -v
'';

meta = with stdenv.lib; {
description = "Parameterized testing with any Python test framework";
homepage = https://pypi.python.org/pypi/parameterized;
license = licenses.bsd3;
maintainers = with maintainers; [ ma27 ];
};
}
25 changes: 25 additions & 0 deletions pkgs/development/python-modules/pybase64/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ buildPythonPackage, stdenv, fetchPypi, parameterized, six, nose }:

buildPythonPackage rec {
pname = "pybase64";
version = "0.2.1";

src = fetchPypi {
inherit pname version;
sha256 = "1hggg69s5r8jyqdwyzri5sn3f19p7ayl0fjhjma0qzgfp7bk6zjc";
};

propagatedBuildInputs = [ six ];
checkInputs = [ parameterized nose ];

checkPhase = ''
nosetests
'';

meta = with stdenv.lib; {
homepage = https://pypi.python.org/pypi/pybase64;
description = "Fast Base64 encoding/decoding";
license = licenses.bsd2;
maintainers = with maintainers; [ ma27 ];
};
}
7 changes: 6 additions & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3842,7 +3842,8 @@ in {
};
});

nose-parameterized = callPackage ../development/python-modules/nose-parameterized {};
nose-parameterized = warn "Warning: `nose-parameterized` is deprecated! Use `parameterized` instead."
(callPackage ../development/python-modules/nose-parameterized {});

neurotools = buildPythonPackage (rec {
name = "NeuroTools-${version}";
@@ -12406,6 +12407,8 @@ in {
};
};

parameterized = callPackage ../development/python-modules/parameterized { };

paramz = callPackage ../development/python-modules/paramz { };

parsel = buildPythonPackage rec {
@@ -12829,6 +12832,8 @@ in {

kmsxx = callPackage ../development/libraries/kmsxx { };

pybase64 = callPackage ../development/python-modules/pybase64 { };

pylibconfig2 = buildPythonPackage rec {
name = "pylibconfig2-${version}";
version = "0.2.4";