Merge pull request #214700 from dotlambda/contextlib2-remove

python3Packages: don't depend on contextlib2

10 files changed, 20 insertions, 61 deletions

diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix
deleted file mode 100644
index 454a972f177b..000000000000
--- a/pkgs/development/python-modules/bedup/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, btrfs-progs
-, contextlib2
-, pyxdg
-, pycparser
-, alembic
-, cffi
-, pythonOlder
-, isPyPy
-}:
-
-buildPythonPackage rec {
-  version = "0.10.1";
-  pname = "bedup";
-  disabled = pythonOlder "3.3";
-
-  src = fetchFromGitHub {
-    owner = "g2p";
-    repo = "bedup";
-    rev = "v${version}";
-    sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6";
-  };
-
-  buildInputs = [ btrfs-progs ];
-  propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ]
-    ++ lib.optionals (!isPyPy) [ cffi ];
-
-  meta = with lib; {
-    description = "Deduplication for Btrfs";
-    longDescription = ''
-      Deduplication for Btrfs. bedup looks for new and changed files,
-      making sure that multiple copies of identical files share space
-      on disk. It integrates deeply with btrfs so that scans are
-      incremental and low-impact.
-    '';
-    homepage = "https://github.com/g2p/bedup";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ bluescreen303 ];
-  };
-}
diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix
index 8a53a9d1d58f..0b420e9362c9 100644
--- a/pkgs/development/python-modules/django_silk/default.nix
+++ b/pkgs/development/python-modules/django_silk/default.nix
@@ -1,7 +1,6 @@
 { lib
 , autopep8
 , buildPythonPackage
-, contextlib2
 , django
 , factory_boy
 , fetchFromGitHub
@@ -72,7 +71,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     freezegun
-    contextlib2
     networkx
     pydot
     factory_boy
diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix
index b9c9e65a4fe6..6e225df0fd90 100644
--- a/pkgs/development/python-modules/duecredit/default.nix
+++ b/pkgs/development/python-modules/duecredit/default.nix
@@ -2,13 +2,11 @@
 , buildPythonPackage
 , fetchPypi
 , isPy27
-, contextlib2
 , pytest
 , pytestCheckHook
 , vcrpy
 , citeproc-py
 , requests
-, setuptools
 , six
 }:
 
@@ -22,10 +20,9 @@ buildPythonPackage rec {
     sha256 = "f6192ce9315b35f6a67174761291e61d0831e496e8ff4acbc061731e7604faf8";
   };
 
-  # bin/duecredit requires setuptools at runtime
-  propagatedBuildInputs = [ citeproc-py requests setuptools six ];
+  propagatedBuildInputs = [ citeproc-py requests six ];
 
-  nativeCheckInputs = [ contextlib2 pytest pytestCheckHook vcrpy ];
+  nativeCheckInputs = [ pytest pytestCheckHook vcrpy ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index c1039db8829c..9fa13391b6ad 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -3,7 +3,6 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, contextlib2
 , cython
 , fuse
 , pkg-config
@@ -29,8 +28,6 @@ buildPythonPackage rec {
 
   buildInputs = [ fuse ];
 
-  propagatedBuildInputs = [ contextlib2 ];
-
   preConfigure = ''
     substituteInPlace setup.py \
         --replace "'pkg-config'" "'${stdenv.cc.targetPrefix}pkg-config'"
diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix
index e2d94ac02561..c020992bee22 100644
--- a/pkgs/development/python-modules/parametrize-from-file/default.nix
+++ b/pkgs/development/python-modules/parametrize-from-file/default.nix
@@ -1,10 +1,10 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , pytestCheckHook
 , coveralls
 , numpy
-, contextlib2
 , decopatch
 , more-itertools
 , nestedtext
@@ -24,6 +24,14 @@ buildPythonPackage rec {
     sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "replace contextlib2-with-contextlib.patch";
+      url = "https://github.com/kalekundert/parametrize_from_file/commit/edee706770a713130da7c4b38b0a07de1bd79c1b.patch";
+      hash = "sha256-VkPKGkYYTB5XCavtEEnFJ+EdNUUhITz/euwlYAPC/tQ=";
+    })
+  ];
+
   # patch out coveralls since it doesn't provide us value
   preBuild = ''
     sed -i '/coveralls/d' ./pyproject.toml
@@ -38,7 +46,6 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    contextlib2
     decopatch
     more-itertools
     nestedtext
diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix
index c095ea9ca921..008813330dc8 100644
--- a/pkgs/development/python-modules/schema/default.nix
+++ b/pkgs/development/python-modules/schema/default.nix
@@ -1,10 +1,10 @@
 { lib
 , buildPythonPackage
-, contextlib2
 , fetchPypi
 , mock
 , pytestCheckHook
 , pythonOlder
+, pythonRelaxDepsHook
 }:
 
 buildPythonPackage rec {
@@ -19,8 +19,12 @@ buildPythonPackage rec {
     hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc=";
   };
 
-  propagatedBuildInputs = [
-    contextlib2
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+
+  pythonRemoveDeps = [
+    "contextlib2"
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5da0e450a5db..34487e55c757 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -126,6 +126,7 @@ mapAliases ({
   bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09
   bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02
   bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22
+  bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
   beetsExternalPlugins = throw "beetsExternalPlugins has been deprecated, use beetsPackages.$pluginname"; # Added 2022-05-07
   beret = throw "beret has been removed"; # Added 2021-11-16
   bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 712cf7c9d738..3d9378286231 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25545,8 +25545,6 @@ with pkgs;
 
   bluez = bluez5;
 
-  inherit (python3Packages) bedup;
-
   bolt = callPackage ../os-specific/linux/bolt { };
 
   bpf-linker = callPackage ../development/tools/bpf-linker { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 9a09ae6663f2..04da6d141ee9 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -41,6 +41,7 @@ mapAliases ({
   asyncio-nats-client = nats-py; # added 2022-02-08
   awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13
   Babel = babel; # added 2022-05-06
+  bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
   bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
   blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
   bsblan = python-bsblan; # added 2022-11-04
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 09b0caa6397b..012367aba708 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1216,8 +1216,6 @@ self: super: with self; {
 
   bech32 = callPackage ../development/python-modules/bech32 { };
 
-  bedup = callPackage ../development/python-modules/bedup { };
-
   behave = callPackage ../development/python-modules/behave { };
 
   bellows = callPackage ../development/python-modules/bellows { };