Merge pull request #312281 from Sigmanificient/the-great-python3.8-purge

The great python3.8 purge [0] (python < 3.5)
This commit is contained in:
Martin Weinelt 2024-05-17 13:58:23 +02:00 committed by GitHub
commit d0860255a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
51 changed files with 19 additions and 183 deletions

View File

@ -19,8 +19,6 @@ python3Packages.buildPythonApplication rec {
colorama imagesize lxml requests setuptools six
];
disabled = python3Packages.pythonOlder "3.3";
meta = {
description = "A comic strip downloader and archiver";
mainProgram = "dosage";

View File

@ -1,10 +1,10 @@
{ lib, buildPythonApplication, fetchPypi, pythonOlder
{ lib, buildPythonApplication, fetchPypi
, installShellFiles
, mock, pytest, nose
, pyyaml, colorama, docopt
, dockerpty, docker, jsonschema, requests
, six, texttable, websocket-client, cached-property
, enum34, functools32, paramiko, distro, python-dotenv
, paramiko, distro, python-dotenv
}:
buildPythonApplication rec {
@ -24,9 +24,7 @@ buildPythonApplication rec {
pyyaml colorama dockerpty docker
jsonschema requests six texttable websocket-client
docopt cached-property paramiko distro python-dotenv
]
++ lib.optional (pythonOlder "3.4") enum34
++ lib.optional (pythonOlder "3.2") functools32;
];
postPatch = ''
# Remove upper bound on requires, see also

View File

@ -3,15 +3,12 @@
, fetchPypi
, pyserial
, pyudev
, pythonOlder
}:
buildPythonApplication rec {
pname = "rshell";
version = "0.0.32";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8=";

View File

@ -1,10 +1,8 @@
{ buildPythonPackage
, lib
, pythonOlder
, fetchPypi
, setuptools
, six
, enum34
}:
buildPythonPackage rec {
@ -23,8 +21,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
six
] ++ lib.optionals (pythonOlder "3.4") [
enum34
];
# checks use bazel; should be revisited

View File

@ -1,11 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, pytestCheckHook
, setuptools
}:
@ -14,8 +10,6 @@ buildPythonPackage rec {
version = "0.0.95";
pyproject = true;
disabled = pythonOlder "3.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-0gEPXqw99UTsSOwRYQLgaFkaNFsaWA8ylz24pQX8p0Q=";

View File

@ -1,7 +1,6 @@
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, attrs
, pluggy
, six
@ -15,8 +14,6 @@ buildPythonPackage rec {
version = "2.13.5";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-pWkLVfBrLEhdhuTE95K3aqrhEY2wEyo5uRzuJC3ngjE=";

View File

@ -2,8 +2,6 @@
, buildPythonPackage
, fetchFromGitHub
, pycrypto
, pythonOlder
, enum34
, python
}:
@ -21,7 +19,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pycrypto
] ++ lib.optional (pythonOlder "3.4") enum34;
];
checkPhase = ''
${python.interpreter} -m android_backup.tests

View File

