diff options
Diffstat (limited to 'pkgs/development/python-modules')
4 files changed, 44 insertions, 29 deletions
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index b25f0b12156..971b811a221 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -1,5 +1,5 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage , pythonOlder , withVoice ? true, libopus @@ -10,34 +10,45 @@ buildPythonPackage rec { pname = "discord.py"; - version = "1.2.4"; + version = "1.2.5"; + disabled = pythonOlder "3.5.3"; - src = fetchPypi { - inherit pname version; - sha256 = "3e044d84f0bb275d173e2d958cb4a579e525707f90e3e8a15c59901f79e80663"; + # only distributes wheels on pypi now + src = fetchFromGitHub { + owner = "Rapptz"; + repo = pname; + rev = "v${version}"; + sha256 = "17l6mlfi9ikqndpmi4pwlvb53g132cycyfm9nzdyiqr96k8ly4ig"; }; - propagatedBuildInputs = [ aiohttp websockets pynacl ]; + propagatedBuildInputs = [ aiohttp websockets ]; patchPhase = '' substituteInPlace "requirements.txt" \ - --replace "aiohttp>=1.0.0,<1.1.0" "aiohttp" + --replace "aiohttp>=3.3.0,<3.6.0" "aiohttp~=3.3" \ + --replace "websockets>=6.0,<7.0" "websockets>=6" '' + lib.optionalString withVoice '' substituteInPlace "discord/opus.py" \ --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" ''; - disabled = pythonOlder "3.5"; - # No tests in archive + # only have integration tests with discord doCheck = false; + pythonImportsCheck = [ + "discord" + "discord.file" + "discord.member" + "discord.user" + "discord.state" + "discord.guild" + "discord.webhook" + "discord.ext.commands.bot" + ]; + meta = { description = "A python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; license = lib.licenses.mit; - - # discord.py requires websockets<4.0 - # See https://github.com/Rapptz/discord.py/issues/973 - broken = true; }; } diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index fdc6f4e59cc..bb57c0fbf96 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "1x18yqxa6a884j0ip92kgl5s8c77z6f4pvnq6q4lzisyffkyq6c7"; + sha256 = "0idm73k144lk4aw07r8gwxlb0281j09d6l16a0nrn82r36lwq9fy"; }; propagatedBuildInputs = [ future requests python-dateutil ]; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index d3b12d5ab60..7f908aad6e6 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,20 +4,13 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "03m59d683nr547v5xr80wc3j07das2d2sc3i4bf03dpbkfg0h17w"; + sha256 = "0mfxfc1y317h90h1jx7amsk09jwzxbvfc75qxzl9nf8ah432yfpr"; }; - patches = [ - (fetchpatch { - url = "https://github.com/tulir/mautrix-python/commit/ac46f3bb1bea11d22d8a486cc4821604c844da5e.patch"; - sha256 = "198g63s0iv8g1w22g4g5hb54y41ws82wraglibz33qhrwsfn8axn"; - }) - ]; - propagatedBuildInputs = [ aiohttp future-fstrings diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index 260d6262102..b3a0430a93b 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -1,15 +1,26 @@ -{ lib, fetchPypi, buildPythonPackage, pbr, six, sympy }: +{ lib, fetchFromGitHub, buildPythonPackage, isPy3k +, sympy, pytest, pytestrunner, sphinx, setuptools_scm }: buildPythonPackage rec { pname = "measurement"; version = "3.2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "352b20f7f0e553236af7c5ed48d091a51cf26061c1a063f46b31706ff7c0d57a"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "coddingtonbear"; + repo = "python-measurement"; + rev = version; + sha256 = "1mk9qg1q4cnnipr6xa72i17qvwwhz2hd8p4vlsa9gdzrcv4vr8h9"; }; - propagatedBuildInputs = [ pbr six sympy ]; + postPatch = '' + sed -i 's|use_scm_version=True|version="${version}"|' setup.py + ''; + + checkInputs = [ pytest pytestrunner ]; + nativeBuildInputs = [ sphinx setuptools_scm ]; + propagatedBuildInputs = [ sympy ]; meta = with lib; { description = "Use and manipulate unit-aware measurement objects in Python"; |