Unverified Commit 3821024d authored by Yt's avatar Yt Committed by GitHub
Browse files

python312Packages.nbdime: modernize, skip failing test on darwin (#391012)

parents 871ff1d8 209c6d3e

pkgs/development/python-modules/nbdime/default.nix

+40 −23
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  buildPythonPackage,

  pythonOlder,

  fetchPypi,



  # build-system

  hatch-jupyter-builder,

  hatchling,

  jupyterlab,

  nbformat,



  # dependencies

  colorama,

  pygments,

  tornado,

  requests,

  gitpython,

  jinja2,

  jupyter-server,

  jupyter-server-mathjax,

  jinja2,

  nbformat,

  pygments,

  requests,

  tornado,



  # tests

  gitMinimal,

  pytest-tornado,

  pytestCheckHook,

  writableTmpDirAsHomeHook,

}:



buildPythonPackage rec {
@@ -25,8 +32,6 @@ buildPythonPackage rec { 
  version = "4.0.2";

  pyproject = true;



  disabled = pythonOlder "3.6";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-2Cefj0sjbAslOyDWDEgxu2eEPtjb1uCfI06wEdNvG/I=";
@@ -39,32 +44,44 @@ buildPythonPackage rec { 
  ];



  dependencies = [

    nbformat

    colorama

    pygments

    tornado

    requests

    gitpython

    jinja2

    jupyter-server

    jupyter-server-mathjax

    jinja2

    nbformat

    pygments

    requests

    tornado

  ];



  nativeCheckInputs = [

    gitMinimal

    pytest-tornado

    pytestCheckHook

    writableTmpDirAsHomeHook

  ];



  disabledTests = [

  disabledTests =

    [

      # subprocess.CalledProcessError: Command '['git', 'diff', 'base', 'diff.ipynb']' returned non-zero exit status 128.

      # git-nbdiffdriver diff: line 1: git-nbdiffdriver: command not found

      # fatal: external diff died, stopping at diff.ipynb

      "test_git_diffdriver"

    "test_git_difftool"



      # subprocess.CalledProcessError: Command '['git', 'merge', 'remote-no-conflict']' returned non-zero exit status 1.

      "test_git_mergedriver"



      # Require network access

      "test_git_difftool"

      "test_git_mergetool"

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      # OSError: Could not find system gitattributes location!

      "test_locate_gitattributes_syste"

    ];



  preCheck = ''

    export HOME="$TEMP"

    git config --global user.email "janedoe@example.com"

    git config --global user.name "Jane Doe"

  '';
@@ -73,11 +90,11 @@ buildPythonPackage rec { 


  pythonImportsCheck = [ "nbdime" ];



  meta = with lib; {

  meta = {

    homepage = "https://github.com/jupyter/nbdime";

    changelog = "https://github.com/jupyter/nbdime/blob/${version}/CHANGELOG.md";

    description = "Tools for diffing and merging of Jupyter notebooks";

    license = licenses.bsd3;

    maintainers = with maintainers; [ tbenst ];

    license = lib.licenses.bsd3;

    maintainers = with lib.maintainers; [ tbenst ];

  };

}

pkgs/development/python-modules/pytest-notebook/default.nix

+18 −12
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
  pytest-regressions,

  pytestCheckHook,

  writableTmpDirAsHomeHook,

  pythonAtLeast,

}:



buildPythonPackage rec {
@@ -69,7 +70,8 @@ buildPythonPackage rec { 
    writableTmpDirAsHomeHook

  ];



  disabledTests = [

  disabledTests =

    [

      # AssertionError: FILES DIFFER:

      "test_diff_to_string"
@@ -80,6 +82,10 @@ buildPythonPackage rec { 


      # pytest_notebook.nb_regression.NBRegressionError

      "test_regression_regex_replace_pass"

    ]

    ++ lib.optionals (pythonAtLeast "3.13") [

      # AssertionError: FILES DIFFER:

      "test_documentation"

    ];



  __darwinAllowLocalNetworking = true;