From a050391994b914fb08037404f6045cefe457e948 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 08:44:33 +0100 Subject: [PATCH 01/12] python3Packages.python-engineio: 3.13.2 -> 4.0.0 --- .../python-modules/python-engineio/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index a74ee0455f2f..ed998999276d 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv +, buildPythonPackage +, fetchFromGitHub , aiohttp , eventlet , iana-etc @@ -14,19 +16,15 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "3.13.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "1hn5nnxp7y2dpf52vrwdxza2sqmzj8admcnwgjkmcxk65s2dhvy1"; + sha256 = "00x9pmmnl1yd59wd96ivkiqh4n5nphl8cwk43hf4nqr0icgsyhar"; }; - propagatedBuildInputs = [ - six - ]; - checkInputs = [ aiohttp eventlet From a47a63c0fbad06a145793c5eca01e58e89f32c44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 08:45:39 +0100 Subject: [PATCH 02/12] python3Packages.python-engineio: add pythonImportsCheck --- pkgs/development/python-modules/python-engineio/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index ed998999276d..0cbf374c2a52 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { # somehow effective log level does not change? disabledTests = [ "test_logger" ]; + pythonImportsCheck = [ "engineio" ]; meta = with stdenv.lib; { description = "Engine.IO server"; From aeebcd7c8ad432077f3c085763219944df2f4bff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 08:46:33 +0100 Subject: [PATCH 03/12] python3Packages.python-engineio: update attributes --- .../python-modules/python-engineio/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 0cbf374c2a52..ecbdb73abc06 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -48,9 +48,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "engineio" ]; meta = with stdenv.lib; { - description = "Engine.IO server"; + description = "Python based Engine.IO client and server"; + 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 = licenses.mit; - maintainers = [ maintainers.mic92 ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ mic92 ]; }; } From 61123bd5baed0e48ac527f62d942cc9530125dbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 08:50:07 +0100 Subject: [PATCH 04/12] python3Packages.python-socketio: 4.6.1 -> 5.0.4 --- pkgs/development/python-modules/python-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index cfa260205715..fc6d67fec97e 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "4.6.1"; + version = "5.0.4"; src = fetchPypi { inherit pname version; - sha256 = "cd1f5aa492c1eb2be77838e837a495f117e17f686029ebc03d62c09e33f4fa10"; + sha256 = "0gl9ja1lcppj83bj9452cx6x7das37k4lbq6j82afxczppax0gzm"; }; propagatedBuildInputs = [ From 9630d39b883af93c7f6283f2bc5ae510667dff22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 08:52:26 +0100 Subject: [PATCH 05/12] python3Packages.python-socketio: use GitHub source --- .../python-modules/python-socketio/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index fc6d67fec97e..3ab8a8923dcc 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage -, fetchPypi -, six +, fetchFromGitHub +, bidict , python-engineio , mock }: @@ -10,13 +10,15 @@ buildPythonPackage rec { pname = "python-socketio"; version = "5.0.4"; - src = fetchPypi { - inherit pname version; - sha256 = "0gl9ja1lcppj83bj9452cx6x7das37k4lbq6j82afxczppax0gzm"; + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "python-socketio"; + rev = "v${version}"; + sha256 = "0mpqr53mrdzk9ki24y1inpsfvjlvm7pvxf8q4d52m80i5pcd5v5q"; }; propagatedBuildInputs = [ - six + bidict python-engineio ]; From 8e586c90a84b26d0f0c3178753b1ed1a7d9074b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 08:54:30 +0100 Subject: [PATCH 06/12] python3Packages.python-socketio: enable tests --- .../python-modules/python-socketio/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 3ab8a8923dcc..c46b02c16b9c 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -1,9 +1,10 @@ { lib +, bidict , buildPythonPackage , fetchFromGitHub -, bidict -, python-engineio , mock +, pytestCheckHook +, python-engineio }: buildPythonPackage rec { @@ -22,9 +23,10 @@ buildPythonPackage rec { python-engineio ]; - checkInputs = [ mock ]; - # tests only on github, but latest github release not tagged - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; meta = with lib; { description = "Socket.IO server"; From 1a2e6747c4b5de553b22942f15e97f8a51af4cd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 08:55:27 +0100 Subject: [PATCH 07/12] python3Packages.python-socketio: add pythonImportsCheck --- pkgs/development/python-modules/python-socketio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index c46b02c16b9c..adfe6589ff4a 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "socketio" ]; + meta = with lib; { description = "Socket.IO server"; homepage = "https://github.com/miguelgrinberg/python-socketio/"; From e391e058e043058b93af18df292706d95d2ab02b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 09:01:15 +0100 Subject: [PATCH 08/12] python3Packages.python-socketio: update attributes --- .../python-modules/python-socketio/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index adfe6589ff4a..64386e83f694 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -1,4 +1,4 @@ -{ lib +{ stdenv , bidict , buildPythonPackage , fetchFromGitHub @@ -30,10 +30,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "socketio" ]; - meta = with lib; { - description = "Socket.IO server"; - homepage = "https://github.com/miguelgrinberg/python-socketio/"; - license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + meta = with stdenv.lib; { + description = "Python Socket.IO server and client"; + 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-engineio/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ mic92 ]; }; } From d93ba0bb617990ea511d4d9c066324aab60e73dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 09:06:55 +0100 Subject: [PATCH 09/12] python3Packages.flask-socketio: 4.3.2 -> 5.0.1 --- pkgs/development/python-modules/flask-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 80f6edb79d35..85e2fadf1863 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "4.3.2"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "37001b3507f2fa5d1c8d9c8e211dd88da6c5286ff0ebce16f27cb1b467d25d68"; + sha256 = "09r2gpj2nbn72v2zaf6xsvlazln77pgqzp2pg2021nja47sijhsw"; }; propagatedBuildInputs = [ From 29dd4e226981ad67c5a6f50a998ba49be905073d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 09:09:50 +0100 Subject: [PATCH 10/12] python3Packages.flask-socketio: use GitHub source --- .../python-modules/flask-socketio/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 85e2fadf1863..6a0228098e9e 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , flask , python-socketio , coverage @@ -10,9 +10,11 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; version = "5.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "09r2gpj2nbn72v2zaf6xsvlazln77pgqzp2pg2021nja47sijhsw"; + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "Flask-SocketIO"; + rev = "v${version}"; + sha256 = "01zf6cy95pgc4flgn0740z2my90l7rxwliahp6rb2xbp7rh32cng"; }; propagatedBuildInputs = [ From 328040d127ff0e0a3f658b2a9fb08e81a082fef3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 09:11:34 +0100 Subject: [PATCH 11/12] python3Packages.flask-socketio: enable tests --- .../python-modules/flask-socketio/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 6a0228098e9e..85e5b5d3189d 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage +, coverage , fetchFromGitHub , flask +, pytestCheckHook , python-socketio -, coverage }: buildPythonPackage rec { @@ -22,9 +23,10 @@ buildPythonPackage rec { python-socketio ]; - checkInputs = [ coverage ]; - # tests only on github, but lates release there is not tagged - doCheck = false; + checkInputs = [ + coverage + pytestCheckHook + ]; meta = with lib; { description = "Socket.IO integration for Flask applications"; From 8a7202c7832f28cf632fe1b7021160af62045427 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Jan 2021 09:12:50 +0100 Subject: [PATCH 12/12] python3Packages.flask-socketio: add pythonImportsCheck --- pkgs/development/python-modules/flask-socketio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 85e5b5d3189d..496676600fc9 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "flask_socketio" ]; + meta = with lib; { description = "Socket.IO integration for Flask applications"; homepage = "https://github.com/miguelgrinberg/Flask-SocketIO/";