Unverified Commit 9b6d7825 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

treewide: remove superfluous pythonAtLeast (#481858)

parents db728231 dfd04aef

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

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
  fetchPypi,

  isPy27,

  pytestCheckHook,

  pythonAtLeast,

  setuptools,

}:
@@ -37,7 +36,7 @@ buildPythonPackage rec { 


  enabledTestPaths = [ "test/unittests.py" ];



  disabledTests = lib.optionals (pythonAtLeast "3.10") [

  disabledTests = [

    # https://github.com/WojciechMula/aspell-python/issues/22

    "test_add"

    "test_get"

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

+0 −2
Original line number Diff line number Diff line
@@ -2,14 +2,12 @@ 
  lib,

  buildPythonPackage,

  fetchPypi,

  pythonAtLeast,

}:



buildPythonPackage rec {

  pname = "crashtest";

  version = "0.4.1";

  format = "setuptools";

  disabled = !(pythonAtLeast "3.6");



  src = fetchPypi {

    inherit pname version;

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

+0 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  pythonAtLeast,

  attrs,

  isodate,

  python-dateutil,
@@ -43,8 +42,6 @@ buildPythonPackage rec { 
    # this test is flaky on darwin because it depends on the resolution of filesystem mtimes

    # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257

    "test_write_file_exists"

  ]

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

    # https://github.com/cldf/csvw/issues/58

    "test_roundtrip_escapechar"

    "test_escapequote_escapecharquotechar_final"

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

+0 −4
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
  lib,

  buildPythonPackage,

  fetchPypi,

  isPy27,

  pythonAtLeast,

  keras,

  numpy,

  scipy,
@@ -16,8 +14,6 @@ buildPythonPackage rec { 
  version = "1.3.5";

  format = "setuptools";



  disabled = !(isPy27 || pythonAtLeast "3.4");



  src = fetchPypi {

    inherit pname version;

    sha256 = "3818b39e77c26fc1a37767a74fdd5e7d02877d75ed901ead2f40bd03baaa109f";

pkgs/development/python-modules/flake8-future-import/default.nix

+3 −13
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  isPy27,

  isPy38,

  isPy39,

  pythonAtLeast,

  setuptools,

  flake8,

  six,
@@ -25,14 +21,8 @@ buildPythonPackage rec { 
    hash = "sha256-2EcCOx3+PCk9LYpQjHCFNpQVI2Pdi+lWL8R6bNadFe0=";

  };



  patches =

    lib.optionals (pythonAtLeast "3.10") [ ./fix-annotations-version-11.patch ]

    ++ lib.optionals (isPy38 || isPy39) [ ./fix-annotations-version-10.patch ]

    ++ lib.optionals isPy27 [

      # Upstream disables this test case naturally on python 3, but it also fails

      # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it

      # on py2 as well.

      ./skip-test.patch

  patches = [

    ./fix-annotations-version-11.patch

  ];



  postPatch = ''