From 9b55a4ebe14e63fe232276c50b96995100790cf5 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 17:44:10 +0200 Subject: [PATCH 01/14] pythonPackages: add alembic, database migration tool for SQLAlchemy --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eae050f0b86..073f1162857 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -214,6 +214,25 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + alembic = buildPythonPackage rec { + name = "alembic-0.6.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/alembic/${name}.tar.gz"; + md5 = "084fe81b48ebae43b0f6031af68a03d6"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ Mako sqlalchemy ]; + + meta = { + homepage = http://bitbucket.org/zzzeek/alembic; + description = "A database migration tool for SQLAlchemy."; + license = stdenv.lib.licenses.mit; + }; + }; + + almir = buildPythonPackage rec { name = "almir-0.1.8"; From e830be665b989243514059444e697f65d9889bac Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 17:54:52 +0200 Subject: [PATCH 02/14] pythonPackages: add execnet, rapid multi-Python deployment --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 073f1162857..56ed411f897 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1345,6 +1345,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + execnet = buildPythonPackage rec { + name = "execnet-1.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/e/execnet/${name}.zip"; + md5 = "be885ccd9612966bb81839670d2da099"; + }; + + buildInputs = [ pkgs.unzip ]; + + meta = { + description = "rapid multi-Python deployment"; + license = stdenv.lib.licenses.gpl2; + }; + }; + + fabric = buildPythonPackage rec { name = "fabric-1.6.1"; src = fetchurl { From b20bf7982e2ab1ccf532230b2a1665b11fa227a7 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 17:57:18 +0200 Subject: [PATCH 03/14] pythonPackages: add pytest_xdist, plugin for distributed testing and loop-on-failing modes --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56ed411f897..cb1f19eeb53 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1104,6 +1104,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + pytest_xdist = buildPythonPackage rec { + name = "pytest-xdist-1.8"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-xdist/pytest-xdist-1.8.zip"; + md5 = "9c0b8efe9d43b460f8cf049fa46ce14d"; + }; + + buildInputs = [ pkgs.unzip pytest ]; + propagatedBuildInputs = [ execnet ]; + + meta = { + description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; + homepage = http://bitbucket.org/hpk42/pytest-xdist; + }; + }; + cssselect = buildPythonPackage rec { name = "cssselect-0.7.1"; src = fetchurl { From c8379fb7c0e943b780db949e081b9640f8b327cc Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 18:00:03 +0200 Subject: [PATCH 04/14] pythonPackages: add memory_profiler, a module for monitoring memory usage of a python program --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb1f19eeb53..224b551d86e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3215,6 +3215,25 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + + memory_profiler = buildPythonPackage rec { + name = "memory_profiler-0.27"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/m/memory_profiler/memory_profiler-0.27.tar.gz"; + md5 = "212c0d7452dbaffb6b09474ac07b0668"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A module for monitoring memory usage of a python program"; + homepage = http://pypi.python.org/pypi/memory_profiler; + }; + }; + + mitmproxy = buildPythonPackage rec { baseName = "mitmproxy"; name = "${baseName}-${meta.version}"; From eefb56ffbf339b8d55bc464fd6c76013c8761b91 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 18:01:02 +0200 Subject: [PATCH 05/14] pythonPackages.psutil: update to 1.0.1 --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 224b551d86e..aaefcc0830f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4223,13 +4223,16 @@ pythonPackages = modules // import ./python-packages-generated.nix { psutil = buildPythonPackage rec { - name = "psutil-0.6.1"; + name = "psutil-1.0.1"; src = fetchurl { url = "http://psutil.googlecode.com/files/${name}.tar.gz"; - sha256 = "0vqarv63jqzghr4fi1fqdbvg847fq2gqdj8dzc3x59f9b36a8rfn"; + sha256 = "1zrzh7hi0f79sf9axwrw3c2kl86qs72kvx8xbbrdwlp39rfa1i1f"; }; + # failed tests: https://code.google.com/p/psutil/issues/detail?id=434 + doCheck = false; + meta = { description = "Process and system utilization information interface for python"; homepage = http://code.google.com/p/psutil/; From cf6ff3a8a3fdb36864c10e85a9a964ef331db025 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 18:02:04 +0200 Subject: [PATCH 06/14] pythonPackages: add wand, ctypes-based simple MagickWand API binding for Python --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aaefcc0830f..e3c635ea7b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6233,6 +6233,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + wand = buildPythonPackage rec { + name = "Wand-0.3.5"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/Wand/${name}.tar.gz"; + md5 = "10bab03bf86ce8da2a95a3b15197ae2e"; + }; + + buildInputs = [ pkgs.imagemagick pytest psutil memory_profiler pytest_xdist ]; + + meta = { + description = "Ctypes-based simple MagickWand API binding for Python"; + homepage = http://wand-py.org/; + platforms = stdenv.lib.platforms.all; + }; + }; + + webob = buildPythonPackage rec { version = "1.2.3"; name = "webob-${version}"; From 7e7961028b80c18baa2d298f0c6685f1e41da909 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 18:02:51 +0200 Subject: [PATCH 07/14] pythonPackages.sqlalchemy: add sqlalchemy 0.8.2 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3c635ea7b4..d6b671c69a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5773,6 +5773,26 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + sqlalchemy8 = buildPythonPackage rec { + name = "SQLAlchemy-${version}"; + version = "0.8.2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; + md5 = "5a33fb43dea93468dbb2a6562ee80b54"; + }; + + buildInputs = [ nose mock ]; + + propagatedBuildInputs = [ modules.sqlite3 ]; + + meta = { + homepage = http://www.sqlalchemy.org/; + description = "A Python SQL toolkit and Object Relational Mapper"; + }; + }; + + sqlalchemy_migrate = buildPythonPackage rec { name = "sqlalchemy-migrate-0.6.1"; From e89dc9d2f028fc76ffbfdb294952b9aad78cb0d8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 18:04:01 +0200 Subject: [PATCH 08/14] pythonPackages: add sqlalchemy_imageattach, SQLAlchemy extension for attaching images to entity objects --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d6b671c69a6..96195b7b792 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5793,6 +5793,29 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + sqlalchemy_imageattach = buildPythonPackage rec { + name = "SQLAlchemy-ImageAttach-${version}"; + version = "0.8.1"; + + src = fetchgit { + url = https://github.com/crosspop/sqlalchemy-imageattach.git; + rev = "refs/tags/${version}"; + md5 = "051dd9de0757714d33c3ecd5ab37b97d"; + }; + + buildInputs = [ pytest webob pkgs.imagemagick ]; + propagatedBuildInputs = [ sqlalchemy8 wand ]; + + checkPhase = "cd tests && LD_LIBRARY_PATH=${pkgs.imagemagick}/lib py.test"; + + meta = { + homepage = https://github.com/crosspop/sqlalchemy-imageattach; + description = "SQLAlchemy extension for attaching images to entity objects"; + license = pkgs.lib.licenses.mit; + }; + }; + + sqlalchemy_migrate = buildPythonPackage rec { name = "sqlalchemy-migrate-0.6.1"; From 7c01f89355a4baddcd8a542e6f088793fb4a3102 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 18:07:40 +0200 Subject: [PATCH 09/14] pythonPackages: add pyramid_multiauth, stacked authentication policies for pyramid --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96195b7b792..8c399e3a40f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1639,6 +1639,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + pyramid_multiauth = buildPythonPackage rec { + name = "pyramid_multiauth-${version}"; + version = "0.3.2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pyramid_multiauth/${name}.tar.gz"; + md5 = "044e423abc4fb76937ac0c21c1205e9c"; + }; + + propagatedBuildInputs = [ pyramid ]; + + meta = with stdenv.lib; { + description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; + homepage = https://github.com/mozilla-services/pyramid_multiauth; + }; + }; + + raven = buildPythonPackage rec { name = "raven-3.4.1"; From 3d3c8c12dd3966a249343d5ce9fc1203fe3e2871 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 18:08:24 +0200 Subject: [PATCH 10/14] pythonPackages: add htmllaundry, simple HTML cleanup utilities --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c399e3a40f..01cbbb1e4b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2685,6 +2685,28 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + htmllaundry = buildPythonPackage rec { + name = "htmllaundry-2.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/h/htmllaundry/${name}.tar.gz"; + md5 = "6db6909de76c4b259e65d90b5debdbda"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ six lxml ]; + + # some tests fail, probably because of changes in lxml + # not relevant for me, if releavnt for you, fix it... + doCheck = false; + + meta = { + description = "Simple HTML cleanup utilities"; + license = stdenv.lib.licenses.bsd3; + }; + }; + + html5lib = buildPythonPackage (rec { name = "html5lib-0.95"; From 8cdf3172bcc1e6ab5a8a8c7d3ed47e258697dcf6 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 18:08:55 +0200 Subject: [PATCH 11/14] pythonPackages: add statd, client for Etsy's node-js statsd server --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01cbbb1e4b8..1fa5154102b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5882,6 +5882,26 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + + statd = buildPythonPackage rec { + name = "python-statsd-${version}"; + version = "1.6.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-statsd/${name}.tar.gz"; + md5 = "3a0c71a160b504b843703c3041c7d7fb"; + }; + + buildInputs = [ mock nose coverage ]; + + meta = { + description = "A client for Etsy's node-js statsd server"; + homepage = https://github.com/WoLpH/python-statsd; + license = pkgs.lib.licenses.bsd3; + }; + }; + + stompclient = buildPythonPackage (rec { name = "stompclient-0.3.2"; From 9aa2a1651808ed3af500723718afddf2b50a8f42 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 24 Sep 2013 02:00:15 +0200 Subject: [PATCH 12/14] pythonPackages: add sphinxcontrib_http --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1fa5154102b..cc7298e31ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5787,6 +5787,26 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); + sphinxcontrib_httpdomain = buildPythonPackage (rec { + name = "sphinxcontrib-httpdomain-1.1.9"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/sphinxcontrib-httpdomain/${name}.tar.gz"; + md5 = "0f63aea612cc9e0b55a6c39e5b0f87b7"; + }; + + propagatedBuildInputs = [sphinx]; + + meta = { + description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; + + homepage = http://bitbucket.org/birkenfeld/sphinx-contrib; + + license = "BSD"; + }; + }); + + sqlalchemy = buildPythonPackage rec { name = "sqlalchemy-${version}"; version = "0.7.10"; From 675f293a81fccceaa94161d1fa09134033b89338 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 24 Sep 2013 02:01:14 +0200 Subject: [PATCH 13/14] pythonPackages: add sphinx_pypi_upload --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc7298e31ba..f9d25087535 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5807,6 +5807,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); + sphinx_pypi_upload = buildPythonPackage (rec { + name = "Sphinx-PyPI-upload-0.2.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/S/Sphinx-PyPI-upload/${name}.tar.gz"; + md5 = "b9f1df5c8443197e4d49abbba1cfddc4"; + }; + + meta = { + description = "Setuptools command for uploading Sphinx documentation to PyPI"; + + homepage = http://bitbucket.org/jezdez/sphinx-pypi-upload/; + + license = "BSD"; + }; + }); + + sqlalchemy = buildPythonPackage rec { name = "sqlalchemy-${version}"; version = "0.7.10"; From 552bac195aad6c22c621c6d50269cb57bda19ebb Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 20 Sep 2013 17:48:03 +0200 Subject: [PATCH 14/14] pythonPackages: add ColanderAlchemy, generator for colander schemas from sqlalchemy models --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9d25087535..0ef68759a0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -936,6 +936,29 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + + ColanderAlchemy = buildPythonPackage rec { + name = "ColanderAlchemy-0.2.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/C/ColanderAlchemy/${name}.tar.gz"; + md5 = "b054837bd2753cbf15f7d5028cba421b"; + }; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ colander sqlalchemy8 ]; + + # string: argument name cannot be overridden via info kwarg. + doCheck = false; + + meta = { + description = "Autogenerate Colander schemas based on SQLAlchemy models."; + homepage = https://github.com/stefanofontanelli/ColanderAlchemy; + license = pkgs.lib.licenses.mit; + }; + }; + + configobj = buildPythonPackage (rec { name = "configobj-4.7.2";