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

Commits on Aug 8, 2019

  1. pythonPackages.jupyter_core: 4.4.0 -> 4.5.0

    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 8, 2019
    Copy the full SHA
    460c6a7 View commit details

  2. pythonPackages.jupyter_client: 5.2.4 -> 5.3.1

    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 8, 2019
    Copy the full SHA
    40a93cd View commit details

  3. pythonPackages.jupytext: 1.1.7 -> 1.2.1

    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 8, 2019
    Copy the full SHA
    1f8221c View commit details
21 changes: 9 additions & 12 deletions pkgs/development/python-modules/jupyter_client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,6 @@
, dateutil
, isPyPy
, py
, ipykernel
, ipython
, mock
, pytest
, tornado
}:

@@ -20,15 +16,16 @@ buildPythonPackage rec {

src = fetchPypi {
inherit pname version;
sha256 = "98e8af5edff5d24e4d31e73bc21043130ae9d955a91aa93fc0bc3b1d0f7b5880";
sha256 = "102qgc7isfxwq0zsj6m9apcyj2hk8c8c4fz7656lxlpmvxgazs4q";
};

checkInputs = [ ipykernel ipython mock pytest ];
propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil tornado ] ++ lib.optional isPyPy py;

checkPhase = ''
py.test
'';
propagatedBuildInputs = [
traitlets
jupyter_core
pyzmq
dateutil
tornado
] ++ lib.optional isPyPy py;

# Circular dependency with ipykernel
doCheck = false;
@@ -39,4 +36,4 @@ buildPythonPackage rec {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
};
}
}
5 changes: 2 additions & 3 deletions pkgs/development/python-modules/jupyter_core/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ buildPythonPackage rec {

src = fetchPypi {
inherit pname version;
sha256 = "2c6e7c1e9f2ac45b5c2ceea5730bc9008d92fe59d0725eac57b04c0edfba24f7";
sha256 = "1xr4pbghwk5hayn5wwnhb7z95380r45p79gf5if5pi1akwg7qvic";
};

checkInputs = [ pytest mock glibcLocales ];
@@ -23,8 +23,7 @@ buildPythonPackage rec {
patches = [ ./tests_respect_pythonpath.patch ];

checkPhase = ''
mkdir tmp
HOME=tmp TMPDIR=tmp LC_ALL=en_US.utf8 py.test
HOME=$TMPDIR LC_ALL=en_US.utf8 py.test
'';

meta = with lib; {
24 changes: 8 additions & 16 deletions pkgs/development/python-modules/jupytext/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, testfixtures
, pyyaml
{ lib, buildPythonPackage, fetchPypi, isPy27
, mock
, nbformat
, pytest
, pyyaml
}:

buildPythonPackage rec {
pname = "jupytext";
version = "1.1.7";
version = "1.2.1";

src = fetchPypi {
inherit pname version;
sha256 = "0g365j22gbmq4x60l06id5930aywzy1dx2s25109nqq2l2cxc7ws";
sha256 = "05vwxgjh7pzxgdzj0775562bfps8j7w3p7dcf1zfh169whqw9vg8";
};

propagatedBuildInputs = [
pyyaml
nbformat
testfixtures
];
] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows

checkInputs = [
pytest
];
# setup.py checks for those even though they're not needed at runtime (only
# for tests), thus not propagated
buildInputs = [
mock
pytest
];

# requires test notebooks which are not shipped with the pypi release
# also, pypi no longer includes tests
doCheck = false;
checkPhase = ''
py.test
pytest
'';

meta = with lib; {