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

Commits on Mar 2, 2019

  1. python.pkgs.odfpy: fix build 

    (cherry picked from commit 434c2a0)
    Robert Schütz committed Mar 2, 2019
    Copy the full SHA
    593918b View commit details

  2. python.pkgs.pyrsistent: remove obsolete patch 

    (cherry picked from commit 35fa04b)
    Robert Schütz committed Mar 2, 2019
    Copy the full SHA
    52075c2 View commit details

  3. python.pkgs.spglib: fix tests 

    (cherry picked from commit b1467cf)
    Robert Schütz committed Mar 2, 2019
    Copy the full SHA
    be55823 View commit details

  4. python.pkgs.fudge: fix tests 

    (cherry picked from commit 11ac34b)
    Robert Schütz committed Mar 2, 2019
    Copy the full SHA
    16608fc View commit details

  5. python.pkgs.parsel: use checkInputs 

    (cherry picked from commit 09d475a)
    Robert Schütz committed Mar 2, 2019
    Copy the full SHA
    8f36605 View commit details

  6. python.pkgs.pyres: skip failing test 

    (cherry picked from commit 2e16d3d)
    Robert Schütz committed Mar 2, 2019
    Copy the full SHA
    b6b58a5 View commit details
5 changes: 1 addition & 4 deletions pkgs/development/python-modules/fudge/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,6 @@
, buildPythonPackage
, fetchPypi
, nose
, nosejs
, sphinx
, isPy3k
}:

@@ -17,8 +15,7 @@ buildPythonPackage rec {
sha256 = "1p7g6hv9qxscbzjv2n5pczpkkp55mp3s56adfc912w9qpf3rv4nr";
};

buildInputs = [ nose nosejs ];
propagatedBuildInputs = [ sphinx ];
checkInputs = [ nose ];

checkPhase = ''
nosetests -v
14 changes: 9 additions & 5 deletions pkgs/development/python-modules/odfpy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@
, fetchPypi
, python
, isPy27
, defusedxml
, pytest
}:

buildPythonPackage rec {
@@ -14,15 +16,17 @@ buildPythonPackage rec {
sha256 = "596021f0519623ca8717331951c95e3b8d7b21e86edc7efe8cb650a0d0f59a2b";
};

# Python 2.7 uses a different ordering for xml namespaces.
# The testAttributeForeign test expects "ns44", but fails since it gets "ns43"
checkPhase = " " + lib.optionalString (!isPy27) ''
${python.interpreter} -m unittest discover -s tests
propagatedBuildInputs = [ defusedxml ];

checkInputs = [ pytest ];

checkPhase = ''
pytest
'';

meta = {
description = "Python API and tools to manipulate OpenDocument files";
homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
homepage = https://github.com/eea/odfpy;
license = lib.licenses.asl20;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/parsel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ buildPythonPackage rec {
sha256 = "9ccd82b8a122345601f6f9209e972c0e8c3518a188fcff2d37cb4d7bc570b4b8";
};

buildInputs = [ pytest pytestrunner ];
checkInputs = [ pytest pytestrunner ];
propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ];

checkPhase = ''
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/pyres/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ buildPythonPackage rec {

checkPhase = ''
redis-server &
nosetests .
nosetests . --exclude test_worker_pids
'';

meta = with stdenv.lib; {
3 changes: 0 additions & 3 deletions pkgs/development/python-modules/pyrsistent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,9 +20,6 @@ buildPythonPackage rec {

checkInputs = [ pytestrunner pytest hypothesis ];

# pytestrunner is only needed to run tests
patches = [ ./no-setup-requires-pytestrunner.patch ];

meta = with stdenv.lib; {
homepage = https://github.com/tobgu/pyrsistent/;
description = "Persistent/Functional/Immutable data structures";
15 changes: 0 additions & 15 deletions pkgs/development/python-modules/pyrsistent/no-setup-requires-pytestrunner.patch
View file

This file was deleted.

7 changes: 2 additions & 5 deletions pkgs/development/python-modules/spglib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, numpy, python }:
{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }:

buildPythonPackage rec {
pname = "spglib";
@@ -11,10 +11,7 @@ buildPythonPackage rec {

propagatedBuildInputs = [ numpy ];

checkPhase = ''
cd test
${python.interpreter} -m unittest discover -bv
'';
checkInputs = [ nose pyyaml ];

meta = with stdenv.lib; {
description = "Python bindings for C library for finding and handling crystal symmetries";