BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #121094 from wamserma/trollius-remove

Browse source
This commit is contained in:
Sandro 2021-04-30 10:18:33 +02:00 committed by GitHub
commit dbc10ea68b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 7 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/python-modules/aiodns/default.nix
View file

@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder
, isPy27, isPyPy, python, pycares, typing ? null
, trollius ? null
, python, pycares, typing ? null
}:
buildPythonPackage rec {
pname = "aiodns";
version = "2.0.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
@ -13,8 +13,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ pycares ]
++ lib.optional (pythonOlder "3.7") typing
++ lib.optional (isPy27 || isPyPy) trollius;
++ lib.optional (pythonOlder "3.7") typing;
checkPhase = ''
${python.interpreter} tests.py

35
pkgs/development/python-modules/aioeventlet/default.nix
View file

@ -1,35 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, eventlet
, trollius ? null
, mock
, python
}:
buildPythonPackage rec {
pname = "aioeventlet";
# version is called 0.5.1 on PyPI, but the filename is aioeventlet-0.5.2.tar.gz
version = "0.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a";
};
propagatedBuildInputs = [ eventlet trollius ];
buildInputs = [ mock ];
# 2 tests error out
doCheck = false;
checkPhase = ''
${python.interpreter} runtests.py
'';
meta = with lib; {
description = "aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes";
homepage = "https://pypi.org/project/aioeventlet/";
license = licenses.asl20;
};
}

5
pkgs/development/python-modules/autobahn/default.nix
View file

@ -1,19 +1,18 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k,
six, txaio, twisted, zope_interface, cffi,
trollius ? null, futures ? null,
mock, pytest, cryptography, pynacl
}:
buildPythonPackage rec {
pname = "autobahn";
version = "21.3.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03";
};
propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++
(lib.optionals (!isPy3k) [ trollius futures ]);
propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ];
checkInputs = [ mock pytest ];
checkPhase = ''

5
pkgs/development/python-modules/pynvim/default.nix
View file

@ -4,7 +4,6 @@
, nose
, msgpack
, greenlet
, trollius ? null
, pythonOlder
, isPyPy
, pytestrunner
@ -13,6 +12,7 @@
buildPythonPackage rec {
pname = "pynvim";
version = "0.4.3";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
@ -28,8 +28,7 @@ buildPythonPackage rec {
doCheck = false;
propagatedBuildInputs = [ msgpack ]
++ lib.optional (!isPyPy) greenlet
++ lib.optional (pythonOlder "3.4") trollius;
++ lib.optional (!isPyPy) greenlet;
meta = {
description = "Python client for Neovim";

52
pkgs/development/python-modules/trollius/default.nix
View file

@ -1,52 +0,0 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock, unittest2, six, futures }:
buildPythonPackage rec {
pname = "trollius";
version = "2.2.post1";
src = fetchPypi {
inherit pname version;
sha256 = "06s44k6pcq35vl5j4i2pgkpb848djal818qypcvx44gyn4azjrqn";
};
checkInputs = [ mock ] ++ lib.optional (!isPy3k) unittest2;
propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) futures;
patches = [
./tests.patch
];
disabled = isPy3k;
postPatch = ''
# Overrides PYTHONPATH causing dependencies not to be found
sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py
'' + lib.optionalString stdenv.isDarwin ''
# Some of the tests fail on darwin with `error: AF_UNIX path too long'
# because of the *long* path names for sockets
sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|g" tests/test_events.py
sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|g" tests/test_events.py
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
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
sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|g" tests/test_events.py
sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|g" tests/test_events.py
sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|g" tests/test_events.py
sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|g" tests/test_events.py
sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|g" tests/test_streams.py
sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|g" tests/test_streams.py
sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|g" tests/test_streams.py
sed -i -e "s|test_pause_reading|skip_test_pause_reading|g" tests/test_subprocess.py
sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|g" tests/test_events.py
sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|g" tests/test_streams.py
sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|g" tests/test_events.py
sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py
'';
meta = with lib; {
description = "Port of the asyncio project to Python 2.7";
homepage = "https://github.com/vstinner/trollius";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
}

13
pkgs/development/python-modules/trollius/tests.patch
View file

@ -1,13 +0,0 @@
diff --git i/tests/test_asyncio.py w/tests/test_asyncio.py
index 39d9e1a..05b7e6f 100644
--- i/tests/test_asyncio.py
+++ w/tests/test_asyncio.py
@@ -69,7 +69,7 @@ class AsyncioTests(test_utils.TestCase):
def step_future():
future = asyncio.Future()
self.loop.call_soon(future.set_result, "asyncio.Future")
- return (yield from future)
+ return (yield From(future))
# test in release mode
trollius.coroutines._DEBUG = False

2
pkgs/top-level/python-packages.nix
View file

@ -247,8 +247,6 @@ in {
aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { };
aioeventlet = callPackage ../development/python-modules/aioeventlet { };
aioextensions = callPackage ../development/python-modules/aioextensions { };
aiofiles = callPackage ../development/python-modules/aiofiles { };

2
pkgs/top-level/python2-packages.nix
View file

@ -604,8 +604,6 @@ with self; with super; {
traitlets = callPackage ../development/python-modules/traitlets/4.nix { };
trollius = callPackage ../development/python-modules/trollius { };
ttystatus = callPackage ../development/python-modules/ttystatus { };
TurboCheetah = callPackage ../development/python-modules/TurboCheetah { };