NixOS · FRidh · Jul 26, 2018 · Jul 21, 2018 · Jul 21, 2018 · Jul 21, 2018
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
-with pythonPackages;
+with python3Packages;
 buildPythonApplication rec {
  version = "1.23.0";
- name = "rtv-${version}";
+ pname = "rtv";
 
  src = fetchFromGitHub {
  owner = "michael-lazar";
@@ -19,7 +19,7 @@ buildPythonApplication rec {
  py.test
  '';
 
- buildInputs = [
+ checkInputs = [
  coverage
  coveralls
  docopt
@@ -30,18 +30,11 @@ buildPythonApplication rec {
  ];
 
  propagatedBuildInputs = [
- backports_functools_lru_cache
  beautifulsoup4
- configparser
- contextlib2
  decorator
  kitchen
- mailcap-fix
- mccabe
  requests
  six
- tornado
- pyyaml
  ];
 
  meta = with stdenv.lib; {

diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
@@ -1,18 +1,10 @@
-{ stdenv, fetchPypi, buildPythonApplication, makeDesktopItem
-# mandatory
-, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
-, pyflakes, rope, nbconvert, mccabe, pyopengl, cloudpickle
-# optional
-, numpy ? null, scipy ? null, matplotlib ? null
-# optional
-, pylint ? null
-}:
-
-buildPythonApplication rec {
+{ stdenv, python3, makeDesktopItem }:
+
+python3.pkgs.buildPythonApplication rec {
  pname = "spyder";
  version = "3.2.8";
 
- src = fetchPypi {
+ src = python3.pkgs.fetchPypi {
  inherit pname version;
  sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5";
  };
@@ -22,7 +14,7 @@ buildPythonApplication rec {
  sed -i -e '/pyqt5/d' setup.py
  '';
 
- propagatedBuildInputs = [
+ propagatedBuildInputs = with python3.pkgs; [
  jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
  numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
  ];

diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
  pname = "Flask-PyMongo";
- version = "0.5.2";
+ version = "2.0.1";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "aab5ddab8f443e8a011e024f618bb89e078bdcc2274597079469fdf5ddc032b5";
+ sha256 = "6a02add52ac245064720c2bb8b02074b9a5a0d9498279510ea2a537512fd3fa5";
  };
 
  checkInputs = [ pytest ];

diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }:
 
 buildPythonPackage rec {
- version = "2.1.9";
+ version = "2.1.11";
  pname = "GitPython";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "0a9in1jfv9ssxhckl6sasw45bhm762y2r5ikgb2pk2g8yqdc6z64";
+ sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8";
  };
 
  checkInputs = [ mock nose ddt ];

diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy3k }:
+{ buildPythonPackage, fetchPypi, isPy3k, pytest }:
 
 buildPythonPackage rec {
  pname = "JPype1";
@@ -11,8 +11,10 @@ buildPythonPackage rec {
 
  patches = [ ./set-compiler-language.patch ];
 
- # Test loader complains about non-test module on python3.
- doCheck = !isPy3k;
+ checkInputs = [ pytest ];
+
+ # ImportError: Failed to import test module: test.testlucene
+ doCheck = false;
 
  meta = {
  homepage = "https://github.com/originell/jpype/";

diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
  pname = "WSME";
- version = "0.9.2";
+ version = "0.9.3";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976";
+ sha256 = "e24fcff24392a0b176e560ffc6591b1f658342bbc992f84e0e8a3c53fd92580a";
  };
 
  postPatch = ''

diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
  pname = "adal";
- version = "1.0.1";
+ version = "1.0.2";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "71b0e9b479320f76af4bcd268f7359580ba2e217228e83ff7529f51a9845f393";
+ sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce";
  };
 
  propagatedBuildInputs = [ requests pyjwt dateutil ];

diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
@@ -10,11 +10,11 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
  pname = "aioconsole";
- version = "0.1.8";
+ version = "0.1.10";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "5d2c60c0cbf87c663ef3a0b394980ff86f56ebd3c47cc87df6c410e774216c50";
+ sha256 = "3fab07073648d70d8345e0eb745bd81fcd02b5e2b080c4663faea8c8ab281c0a";
  };
 
  # hardcodes a test dependency on an old version of pytest-asyncio

diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
  pname = "alembic";
- version = "0.9.10";
+ version = "1.0.0";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "1cd32df9a3b8c1749082ef60ffbe05ff16617b6afadfdabc680dcb9344af33d7";
+ sha256 = "52d73b1d750f1414fa90c25a08da47b87de1e4ad883935718a8f36396e19e78e";
  };
 
  buildInputs = [ pytest pytestcov mock coverage ];

diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
@@ -1,16 +1,17 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest }:
+, pytest, setuptools_scm }:
 
 buildPythonPackage rec {
  pname = "apipkg";
- version = "1.4";
+ version = "1.5";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
+ sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6";
  };
 
- buildInputs = [ pytest ];
+ buildInputs = [ setuptools_scm ];
+ checkInputs = [ pytest ];
 
  checkPhase = ''
  py.test

diff --git a/pkgs/development/python-modules/appnope/default.nix b/pkgs/development/python-modules/appnope/default.nix
@@ -0,0 +1,21 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "appnope";
+ version = "0.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71";
+ };
+
+ meta = {
+ description = "Disable App Nap on macOS";
+ homepage = https://pypi.python.org/pypi/appnope;
+ platforms = lib.platforms.darwin;
+ license = lib.licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, glibcLocales
+}:
+
+buildPythonPackage rec {
+ pname = "Arpeggio";
+ version = "1.9.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a5258b84f76661d558492fa87e42db634df143685a0e51802d59cae7daad8732";
+ };
+
+ # Shall not be needed for next release
+ LC_ALL = "en_US.UTF-8";
+ buildInputs = [ glibcLocales ];
+
+ meta = {
+ description = "Packrat parser interpreter";
+ license = lib.licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
  pname = "astor";
- version = "0.6.2";
+ version = "0.7.1";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "ff6d2e2962d834acb125cc4dcc80c54a8c17c253f4cc9d9c43b5102a560bb75d";
+ sha256 = "95c30d87a6c2cf89aa628b87398466840f0ad8652f88eb173125a6df8533fb8d";
  };
 
  # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
@@ -1,32 +1,25 @@
-{ lib, fetchPypi, buildPythonPackage, python, logilab_common, six
-, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder
-, backports_functools_lru_cache
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy
+, lazy-object-proxy, six, wrapt, typing, typed-ast
+, pytestrunner, pytest
 }:
 
 buildPythonPackage rec {
  pname = "astroid";
- version = "1.6.5";
+ version = "2.0.1";
+
+ disabled = pythonOlder "3.4";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a";
+ sha256 = "218e36cf8d98a42f16214e8670819ce307fa707d1dcf7f9af84c7aede1febc7f";
  };
 
- propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]
- ++ lib.optionals (pythonOlder "3.4") [ enum34 singledispatch]
- ++ lib.optionals (pythonOlder "3.3") [ backports_functools_lru_cache ];
-
- postPatch = ''
- cd astroid/tests
- for i in $(ls unittest*); do mv -v $i test_$i; done
- cd ../..
- rm -vf astroid/tests/test_unittest_inference.py
- rm -vf astroid/tests/test_unittest_manager.py
- '';
+ # From astroid/__pkginfo__.py
+ propagatedBuildInputs = [ lazy-object-proxy six wrapt ]
+ ++ lib.optional (pythonOlder "3.5") typing
+ ++ lib.optional (pythonOlder "3.7" && !isPyPy) typed-ast;
 
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
+ checkInputs = [ pytestrunner pytest ];
 
  meta = with lib; {
  description = "A abstract syntax tree for Python with inference support";

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
  pname = "asyncssh";
- version = "1.13.2";
+ version = "1.13.3";
  disabled = pythonOlder "3.4";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "e4c07577d021c68d4c8e6d1897987424cc25b58e0726f31ff72476a34ddb6deb";
+ sha256 = "eb5b190badc5cd2a506a1b6ced3e92f948166974eef7d1abab61acc67aa379e6";
  };
 
  propagatedBuildInputs = [ 

diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchurl
+, stdenv
+, darwin
+}:
+
+buildPythonPackage rec {
+ pname = "audiotools";
+ version = "3.1.1";
+
+ buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ AudioToolbox
+ AudioUnit
+ CoreServices
+ ]);
+
+ src = fetchurl {
+ url = "https://github.com/tuffy/python-audio-tools/archive/v${version}.tar.gz";
+ sha256 = "0ymlxvqkqhzk4q088qwir3dq0zgwqlrrdfnq7f0iq97g05qshm2c";
+ };
+
+ meta = {
+ description = "Utilities and Python modules for handling audio";
+ homepage = "http://audiotools.sourceforge.net/";
+ license = lib.licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pillow
+, numpy
+, ffmpeg_2
+, git
+, libav
+, pkgconfig
+}:
+
+buildPythonPackage rec {
+ pname = "av";
+ version = "0.4.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bf9a8d113392c6a445f424e16f9e64ac53d1db1548731e6326763d555647c24f";
+ };
+
+ buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ];
+
+ # Because of https://github.com/mikeboers/PyAV/issues/152
+ doCheck = false;
+
+ meta = {
+ description = "Pythonic bindings for FFmpeg/Libav";
+ homepage = https://github.com/mikeboers/PyAV/;
+ license = lib.licenses.bsd2;
+ };
+}
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
  pname = "aws-sam-translator";
- version = "1.6.0";
+ version = "1.6.1";
 
  src = fetchPypi {
  inherit pname version;
- sha256 = "1da15d459150eb631af4f400ca336901da6a564b543fe3d7a75169ca2c9f36cb";
+ sha256 = "23160f717bd65de810fa538b7c145eae4384d10adb460e375d148de7f283bd10";
  };
 
  # Tests are not included in the PyPI package