From a3f0b7bfefee8e0b7c01785d549fd48701e4388a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:37:57 -0700 Subject: [PATCH 01/17] pythonPackages.sphinxcontrib-qthelp: disable python2 --- .../development/python-modules/sphinxcontrib-qthelp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 60b8a06510f..f8e826adf1f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,11 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; version = "1.0.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 6e18a2f743e832c706d5c0e1c9d3517b347a0fc9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:38:50 -0700 Subject: [PATCH 02/17] Revert "python: wsproto: 0.14.1 -> 0.15.0" This reverts commit 3dc390f7105763ba8348b79c38fbf7b718f173d1. --- pkgs/development/python-modules/wsproto/0.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix index 79a66d2e4b1..a8488d8c4ab 100644 --- a/pkgs/development/python-modules/wsproto/0.14.nix +++ b/pkgs/development/python-modules/wsproto/0.14.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wsproto"; - version = "0.15.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "614798c30e5dc2b3f65acc03d2d50842b97621487350ce79a80a711229edfa9d"; + sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; }; propagatedBuildInputs = [ h11 enum34 ]; From 70e2f0805f9b3042fdd52450e85d12deeb846ea2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:41:26 -0700 Subject: [PATCH 03/17] python2Packages.venusian: disable python2 --- pkgs/development/python-modules/venusian/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 8817b057cc9..06f0d55acf0 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , pytest , pytestcov }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "venusian"; version = "3.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 613d8f115074deaef0cc7080b57300ab0abba16f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:42:31 -0700 Subject: [PATCH 04/17] python2Packages.sorl_thumbnail: disable python2 --- pkgs/development/python-modules/sorl_thumbnail/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index 6aaabaf19d9..f62af59c4ed 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -1,12 +1,14 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , setuptools_scm }: buildPythonPackage rec { pname = "sorl-thumbnail"; version = "12.6.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 164d61f1b79be5bcb6ccb5cdeb8eaed23187f844 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:43:16 -0700 Subject: [PATCH 05/17] python2Packages.bip_utils: disable python2 ``` Processing ./bip_utils-1.0.5-py2-none-any.whl ERROR: Package 'bip-utils' requires a different Python: 2.7.18 not in '>=3.6' ``` --- pkgs/development/python-modules/bip_utils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index c178550eb04..ff4fae389cd 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , ecdsa , pysha3 }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "bip_utils"; version = "1.0.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From 9b31b18d6ed974e9505eb39147e17c9ab7c39dbd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:44:41 -0700 Subject: [PATCH 06/17] python2Packages.sphinxcontrib-applehelp: disable python2 ``` Processing ./sphinxcontrib_applehelp-1.0.2-py2.py3-none-any.whl ERROR: Package 'sphinxcontrib-applehelp' requires a different Python: 2.7.18 not in '>=3.5' ``` --- .../python-modules/sphinxcontrib-applehelp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index f90ed55ee34..95aa0c5fdeb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,11 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; version = "1.0.2"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 1676e5efbc955380b739288e8eab0ad8273fa633 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:45:41 -0700 Subject: [PATCH 07/17] python2Packages.sphinxcontrib-htmlhelp: disable python2 ``` Processing ./sphinxcontrib_htmlhelp-1.0.3-py2.py3-none-any.whl ERROR: Package 'sphinxcontrib-htmlhelp' requires a different Python: 2.7.18 not in '>=3.5 ``` --- .../python-modules/sphinxcontrib-htmlhelp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 859181d675f..8eec8ab3267 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,11 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; version = "1.0.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; From ae67ea49c5d8e8388571d54ef7c7749e301164b6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:46:27 -0700 Subject: [PATCH 08/17] python2Packages.sphinxcontrib-serializinghtml: disable python2 ``` Processing ./sphinxcontrib_serializinghtml-1.1.4-py2.py3-none-any.whl ERROR: Package 'sphinxcontrib-serializinghtml' requires a different Python: 2.7.18 not in '>=3.5' ``` --- .../python-modules/sphinxcontrib-serializinghtml/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 5a5c0e3df6f..05f2749c49d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,11 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; version = "1.1.4"; + disabled = isPy27; src = fetchPypi { inherit pname version; From dcef1818a0bb8cf0491bcdcf23d5566c4f7bd80c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:49:13 -0700 Subject: [PATCH 09/17] python2Packages.python-igraph: disable python2 --- pkgs/development/python-modules/python-igraph/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 12a327be2a6..d67ec59f3ac 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "python-igraph"; version = "0.8.2"; + disabled = !isPy3k; # fails to build nativeBuildInputs = [ pkgconfig ]; buildInputs = [ igraph ]; From f9dadbac5041b8c0a482ab57edac3dce633a551e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:54:31 -0700 Subject: [PATCH 10/17] python2Packages.yappi: disable python2 --- pkgs/development/python-modules/yappi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 5bb1abd98ce..e0be34a2d31 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ lib, buildPythonPackage, fetchPypi, isPy27, nose }: buildPythonPackage rec { pname = "yappi"; version = "1.2.5"; + disabled = isPy27; # invalid syntax src = fetchPypi { inherit pname version; From 7f6d634d04414965dbfd03de4659446cc58b1e7d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:56:27 -0700 Subject: [PATCH 11/17] python2Packages.pytest-testmon: disable python2 ``` Processing ./pytest_testmon-1.0.2-py2-none-any.whl ERROR: Package 'pytest-testmon' requires a different Python: 2.7.18 not in '>=3.6' ``` --- pkgs/development/python-modules/pytest-testmon/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 3b649bea57d..9d9add16782 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , coverage , pytest }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "pytest-testmon"; version = "1.0.2"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From a627278e13ea8df24a9cd011ea5b65f5dca96a01 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 15:57:33 -0700 Subject: [PATCH 12/17] python2Packages.pyvcd: disable python2 ``` Processing ./pyvcd-0.2.3-py2.py3-none-any.whl ERROR: Package 'pyvcd' requires a different Python: 2.7.18 not in '>=3.6' ``` --- pkgs/development/python-modules/pyvcd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 4a11abfcaa4..11fe52d553a 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , setuptools_scm , six , pytest @@ -9,6 +10,7 @@ buildPythonPackage rec { version = "0.2.3"; pname = "pyvcd"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From a2ba14e6ff964795cadd6d53b5606593fe079a1c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 16:00:22 -0700 Subject: [PATCH 13/17] python2Packages.rq: disable python2 ``` Processing ./rq-1.4.3-py2.py3-none-any.whl ERROR: Package 'rq' requires a different Python: 2.7.18 not in '>=3.4' ``` --- pkgs/development/python-modules/rq/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index c59fac9c48c..23d8444c506 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchPypi, buildPythonPackage, click, redis }: +{ stdenv, fetchPypi, buildPythonPackage, isPy27, click, redis }: buildPythonPackage rec { pname = "rq"; version = "1.4.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; From be127b0944c039045a28b9305b060f32d3184048 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 16:04:02 -0700 Subject: [PATCH 14/17] pythonPackages.pytestquickcheck: mark broken ``` WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError(': Failed to establish a new connection: [Errno -2] Name or service not known',)': /simple/pytest-codestyle/ ERROR: Could not find a version that satisfies the requirement pytest-codestyle (from versions: none) ERROR: No matching distribution found for pytest-codestyle ``` --- pkgs/development/python-modules/pytest-quickcheck/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 0748da14d93..ec78329ff8d 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -15,5 +15,6 @@ buildPythonPackage rec { license = licenses.asl20; homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; + broken = true; # missing pytest-codestyle }; } From 25abd3a680071b12411e7e48f4026a61f2dcc138 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 16:05:43 -0700 Subject: [PATCH 15/17] pythonPackages.mox3: disable python2 ``` Processing ./mox3-1.1.0-py2-none-any.whl ERROR: Package 'mox3' requires a different Python: 2.7.18 not in '>=3.6' ``` --- pkgs/development/python-modules/mox3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index b3e1f9e6011..70b982ef4b8 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, pythonOlder , python , subunit , testrepository @@ -14,6 +15,7 @@ buildPythonPackage rec { pname = "mox3"; version = "1.1.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From 0cde253727fc0f886418e43ef85937d9e7313db4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 16:17:59 -0700 Subject: [PATCH 16/17] pythonPackages.gspread: mark broken, missing many deps --- pkgs/development/python-modules/gspread/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 4cb2d1f9b67..5c9c644abd3 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , requests +, google_auth }: buildPythonPackage rec { @@ -19,6 +20,8 @@ buildPythonPackage rec { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; + # missing multiple google libraries + broken = true; # 2020-08-15 }; # No tests included From dd235efed02edcd01567189dbdcc78b7ffd2a75a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 16:20:32 -0700 Subject: [PATCH 17/17] pythonPackages.pymystem3: skip tests py2 --- pkgs/development/python-modules/pymystem3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix index 2b00dd7951d..8c909b868b3 100644 --- a/pkgs/development/python-modules/pymystem3/default.nix +++ b/pkgs/development/python-modules/pymystem3/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, isPy3k , requests , flake8 , mock @@ -19,6 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; checkInputs = [ flake8 mock pytest ]; + doCheck = isPy3k; # fails on linting postPatch = '' sed -i 's#^_mystem_info = .*#_mystem_info = ["${mystem}/bin", "${mystem}/bin/mystem"]#' pymystem3/constants.py