git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #121094 from wamserma/trollius-remove
commitdbc10ea68bb8de7e2cfedca2a5a2c7f5b82ca2a3 authorSandro <sandro.jaeckel@gmail.com> dateFri 30 Apr 2021, 10:18 (6 years ago) parent411f57eb416756
8 files changed+7−114
pkgs/development/python-modules/aiodns/default.nix+3−4 pkgs/development/python-modules/aioeventlet/default.nix−35 pkgs/development/python-modules/autobahn/default.nix+2−3 pkgs/development/python-modules/pynvim/default.nix+2−3 pkgs/development/python-modules/trollius/default.nix−52 pkgs/development/python-modules/trollius/tests.patch−13 pkgs/top-level/python-packages.nix−2 pkgs/top-level/python2-packages.nix−2
pkgs/development/python-modules/aiodns/default.nix+3−4
@@ -1,11 +1,11 @@
11{ lib, buildPythonPackage, fetchPypi, pythonOlder
2−, isPy27, isPyPy, python, pycares, typing ? null
3−, trollius ? null
2+, python, pycares, typing ? null
43}:
54
65buildPythonPackage rec {
76 pname = "aiodns";
87 version = "2.0.0";
8+ disabled = pythonOlder "3.5";
99
1010 src = fetchPypi {
1111 inherit pname version;
@@ -13,8 +13,7 @@ buildPythonPackage rec {
1313 };
1414
1515 propagatedBuildInputs = [ pycares ]
16− ++ lib.optional (pythonOlder "3.7") typing
17− ++ lib.optional (isPy27 || isPyPy) trollius;
16+ ++ lib.optional (pythonOlder "3.7") typing;
1817
1918 checkPhase = ''
2019 ${python.interpreter} tests.py
pkgs/development/python-modules/aioeventlet/default.nixdeleted−35
@@ -1,35 +0,0 @@
1−{ lib
2−, buildPythonPackage
3−, fetchPypi
4−, eventlet
5−, trollius ? null
6−, mock
7−, python
8−}:
9−
10−buildPythonPackage rec {
11− pname = "aioeventlet";
12− # version is called 0.5.1 on PyPI, but the filename is aioeventlet-0.5.2.tar.gz
13− version = "0.5.2";
14−
15− src = fetchPypi {
16− inherit pname version;
17− sha256 = "cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a";
18− };
19−
20− propagatedBuildInputs = [ eventlet trollius ];
21− buildInputs = [ mock ];
22−
23− # 2 tests error out
24− doCheck = false;
25− checkPhase = ''
26− ${python.interpreter} runtests.py
27− '';
28−
29− meta = with lib; {
30− description = "aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes";
31− homepage = "https://pypi.org/project/aioeventlet/";
32− license = licenses.asl20;
33− };
34−
35−}
pkgs/development/python-modules/autobahn/default.nix+2−3
@@ -1,19 +1,18 @@
11{ lib, buildPythonPackage, fetchPypi, isPy3k,
22 six, txaio, twisted, zope_interface, cffi,
3− trollius ? null, futures ? null,
43 mock, pytest, cryptography, pynacl
54}:
65buildPythonPackage rec {
76 pname = "autobahn";
87 version = "21.3.1";
8+ disabled = !isPy3k;
99
1010 src = fetchPypi {
1111 inherit pname version;
1212 sha256 = "e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03";
1313 };
1414
15− propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++
16− (lib.optionals (!isPy3k) [ trollius futures ]);
15+ propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ];
1716
1817 checkInputs = [ mock pytest ];
1918 checkPhase = ''
pkgs/development/python-modules/pynvim/default.nix+2−3
@@ -4,7 +4,6 @@
44, nose
55, msgpack
66, greenlet
7−, trollius ? null
87, pythonOlder
98, isPyPy
109, pytestrunner
@@ -13,6 +12,7 @@
1312buildPythonPackage rec {
1413 pname = "pynvim";
1514 version = "0.4.3";
15+ disabled = pythonOlder "3.4";
1616
1717 src = fetchPypi {
1818 inherit pname version;
@@ -28,8 +28,7 @@ buildPythonPackage rec {
2828 doCheck = false;
2929
3030 propagatedBuildInputs = [ msgpack ]
31− ++ lib.optional (!isPyPy) greenlet
32− ++ lib.optional (pythonOlder "3.4") trollius;
31+ ++ lib.optional (!isPyPy) greenlet;
3332
3433 meta = {
3534 description = "Python client for Neovim";
pkgs/development/python-modules/trollius/default.nixdeleted−52
@@ -1,52 +0,0 @@
1−{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock, unittest2, six, futures }:
2−
3−buildPythonPackage rec {
4− pname = "trollius";
5− version = "2.2.post1";
6−
7− src = fetchPypi {
8− inherit pname version;
9− sha256 = "06s44k6pcq35vl5j4i2pgkpb848djal818qypcvx44gyn4azjrqn";
10− };
11−
12− checkInputs = [ mock ] ++ lib.optional (!isPy3k) unittest2;
13−
14− propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) futures;
15−
16− patches = [
17− ./tests.patch
18− ];
19−
20− disabled = isPy3k;
21−
22− postPatch = ''
23− # Overrides PYTHONPATH causing dependencies not to be found
24− sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py
25− '' + lib.optionalString stdenv.isDarwin ''
26− # Some of the tests fail on darwin with `error: AF_UNIX path too long'
27− # because of the *long* path names for sockets
28− sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|g" tests/test_events.py
29− sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|g" tests/test_events.py
30− sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|g" tests/test_unix_events.py
31− sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|g" tests/test_unix_events.py
32− sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|g" tests/test_events.py
33− sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|g" tests/test_events.py
34− sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|g" tests/test_events.py
35− sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|g" tests/test_events.py
36− sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|g" tests/test_streams.py
37− sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|g" tests/test_streams.py
38− sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|g" tests/test_streams.py
39− sed -i -e "s|test_pause_reading|skip_test_pause_reading|g" tests/test_subprocess.py
40− sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|g" tests/test_events.py
41− sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|g" tests/test_streams.py
42− sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|g" tests/test_events.py
43− sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py
44− '';
45−
46− meta = with lib; {
47− description = "Port of the asyncio project to Python 2.7";
48− homepage = "https://github.com/vstinner/trollius";
49− license = licenses.asl20;
50− maintainers = with maintainers; [ ];
51− };
52−}
pkgs/development/python-modules/trollius/tests.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git i/tests/test_asyncio.py w/tests/test_asyncio.py
2−index 39d9e1a..05b7e6f 100644
3−--- i/tests/test_asyncio.py
4−+++ w/tests/test_asyncio.py
5−@@ -69,7 +69,7 @@ class AsyncioTests(test_utils.TestCase):
6− def step_future():
7− future = asyncio.Future()
8− self.loop.call_soon(future.set_result, "asyncio.Future")
9−- return (yield from future)
10−+ return (yield From(future))
11−
12− # test in release mode
13− trollius.coroutines._DEBUG = False
pkgs/top-level/python-packages.nix−2
@@ -247,8 +247,6 @@ in {
247247
248248 aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { };
249249
250− aioeventlet = callPackage ../development/python-modules/aioeventlet { };
251−
252250 aioextensions = callPackage ../development/python-modules/aioextensions { };
253251
254252 aiofiles = callPackage ../development/python-modules/aiofiles { };
pkgs/top-level/python2-packages.nix−2
@@ -604,8 +604,6 @@ with self; with super; {
604604
605605 traitlets = callPackage ../development/python-modules/traitlets/4.nix { };
606606
607− trollius = callPackage ../development/python-modules/trollius { };
608−
609607 ttystatus = callPackage ../development/python-modules/ttystatus { };
610608
611609 TurboCheetah = callPackage ../development/python-modules/TurboCheetah { };