@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, pytestCheckHook
}:
@ -9,7 +8,6 @@ buildPythonPackage rec {
pname = "anyascii";
version = "0.3.2";
format = "setuptools";
disabled = pythonOlder "3.3";
src = fetchPypi {
inherit pname version;

View File

@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
numpy,
scipy,
@ -16,10 +15,6 @@ buildPythonPackage rec {
version = "0.6.1";
pyproject = true;
# Python 2 not supported and not some old Python 3 because MPL doesn't support
# them properly.
disabled = pythonOlder "3.4";
src = fetchFromGitHub {
owner = "bayespy";
repo = "bayespy";

View File

@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, docopt
, pytz
@ -16,8 +15,6 @@ buildPythonPackage rec {
version = "1.0.5";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchFromGitHub {
owner = "mjj4791";
repo = "python-buienradar";

View File

@ -1,12 +1,8 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, urllib3
, pyopenssl
, cryptography
, idna
, certifi
}:
@ -15,8 +11,6 @@ buildPythonPackage rec {
version = "0.4.4";
pyproject = true;
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-UCxIDnhIAkxZ1oQXYRyAMdGgUsUZ6AlYXwsxL49TFAg=";

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, pytestCheckHook
}:
@ -9,7 +8,6 @@ buildPythonPackage rec {
pname = "dronecan";
version = "1.0.26";
format = "setuptools";
disabled = pythonOlder "3.3";
src = fetchPypi {
inherit pname version;

View File

@ -2,7 +2,6 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pythonAtLeast
, pytestCheckHook
}:
@ -10,7 +9,6 @@ buildPythonPackage rec {
pname = "dugong";
version = "3.8.1";
format = "setuptools";
disabled = pythonOlder "3.3";
src = fetchFromGitHub {
owner = "python-dugong";

View File

@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, setuptools
}:
@ -10,8 +9,6 @@ buildPythonPackage rec {
version = "0.0.4";
pyproject = true;
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-m7nQzbxRe2qXUWAMeQlDZtc9F01DsbTzF/kI0ci3TFE=";

View File

@ -1,22 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
}:
if isPy3k then null else buildPythonPackage rec {
pname = "functools32";
version = "3.2.3-2";
src = fetchPypi {
inherit pname version;
sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn";
};
meta = with lib; {
description = "This is a backport of the functools standard library module from";
homepage = "https://github.com/MiCHiLU/python-functools32";
license = licenses.psfl;
};
}

View File

@ -2,7 +2,6 @@
, cryptography
, fetchPypi
, lib
, pythonOlder
, protobuf
, pycryptodome
, requests
@ -12,7 +11,6 @@ buildPythonPackage rec {
version = "0.4.4";
format = "setuptools";
pname = "gpapi";
disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3
src = fetchPypi {
inherit version pname;

View File

@ -1,4 +1,4 @@
{ lib, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }:
{ lib, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }:
buildPythonPackage rec {
pname = "hcs-utils";
@ -21,8 +21,6 @@ buildPythonPackage rec {
buildInputs = [ six glibcLocales ];
nativeCheckInputs = [ pytest ];
disabled = pythonOlder "3.4";
meta = with lib; {
description = "Library collecting some useful snippets";
homepage = "https://pypi.python.org/pypi/hcs_utils/1.3";

View File

@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, docopt, pythonOlder }:
{ lib, fetchPypi, buildPythonPackage, docopt }:
buildPythonPackage rec {
pname = "httpserver";
@ -11,9 +11,6 @@ buildPythonPackage rec {
# drivers.
doCheck = false;
# Because it uses asyncio
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv";

View File

@ -1,8 +1,6 @@
{ lib
, pythonOlder
, buildPythonPackage
, fetchPypi
, monotonic
}:
buildPythonPackage rec {
@ -15,8 +13,6 @@ buildPythonPackage rec {
sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc";
};
propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic;
# humanfriendly tests depends on coloredlogs which itself depends on
# humanfriendly. This lead to infinite recursion when trying to
# build this package so we have to disable the test suite :(

View File

@ -1,9 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
}:
@ -12,8 +9,6 @@ buildPythonPackage rec {
version = "0.9";
pyproject = true;
disabled = pythonOlder "3.3";
src = fetchPypi {
pname = "hurry.filesize";
inherit version;

View File

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, python, fetchFromGitHub
, fetchpatch
, cmake, sip4, protobuf, pythonOlder }:
, cmake, sip4, protobuf }:
buildPythonPackage rec {
pname = "libarcus";
@ -23,8 +23,6 @@ buildPythonPackage rec {
})
];
disabled = pythonOlder "3.4";
propagatedBuildInputs = [ sip4 ];
nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ];

View File

@ -2,7 +2,6 @@
, cryptography
, fetchPypi
, lib
, pythonOlder
, protobuf
, pycryptodome
, requests
@ -12,7 +11,6 @@ buildPythonPackage rec {
version = "0.4.4.5";
format = "setuptools";
pname = "matlink-gpapi";
disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3
src = fetchPypi {
inherit version pname;

View File

@ -6,7 +6,6 @@
, gast
, nbconvert
, nbformat
, pythonOlder
, pyyaml
}:
@ -15,8 +14,6 @@ buildPythonPackage rec {
version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-6shwf9BoDfZMy0itP8esNP4ov6fw6LJpO3Y5ZahwDZw=";

View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, mock }:
{ lib, buildPythonPackage, fetchFromGitHub }:
buildPythonPackage rec {
pname = "mock-open";
@ -13,15 +13,6 @@ buildPythonPackage rec {
sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm";
};
patches = lib.optional (pythonOlder "3.0")
(fetchpatch {
name = "ascii-only.patch";
url = "https://github.com/das-g/mock-open/commit/521ff260da127949fe4aceff1667cba223c5b07b.patch";
sha256 = "0ampbhk7kwkn0q5d2h9wrflkr8fji2bybmdck4qdzw1qkslfwwrn";
});
propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock;
meta = with lib; {
homepage = "https://github.com/nivbend/mock-open";
description = "A better mock for file I/O";

View File

@ -5,8 +5,6 @@
, numpy
, pytestCheckHook
, pykka
, enum34
, pythonOlder
, pythonAtLeast
}:
@ -32,8 +30,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
numpy
six
] ++ lib.optionals (pythonOlder "3.4") [
enum34
];
nativeCheckInputs = [

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, azure-core
, azure-identity
, opencensus
@ -14,8 +13,6 @@ buildPythonPackage rec {
version = "1.1.13";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-rsMEchdwBTebpWpwKgl9YYxfV1WOG7ZnbsdflIEwaSo=";

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, attrs
, pytest
@ -11,8 +10,6 @@ buildPythonPackage rec {
pname = "outcome";
version = "1.3.0.post0";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-nc8C5l8pcbgAR7N3Ro5yomjhXArzzxI45v8U9/kRQ7g=";

View File

@ -5,7 +5,6 @@
, pythonOlder
, scandir ? null
, glibcLocales
, mock
, typing
}:
@ -21,8 +20,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ]
++ lib.optionals (pythonOlder "3.5") [ scandir typing ];
nativeCheckInputs = [ glibcLocales ]
++ lib.optional (pythonOlder "3.3") mock;
nativeCheckInputs = [ glibcLocales ];
preCheck = ''
export LC_ALL="en_US.UTF-8"

View File

@ -2,8 +2,6 @@
, buildPythonPackage
, fetchPypi
, path
, pathlib2
, pythonOlder
}:
buildPythonPackage rec {
@ -16,8 +14,7 @@ buildPythonPackage rec {
sha256 = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca";
};
propagatedBuildInputs = [ path ]
++ lib.optional (pythonOlder "3.4") pathlib2;
propagatedBuildInputs = [ path ];
# No proper test suite
doCheck = false;

View File

@ -1,10 +1,9 @@
{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, flake8 }:
{ lib, fetchFromGitHub, buildPythonPackage, flake8 }:
buildPythonPackage rec {
pname = "pure-cdb";
version = "4.0.0";
format = "setuptools";
disabled = pythonOlder "3.4";
# Archive on pypi has no tests.
src = fetchFromGitHub {

View File

@ -4,7 +4,6 @@
, fetchFromGitHub
, morphys
, pytestCheckHook
, pythonOlder
, six
, varint
}:
@ -14,8 +13,6 @@ buildPythonPackage rec {
version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchFromGitHub {
owner = "multiformats";
repo = pname;

View File

@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, krakenex
, pandas
@ -10,8 +9,6 @@ buildPythonPackage rec {
pname = "pykrakenapi";
version = "0.3.2";
disabled = pythonOlder "3.3";
format = "setuptools";
src = fetchFromGitHub {

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, bson
, pytestCheckHook
, pyyaml
@ -12,7 +11,6 @@ buildPythonPackage rec {
pname = "pymarshal";
version = "2.2.0";
format = "setuptools";
disabled = pythonOlder "3.0";
src = fetchFromGitHub {
owner = "stargateaudio";

View File

@ -3,7 +3,6 @@
, buildPythonPackage
, click
, colorama
, enum34
, fetchPypi
, git
, gnugrep
@ -12,7 +11,6 @@
, pbr
, pexpect
, pythonAtLeast
, pythonOlder
, substituteAll
, tree
, xclip
@ -53,7 +51,7 @@ buildPythonPackage rec {
click
colorama
pexpect
] ++ lib.optional (pythonOlder "3.4") enum34;
];
nativeCheckInputs = [ nose ];

View File

@ -3,8 +3,6 @@
, buildPythonPackage
, fetchPypi
, unittestCheckHook
, pythonOlder
, isPy3k
}:
buildPythonPackage rec {
@ -12,9 +10,6 @@ buildPythonPackage rec {
version = "3.5";
format = "setuptools";
# Supports Python 2.7 and 3.4+
disabled = isPy3k && pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-PHfgFBcN//vYFub/wgXphC77EL6fWOwW0+hnW0klzds=";

View File

@ -1,12 +1,10 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, sqlcipher }:
{ lib, buildPythonPackage, fetchPypi, sqlcipher }:
buildPythonPackage rec {
pname = "pysqlcipher3";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-PIAzgSZVlH6/KagJrFEGsrxpvgJ06szva1j0WAyNBsU=";

View File

@ -1,7 +1,6 @@
{ stdenv
, buildPythonPackage
, lib
, python
, fetchPypi
, systemd
, lxml
@ -19,8 +18,6 @@ buildPythonPackage rec {
hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ=";
};
disabled = python.pythonOlder "3.4";
buildInputs = [ systemd ];
nativeBuildInputs = [ pkg-config ];

View File

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
{ lib, buildPythonPackage, fetchFromGitHub
, pytestCheckHook, mock, pytest-cov, coverage
, future, futures ? null, ujson}:
, future, ujson}:
buildPythonPackage rec {
pname = "python-jsonrpc-server";
@ -22,8 +22,7 @@ buildPythonPackage rec {
pytestCheckHook mock pytest-cov coverage
];
propagatedBuildInputs = [ future ujson ]
++ lib.optional (pythonOlder "3.2") futures;
propagatedBuildInputs = [ future ujson ];
meta = with lib; {
homepage = "https://github.com/palantir/python-jsonrpc-server";

View File

@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, twisted
, qtpy
@ -18,8 +17,6 @@ buildPythonPackage rec {
sha256 = "1nb5iwg0nfz86shw28a2kj5pyhd4jvvxhf73fhnfbl8scgnvjv9h";
};
disabled = pythonOlder "3.0";
propagatedBuildInputs = [
twisted qtpy
];

View File

@ -3,7 +3,6 @@
, buildPythonPackage
, fetchPypi
, mock
, pythonOlder
, repeated-test
, setuptools-scm
, sphinx
@ -15,8 +14,6 @@ buildPythonPackage rec {
version = "4.0.1";
format = "pyproject";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw=";

View File

@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, setuptools
}:
@ -10,8 +9,6 @@ buildPythonPackage rec {
version = "1.6.4";
pyproject = true;
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
hash = "sha256-vpxdvY3xKkBLFM2Oldb8AtWMYOJVX2Xd3kF3fEh/s7k=";

View File

@ -3,7 +3,6 @@
, fetchPypi
, hypothesis
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
@ -11,8 +10,6 @@ buildPythonPackage rec {
version = "3.5.3";
format = "setuptools";
disabled = pythonOlder "2.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA=";

View File

@ -2,7 +2,6 @@
, buildPythonPackage
, decorator
, fetchPypi
, pythonOlder
, requests
}:
@ -10,7 +9,6 @@ buildPythonPackage rec {
pname = "stashy";
version = "0.7";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;

View File

@ -1,10 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, nose
, pytestCheckHook
, pythonOlder
, spur
}:
buildPythonPackage rec {
@ -12,8 +8,6 @@ buildPythonPackage rec {
version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchFromGitHub {
owner = "mwilliamson";
repo = pname;

View File

@ -53,7 +53,7 @@ in buildPythonPackage rec {
version = "1.0.5";
format = "setuptools";
disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
disabled = isPyPy || pythonOlder "2.6";
src = fetchPypi {
inherit pname version;

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
# build-system
, flit-core
@ -26,8 +25,6 @@ buildPythonPackage rec {
version = "1.8.0";
format = "pyproject";
disabled = pythonOlder "2.7";
src = fetchFromGitHub {
owner = "wagtail";
repo = "Willow";

View File

@ -2,14 +2,12 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "xmltodict";
version = "0.13.0";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;

View File

@ -6,7 +6,6 @@
python3Packages.buildPythonApplication rec {
pname = "litecli";
version = "1.11.0";
disabled = python3Packages.pythonOlder "3.4";
src = fetchPypi {
inherit pname version;

View File

@ -1,9 +1,8 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }:
{ lib, buildPythonPackage, fetchFromGitHub, systemd, pytest }:
buildPythonPackage rec {
pname = "journalwatch";
version = "1.1.0";
disabled = pythonOlder "3.3";
src = fetchFromGitHub {
owner = "The-Compiler";

View File

@ -184,6 +184,7 @@ mapAliases ({
foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01
functools32 = throw "functool32 was removed from nixpkgs, because python 2.7 has reach end of life in early 2020"; # added 2024-05-16
fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05
garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04
garminconnect-ha = garminconnect; # added 2022-02-05

View File

@ -4570,8 +4570,6 @@ self: super: with self; {
functiontrace = callPackage ../development/python-modules/functiontrace { };
functools32 = callPackage ../development/python-modules/functools32 { };
funcy = callPackage ../development/python-modules/funcy { };
funsor = callPackage ../development/python-modules/funsor { };