From c57fbd38c2a132751546a70fcb37751c97395d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 23 Jun 2021 00:14:56 +0200
Subject: [PATCH 1/2] pythonPackages.python-socketio_4: drop

Versioned attributes in python-packages.nix should be avoided.
---
 .../python-modules/python-socketio/4.nix      | 47 -------------------
 pkgs/top-level/python-packages.nix            |  2 -
 2 files changed, 49 deletions(-)
 delete mode 100644 pkgs/development/python-modules/python-socketio/4.nix

diff --git a/pkgs/development/python-modules/python-socketio/4.nix b/pkgs/development/python-modules/python-socketio/4.nix
deleted file mode 100644
index 3a6f5d87fdd4..000000000000
--- a/pkgs/development/python-modules/python-socketio/4.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, bidict
-, buildPythonPackage
-, fetchFromGitHub
-, mock
-, pytestCheckHook
-, python-engineio_3
-}:
-
-buildPythonPackage rec {
-  pname = "python-socketio";
-  version = "4.6.1";
-
-  src = fetchFromGitHub {
-    owner = "miguelgrinberg";
-    repo = "python-socketio";
-    rev = "v${version}";
-    sha256 = "14dijag17v84v0pp9qi89h5awb4h4i9rj0ppkixqv6is9z9lflw5";
-  };
-
-  propagatedBuildInputs = [
-    bidict
-    python-engineio_3
-  ];
-
-  checkInputs = [
-    mock
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [ "socketio" ];
-
-  # pytestCheckHook seems to change the default log level to WARNING, but the
-  # tests assert it is ERROR
-  disabledTests = [ "test_logger" ];
-
-  meta = with lib; {
-    description = "Python Socket.IO server and client 4.x";
-    longDescription = ''
-      Socket.IO is a lightweight transport protocol that enables real-time
-      bidirectional event-based communication between clients and a server.
-    '';
-    homepage = "https://github.com/miguelgrinberg/python-socketio/";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ graham33 ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 29913ff47bc0..156b19bab068 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7031,8 +7031,6 @@ in {
 
   python-socketio = callPackage ../development/python-modules/python-socketio { };
 
-  python-socketio_4 = callPackage ../development/python-modules/python-socketio/4.nix { };
-
   python-socks = callPackage ../development/python-modules/python-socks { };
 
   python-sql = callPackage ../development/python-modules/python-sql { };

From 58f452ecc21e2c3e60ada27614b2f681c62d5290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 23 Jun 2021 00:15:20 +0200
Subject: [PATCH 2/2] pythonPackages.python-engineio_3: drop

Versioned attributes in python-packages.nix should be avoided.
---
 .../python-modules/python-engineio/3.nix      | 69 -------------------
 pkgs/top-level/python-packages.nix            |  2 -
 2 files changed, 71 deletions(-)
 delete mode 100644 pkgs/development/python-modules/python-engineio/3.nix

diff --git a/pkgs/development/python-modules/python-engineio/3.nix b/pkgs/development/python-modules/python-engineio/3.nix
deleted file mode 100644
index f113f47802b7..000000000000
--- a/pkgs/development/python-modules/python-engineio/3.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ lib
-, stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, aiohttp
-, eventlet
-, iana-etc
-, libredirect
-, mock
-, requests
-, six
-, tornado
-, websocket-client
-, websockets
-, pytestCheckHook
-, pythonAtLeast
-}:
-
-buildPythonPackage rec {
-  pname = "python-engineio";
-  version = "3.14.2";
-
-  src = fetchFromGitHub {
-    owner = "miguelgrinberg";
-    repo = "python-engineio";
-    rev = "v${version}";
-    sha256 = "1r3gvizrknbv036pvxid1l726wkb0l43bdaz5y879s7j3ipyb464";
-  };
-
-  propagatedBuildInputs = [
-    six
-  ];
-
-  checkInputs = [
-    aiohttp
-    eventlet
-    mock
-    requests
-    tornado
-    websocket-client
-    websockets
-    pytestCheckHook
-  ];
-
-  preCheck = lib.optionalString stdenv.isLinux ''
-    echo "nameserver 127.0.0.1" > resolv.conf
-    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \
-      LD_PRELOAD=${libredirect}/lib/libredirect.so
-  '';
-  postCheck = ''
-    unset NIX_REDIRECTS LD_PRELOAD
-  '';
-
-  # somehow effective log level does not change?
-  disabledTests = [ "test_logger" ];
-  pythonImportsCheck = [ "engineio" ];
-
-  meta = with lib; {
-    description = "Python based Engine.IO client and server v3.x";
-    longDescription = ''
-      Engine.IO is a lightweight transport protocol that enables real-time
-      bidirectional event-based communication between clients and a server.
-    '';
-    homepage = "https://github.com/miguelgrinberg/python-engineio/";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ graham33 ];
-    broken = stdenv.isDarwin && (pythonAtLeast "3.9");  # See https://github.com/miguelgrinberg/python-socketio/issues/567
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 156b19bab068..b5265a29e3b6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6879,8 +6879,6 @@ in {
 
   python-engineio = callPackage ../development/python-modules/python-engineio { };
 
-  python-engineio_3 = callPackage ../development/python-modules/python-engineio/3.nix { };
-
   python-etcd = callPackage ../development/python-modules/python-etcd { };
 
   python-ethtool = callPackage ../development/python-modules/python-ethtool { };