Unverified Commit 49a4992b authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #325669 from mweinelt/drop-pynose

python312Packages.pynose: drop due to licensing issues
parents 1c2d0491 22e2f200
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@
, enableSwftools ? false
, swftools
, python3Packages
, pythonOlder
, qtbase
, qtcharts
, makeDesktopItem
@@ -81,8 +82,11 @@ python3Packages.buildPythonPackage rec {
    twisted
  ];

  # tests rely on nose
  doCheck = pythonOlder "3.12";

  nativeCheckInputs = with python3Packages; [
    pynose
    nose
    mock
    httmock
  ];
+0 −34
Original line number Diff line number Diff line
{
  lib,
  buildPythonPackage,
  fetchPypi,
  six,
  pynose,
  setuptools,
}:

buildPythonPackage rec {
  pname = "aadict";
  version = "0.2.3";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-p3MorFXbtXNdqZRBhwJRvv4TX2h6twenoXhWE2OydwQ=";
  };

  build-system = [ setuptools ];

  dependencies = [ six ];

  nativeCheckInputs = [ pynose ];

  pythonImportsCheck = [ "aadict" ];

  meta = with lib; {
    description = "Auto-attribute dict (and a couple of other useful dict functions)";
    homepage = "https://github.com/metagriffin/aadict";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ glittershark ];
  };
}
+5 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
  blockdiag,
  buildPythonPackage,
  fetchFromGitHub,
  pynose,
  nose,
  pytestCheckHook,
  pythonOlder,
  setuptools,
@@ -27,8 +27,11 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ blockdiag ];

  # tests rely on nose
  doCheck = pythonOlder "3.12";

  nativeCheckInputs = [
    pynose
    nose
    pytestCheckHook
  ];

+2 −6
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
  lxml,
  parsedatetime,
  pyicu,
  pynose,
  pytestCheckHook,
  python-slugify,
  pythonOlder,
  pytimeparse,
@@ -47,15 +47,11 @@ buildPythonPackage rec {
    cssselect
    glibcLocales
    lxml
    pynose
    pyicu
    pytestCheckHook
    pytz
  ];

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

  pythonImportsCheck = [ "agate" ];

  meta = with lib; {
+2 −11
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
  pythonAtLeast,
  setuptools,
  pynose,
  coverage,
  pytestCheckHook,
  wrapt,
}:

@@ -25,14 +23,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ wrapt ];

  nativeCheckInputs = [
    pynose
    coverage
  ];

  checkPhase = ''
    nosetests -e test_specific_test
  '';
  nativeCheckInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "aiounittest" ];

Loading