public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-04-30 12:26:14 +00:00
committed by GitHub
parent 6cba9af2c9 450d9147e7
commit d7882499f8
59 changed files with 741 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/aiodns/default.nix
+3 -4
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
pkgs/development/python-modules/aioeventlet/default.nix
-35
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;
};
}
pkgs/development/python-modules/autobahn/default.nix
+2 -3
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 = ''
pkgs/development/python-modules/btrfs/default.nix
+6 -8
View File
@@ -1,17 +1,15 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
}:
buildPythonPackage rec {
pname = "btrfs";
version = "12";
version = "13";
src = fetchFromGitHub {
owner = "knorrie";
repo = "python-btrfs";
rev = "v${version}";
sha256 = "sha256-ZQSp+pbHABgBTrCwC2YsUUXAf/StP4ny7MEhBgCRqgE=";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NSyzhpHYDkunuU104XnbVCcVRNDoVBz4KuJRrE7WMO0=";
};
# no tests (in v12)
@@ -23,6 +21,6 @@ buildPythonPackage rec {
homepage = "https://github.com/knorrie/python-btrfs";
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.evils ];
maintainers = with maintainers; [ evils Luflosi ];
};
}
pkgs/development/python-modules/cryptography/default.nix
+1 -1
View File
@@ -33,7 +33,7 @@ buildPythonPackage rec {
inherit src;
sourceRoot = "${pname}-${version}/${cargoRoot}";
name = "${pname}-${version}";
sha256 = "1wisxmq26b8ml144m2458sgcbk8jpv419j01qmffsrfy50x9i1yw";
sha256 = "1m6smky4nahwlp4hn6yzibrcxlbsw4nx162dsq48vlw8h1lgjl62";
};
cargoRoot = "src/rust";
pkgs/development/python-modules/graphql-core/default.nix
+9 -15
View File
@@ -1,27 +1,21 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchFromGitHub
, lib
, pythonOlder
, coveralls
, promise
, pytestCheckHook
, pytest-benchmark
, pytest-mock
, rx
, six
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "graphql-core";
version = "3.1.3";
version = "3.1.4";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "graphql-python";
repo = pname;
rev = "v${version}";
sha256 = "0qy1i6vffwad74ymdsh1qjf5b6ph4z0vyxzkkc6yppwczhzmi1ps";
sha256 = "sha256-lamV5Rd37WvFBJ+zJUb+UhqxoNUrRhoMJx1NodbQUjs=";
};
checkInputs = [
@@ -29,12 +23,12 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "graphql" ];
meta = with lib; {
description = "Port of graphql-js to Python";
homepage = "https://github.com/graphql-python/graphql-core";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
maintainers = with maintainers; [ kamadorueda ];
};
}
pkgs/development/python-modules/gym/default.nix
+21 -8
View File
@@ -1,19 +1,32 @@
{ lib
, buildPythonPackage, fetchPypi
, numpy, requests, six, pyglet, scipy, cloudpickle
, buildPythonPackage
, fetchFromGitHub
, numpy
, requests
, pyglet
, scipy
, pillow
, cloudpickle
}:
buildPythonPackage rec {
pname = "gym";
version = "0.18.0";
version = "0.18.1";
src = fetchPypi {
inherit pname version;
sha256 = "a0dcd25c1373f3938f4cb4565f74f434fba6faefb73a42d09c9dddd0c08af53e";
src = fetchFromGitHub {
owner = "openai";
repo = pname;
rev = version;
sha256 = "0mv4af2y9d1y97bsda94f21nis2jm1zkzv7c806vmvzh5s4r8nfn";
};
propagatedBuildInputs = [
numpy requests six pyglet scipy cloudpickle
cloudpickle
numpy
pillow
pyglet
requests
scipy
];
# The test needs MuJoCo that is not free library.
@@ -22,7 +35,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "gym" ];
meta = with lib; {
description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents";
description = "A toolkit for developing and comparing your reinforcement learning agents";
homepage = "https://gym.openai.com/";
license = licenses.mit;
maintainers = with maintainers; [ hyphon81 ];
pkgs/development/python-modules/karton-config-extractor/default.nix
+5 -3
View File
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "karton-config-extractor";
version = "1.0.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "1v0zqa81yjz6hm17x9hp0iwkllymqzn84dd6r2yrhillbwnjg9bb";
sha256 = "14592b9vq2iza5agxr29z1mh536if7a9p9hvyjnibsrv22mzwz7l";
};
propagatedBuildInputs = [
@@ -23,7 +23,9 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "karton.core==4.0.5" "karton-core"
--replace "karton-core==4.2.0" "karton-core"
substituteInPlace requirements.txt \
--replace "malduck==4.1.0" "malduck"
'';
# Project has no tests
pkgs/development/python-modules/karton-yaramatcher/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "karton-yaramatcher";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "093h5hbx2ss4ly523gvf10a5ky3vvin6wipigvhx13y1rdxl6c9n";
sha256 = "0yb9l5z826zli5cpcj234dmjdjha2g1lcwxyvpxm95whkhapc2cf";
};
propagatedBuildInputs = [
pkgs/development/python-modules/poetry/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'importlib-metadata = {version = "^1.6.0", python = "<3.8"}' \
'importlib-metadata = {version = ">=1.6,<2", python = "<3.8"}' \
'importlib-metadata = {version = ">=1.6", python = "<3.8"}' \
--replace 'version = "^21.2.0"' 'version = ">=21.2"'
'';
pkgs/development/python-modules/pynvim/default.nix
+2 -3
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";
pkgs/development/python-modules/pypiserver/default.nix
+40
View File
@@ -0,0 +1,40 @@
{ buildPythonPackage, fetchFromGitHub, lib, passlib, pytestCheckHook, setuptools
, setuptools-git, twine, webtest }:
buildPythonPackage rec {
pname = "pypiserver";
version = "1.4.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1z5rsmqgin98m6ihy1ww42fxxr6jb4hzldn8vlc9ssv7sawdz8vz";
};
nativeBuildInputs = [ setuptools-git ];
propagatedBuildInputs = [ setuptools ];
preCheck = ''
export HOME=$TMPDIR
'';
checkInputs = [ passlib pytestCheckHook twine webtest ];
# These tests try to use the network
disabledTests = [
"test_pipInstall_openOk"
"test_pipInstall_authedOk"
"test_hash_algos"
];
pythonImportsCheck = [ "pypiserver" ];
meta = with lib; {
homepage = "https://github.com/pypiserver/pypiserver";
description = "Minimal PyPI server for use with pip/easy_install";
license = with licenses; [ mit zlib ];
maintainers = [ maintainers.austinbutler ];
};
}
pkgs/development/python-modules/pytest-helpers-namespace/default.nix
+13 -15
View File
@@ -1,30 +1,28 @@
{ buildPythonPackage
, fetchFromGitHub
, pytest
, fetchPypi
, pytestCheckHook
, isPy27
, lib
, setuptools
, setuptools-declarative-requirements
, setuptools-scm
}:
buildPythonPackage rec {
pname = "pytest-helpers-namespace";
version = "2021.3.24";
disabled = isPy27;
src = fetchFromGitHub {
owner = "saltstack";
repo = pname;
rev = version;
sha256 = "0ikwiwp9ycgg7px78nxdkqvg7j97krb6vzqlb8fq8fvbwrj4q4v2";
src = fetchPypi {
inherit pname version;
sha256 = "0pyj2d45zagmzlajzqdnkw5yz8k49pkihbydsqkzm413qnkzb38q";
};
buildInputs = [ pytest ];
nativeBuildInputs = [ setuptools setuptools-declarative-requirements setuptools-scm ];
checkInputs = [ pytest ];
checkInputs = [ pytestCheckHook ];
checkPhase = ''
pytest
'';
# The tests fail with newest pytest. They passed with pytest_3, which no longer exists
doCheck = false;
pythonImportsCheck = [ "pytest_helpers_namespace" ];
meta = with lib; {
homepage = "https://github.com/saltstack/pytest-helpers-namespace";
pkgs/development/python-modules/setuptools-declarative-requirements/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ buildPythonPackage, fetchPypi, lib, pypiserver, pytestCheckHook
, setuptools-scm, virtualenv }:
buildPythonPackage rec {
pname = "setuptools-declarative-requirements";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "1l8zmcnp9h8sp8hsw7b81djaa1a9yig0y7i4phh5pihqz1gdn7yi";
};
buildInputs = [ setuptools-scm ];
checkInputs = [ pypiserver pytestCheckHook virtualenv ];
# Tests use network
doCheck = false;
pythonImportsCheck = [ "declarative_requirements" ];
meta = with lib; {
homepage = "https://github.com/s0undt3ch/setuptools-declarative-requirements";
description = "Declarative setuptools Config Requirements Files Support";
license = licenses.asl20;
maintainers = [ maintainers.austinbutler ];
};
}
pkgs/development/python-modules/trollius/default.nix
-52
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; [ ];
};
}
pkgs/development/python-modules/trollius/tests.patch
-13
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