Unverified Commit be2cc24a authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #217178 from fabaff/boltons-fix

python311Packages.boltons: disable failing test on Python 3.11
parents 5ab8b5ae d4f730ee
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "mahmoud";
    repo = "boltons";
    rev = version;
    rev = "refs/tags/${version}";
    hash = "sha256-8HO7X2PQEbQIQsCa2cMHQI3rlofVT22GYrWNXY34MLk=";
  };

@@ -41,8 +41,12 @@ buildPythonPackage rec {
    "boltons"
  ];

  disabledTests = lib.optionals (pythonAtLeast "3.11") [
    # https://github.com/mahmoud/boltons/issues/326
    "test_frozendict_api"
  ];

  meta = with lib; {
    homepage = "https://github.com/mahmoud/boltons";
    description = "Constructs, recipes, and snippets extending the Python standard library";
    longDescription = ''
      Boltons is a set of over 200 BSD-licensed, pure-Python utilities
@@ -59,6 +63,8 @@ buildPythonPackage rec {
      - A full-featured TracebackInfo type, for representing stack
      traces, in tbutils
    '';
    homepage = "https://github.com/mahmoud/boltons";
    changelog = "https://github.com/mahmoud/boltons/blob/${version}/CHANGELOG.md";
    license = licenses.bsd3;
    maintainers = with maintainers; [ twey ];
  };
+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "nedbat";
    repo = pname;
    rev = version;
    rev = "refs/tags/${version}";
    hash = "sha256-xtcNcykfgcWvifso0xaeMT31+G5x4HCp+tLAIEEq4cw=";
  };

@@ -47,6 +47,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "A GitHub activity digest tool";
    homepage = "https://github.com/nedbat/dinghy";
    changelog = "https://github.com/nedbat/dinghy/blob/${version}/CHANGELOG.rst";
    license = licenses.asl20;
    maintainers = with maintainers; [ trundle veehaitch ];
  };
+21 −13
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
, boltons
, hypothesis
, pyrsistent
, pytest
, pytestCheckHook
, setuptools
, six
, testtools
@@ -16,19 +16,15 @@
buildPythonPackage rec {
  pname = "eliot";
  version = "1.14.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
    sha256 = "c2f099a3e8d5ecfc22745766e7cc664a48db64b6b89d986dff270491d8683149";
    hash = "sha256-wvCZo+jV7PwidFdm58xmSkjbZLa4nZht/ycEkdhoMUk=";
  };

  nativeCheckInputs = [
    hypothesis
    testtools
    pytest
   ];

  propagatedBuildInputs = [
    aiocontextvars
    boltons
@@ -38,19 +34,31 @@ buildPythonPackage rec {
    zope_interface
  ];

  pythonImportsCheck = [ "eliot" ];
  nativeCheckInputs = [
    hypothesis
    pytestCheckHook
    testtools
  ];

  pythonImportsCheck = [
    "eliot"
  ];

  # Tests run eliot-prettyprint in out/bin.
  # test_parse_stream is broken, skip it.
  checkPhase = ''
  preCheck = ''
    export PATH=$out/bin:$PATH
    pytest -k 'not test_parse_stream'
  '';

  disabledTests = [
    "test_parse_stream"
    # AttributeError: module 'inspect' has no attribute 'getargspec'
    "test_default"
  ];

  meta = with lib; {
    homepage = "https://eliot.readthedocs.io";
    description = "Logging library that tells you why it happened";
    license = licenses.asl20;
    maintainers = [ maintainers.dpausp ];
    maintainers = with maintainers; [ dpausp ];
  };
}
+10 −5
Original line number Diff line number Diff line
{ lib
, buildPythonPackage
, fetchPypi
, boltons
, attrs
, boltons
, buildPythonPackage
, face
, fetchPypi
, pytestCheckHook
, pyyaml
, pythonAtLeast
, pythonOlder
, pyyaml
}:

buildPythonPackage rec {
@@ -40,6 +41,9 @@ buildPythonPackage rec {
  disabledTests = [
    # Test is outdated (was made for PyYAML 3.x)
    "test_main_yaml_target"
  ] ++ lib.optionals (pythonAtLeast "3.11") [
    "test_regular_error_stack"
    "test_long_target_repr"
  ];

  pythonImportsCheck = [
@@ -47,12 +51,13 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
    homepage = "https://github.com/mahmoud/glom";
    description = "Restructuring data, the Python way";
    longDescription = ''
      glom helps pull together objects from other objects in a
      declarative, dynamic, and downright simple way.
    '';
    homepage = "https://github.com/mahmoud/glom";
    changelog = "https://github.com/mahmoud/glom/blob/v${version}/CHANGELOG.md";
    license = licenses.bsd3;
    maintainers = with maintainers; [ twey ];
  };