From c0466ef834efee68eff58f5e8c36f5edc3f3563d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Mar 2018 20:54:05 +0100 Subject: [PATCH 01/12] pythonPackages.csvkit: fix build --- .../python-modules/csvkit/default.nix | 52 +++++++++++-------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix index bfabf4376e7..badf33f8c12 100644 --- a/pkgs/development/python-modules/csvkit/default.nix +++ b/pkgs/development/python-modules/csvkit/default.nix @@ -1,28 +1,38 @@ -{ stdenv, fetchPypi, buildPythonPackage, - dateutil, dbf, xlrd, sqlalchemy, openpyxl, - agate-excel, agate-dbf, agate-sql, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k +, agate, agate-excel, agate-dbf, agate-sql, six +, argparse, ordereddict, simplejson +, glibcLocales, nose, mock, unittest2 +}: buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "csvkit"; - version = "1.0.2"; + pname = "csvkit"; + version = "1.0.2"; - src = fetchPypi { - inherit pname version; - sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as"; + }; - propagatedBuildInputs = [ dateutil dbf xlrd sqlalchemy openpyxl - agate-excel agate-dbf agate-sql ]; + propagatedBuildInputs = [ + agate agate-excel agate-dbf agate-sql six + ] ++ lib.optionals (!isPy3k) [ + argparse ordereddict simplejson + ]; - doCheck = !isPy3k; - # (only) python 3 we had 9 failures and 57 errors out of a much larger - # number of tests. + checkInputs = [ + glibcLocales nose + ] ++ lib.optionals (!isPy3k) [ + mock unittest2 + ]; - meta = with stdenv.lib; { - description = "A library of utilities for working with CSV, the king of tabular file formats"; - maintainers = with maintainers; [ vrthra ]; - license = with licenses; [ mit ]; - homepage = https://github.com/wireservice/csvkit; - }; + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -e test_csvsql + ''; + + meta = with lib; { + description = "A library of utilities for working with CSV, the king of tabular file formats"; + maintainers = with maintainers; [ vrthra ]; + license = with licenses; [ mit ]; + homepage = https://github.com/wireservice/csvkit; + }; } From f14c9ae8837ce1349b6a08edf8a033ec2f653164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 02:03:28 +0100 Subject: [PATCH 02/12] pythonPackages.ldappool: move expression --- .../python-modules/ldappool/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/ldappool/default.nix diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix new file mode 100644 index 00000000000..83a731936a8 --- /dev/null +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + name = "ldappool-${version}"; + version = "1.0"; + + src = fetchPypi { + pname = "ldappool"; + inherit version; + sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz"; + }; + + # Judging from SyntaxError + disabled = isPy3k; + + meta = with lib; { + homepage = "https://github.com/mozilla-services/ldappool"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb689085574..43c6936e848 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11678,23 +11678,7 @@ in { }; }; - ldappool = buildPythonPackage rec { - name = "ldappool-${version}"; - version = "1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/ldappool/${name}.tar.gz"; - sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz"; - }; - - # Judging from SyntaxError - disabled = isPy3k; - - meta = with stdenv.lib; { - homepage = "https://github.com/mozilla-services/ldappool"; - }; - }; - + ldappool = callPackage ../development/python-modules/ldappool { }; lz4 = buildPythonPackage rec { name = "lz4-0.8.2"; From 3680fc9fd44f634b328151d5cb30827ef97c310b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 02:19:38 +0100 Subject: [PATCH 03/12] pythonPackages.ldappool: 1.0 -> 2.2.0 --- .../python-modules/ldappool/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 83a731936a8..58ca72a3dc9 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k +, pbr, ldap, fixtures, testresources, testtools }: buildPythonPackage rec { name = "ldappool-${version}"; - version = "1.0"; + version = "2.2.0"; src = fetchPypi { pname = "ldappool"; @@ -10,10 +11,15 @@ buildPythonPackage rec { sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz"; }; - # Judging from SyntaxError - disabled = isPy3k; + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ ldap ]; + + checkInputs = [ fixtures testresources testtools ]; meta = with lib; { - homepage = "https://github.com/mozilla-services/ldappool"; + description = "A simple connector pool for python-ldap"; + homepage = https://git.openstack.org/cgit/openstack/ldappool; + license = licenses.mpl20; }; } From 150d0b7428c2a92e70844df92c3b4a3b112d9b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 02:37:58 +0100 Subject: [PATCH 04/12] pythonPackages.pycups: move expression --- .../python-modules/pycups/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------------ 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/pycups/default.nix diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix new file mode 100644 index 00000000000..c9dce559701 --- /dev/null +++ b/pkgs/development/python-modules/pycups/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, cups }: + +buildPythonPackage rec { + pname = "pycups"; + version = "1.9.73"; + + src = fetchurl { + url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; + sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335"; + }; + + buildInputs = [ cups ]; + + # Wants to connect to CUPS + doCheck = false; + + meta = with lib; { + description = "Python bindings for libcups"; + homepage = http://cyberelk.net/tim/software/pycups/; + license = with licenses; [ gpl2Plus ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43c6936e848..322168954bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13079,27 +13079,7 @@ in { }; }); - pycups = buildPythonPackage rec { - name = "pycups-${version}"; - version = "1.9.73"; - - src = pkgs.fetchurl { - url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; - sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335"; - }; - - buildInputs = [ pkgs.cups ]; - - # Wants to connect to CUPS - doCheck = false; - - meta = { - description = "Python bindings for libcups"; - homepage = http://cyberelk.net/tim/software/pycups/; - license = with licenses; [ gpl2Plus ]; - }; - - }; + pycups = callPackage ../development/python-modules/pycups { }; pycurl = buildPythonPackage (rec { name = "pycurl-7.19.5.1"; From a5e1dfe3e2836350bcf776c500387cb25fe87e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 02:38:48 +0100 Subject: [PATCH 05/12] pythonPackages.pycups: fix on Darwin --- pkgs/development/python-modules/pycups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix index c9dce559701..28dff352e38 100644 --- a/pkgs/development/python-modules/pycups/default.nix +++ b/pkgs/development/python-modules/pycups/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchurl, cups }: +{ stdenv, lib, buildPythonPackage, fetchurl, cups, libiconv }: buildPythonPackage rec { pname = "pycups"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335"; }; - buildInputs = [ cups ]; + buildInputs = [ cups ] ++ lib.optional stdenv.isDarwin libiconv; # Wants to connect to CUPS doCheck = false; From 143fd427d4e8fc9130b85387405e5514250ae7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 02:46:11 +0100 Subject: [PATCH 06/12] pythonPackages.affinity: disable for Python 3 --- pkgs/development/python-modules/affinity/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix index f2cb2ef6445..4eaaf56b441 100644 --- a/pkgs/development/python-modules/affinity/default.nix +++ b/pkgs/development/python-modules/affinity/default.nix @@ -1,13 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "affinity"; version = "0.1.0"; + + # syntax error + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6"; }; + meta = { description = "control processor affinity on windows and linux"; homepage = http://cheeseshop.python.org/pypi/affinity; From 7b525acee2ed65058fe2039ffef2db71588c4f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 02:56:57 +0100 Subject: [PATCH 07/12] pythonPackages.dj-database-url: init at 0.5.0 --- .../dj-database-url/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/dj-database-url/default.nix diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix new file mode 100644 index 00000000000..f334b7efeac --- /dev/null +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "dj-database-url"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163"; + }; + + # Tests access a DB via network + doCheck = false; + + meta = with lib; { + description = "Use Database URLs in your Django Application"; + homepage = https://github.com/kennethreitz/dj-database-url; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 322168954bd..4fccdf0097f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7142,6 +7142,8 @@ in { }; }; + dj-database-url = callPackage ../development/python-modules/dj-database-url { }; + djmail = callPackage ../development/python-modules/djmail { }; pillowfight = buildPythonPackage rec { From ae56cc1f30ec745bd9b045767f1da42eeae17643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 03:05:55 +0100 Subject: [PATCH 08/12] pythonPackages.django-polymorphic: fix tests --- .../django-polymorphic/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 8cb68ed1e7d..2cd112d8150 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -1,18 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, django }: +{ stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }: buildPythonPackage rec { pname = "django-polymorphic"; version = "2.0.2"; - name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "e1821d7b5874509a158a0f22bebf544330e0944c481c5a3e6da6cac8887e4e88"; + # PyPI tarball is missing some test files + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "18p84kdwpfp423vb2n38h840mj3bq0j57jx3cry7c8dznpi0vfi2"; }; - checkInputs = [ django ]; + checkInputs = [ dj-database-url ]; propagatedBuildInputs = [ django ]; + checkPhase = '' + ${python.interpreter} runtests.py + ''; + meta = { homepage = https://github.com/django-polymorphic/django-polymorphic; description = "Improved Django model inheritance with automatic downcasting"; From 2732be0649b884be5d30127a339461d8f8db3f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 03:20:25 +0100 Subject: [PATCH 09/12] pythonPackages.fonttools: 3.23.0 -> 3.24.0 --- pkgs/development/python-modules/fonttools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 28d4053888f..d96e434f279 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -7,12 +7,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.23.0"; - name = "${pname}-${version}"; + version = "3.24.0"; src = fetchPypi { inherit pname version; - sha256 = "9af97075be0395b631880a82ba88dcf694c8aa76b07a622bf5f650e8f8cff293"; + sha256 = "d09126f443bc8797d1b7e76274e65f4c169c04722745953ecf536451b1d9a15f"; extension = "zip"; }; @@ -23,6 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner + glibcLocales ]; meta = { From a412ecc43952602b94cb1b0df8c766f98bac75da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 03:21:19 +0100 Subject: [PATCH 10/12] pythonPackages.fonttools: fix tests --- pkgs/development/python-modules/fonttools/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index d96e434f279..d7e789b02fa 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -3,6 +3,7 @@ , numpy , pytest , pytestrunner +, glibcLocales }: buildPythonPackage rec { @@ -25,6 +26,10 @@ buildPythonPackage rec { glibcLocales ]; + preCheck = '' + export LC_ALL="en_US.UTF-8" + ''; + meta = { homepage = https://github.com/fonttools/fonttools; description = "A library to manipulate font files from Python"; From 92896e2739bd681150c317f7834991a2c361d963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 03:27:11 +0100 Subject: [PATCH 11/12] pythonPackages.ftputil: move expression --- .../python-modules/ftputil/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------------ 2 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/ftputil/default.nix diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix new file mode 100644 index 00000000000..8d9daa154e2 --- /dev/null +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + version = "3.3"; + pname = "ftputil"; + + src = fetchPypi { + inherit pname version; + sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b"; + }; + + disabled = isPy3k; + + meta = with lib; { + description = "High-level FTP client library (virtual file system and more)"; + homepage = https://pypi.python.org/pypi/ftputil; + license = licenses.bsd2; # "Modified BSD license, says pypi" + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fccdf0097f..0fb4e9cd805 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4512,24 +4512,7 @@ in { }; }; - ftputil = buildPythonPackage rec { - version = "3.3"; - name = "ftputil-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/ftputil/${name}.tar.gz"; - sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b"; - }; - - disabled = isPy3k; - - meta = { - description = "High-level FTP client library (virtual file system and more)"; - homepage = https://pypi.python.org/pypi/ftputil; - platforms = platforms.linux; - license = licenses.bsd2; # "Modified BSD license, says pypi" - }; - }; + ftputil = callPackage ../development/python-modules/ftputil { }; fudge = buildPythonPackage rec { name = "fudge-1.1.0"; From 62bb869309e165dadecfbe19a83e8ef7e76e52b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 03:41:20 +0100 Subject: [PATCH 12/12] pythonPackages.ftputil: 3.3 -> 3.4 and fix tests --- .../python-modules/ftputil/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index 8d9daa154e2..d3d338a2c8d 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -1,19 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { - version = "3.3"; + version = "3.4"; pname = "ftputil"; src = fetchPypi { inherit pname version; - sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b"; + sha256 = "374b01e174079e91babe2a462fbd6f6c00dbfbfa299dec04239ca4229fbf8762"; }; - disabled = isPy3k; + checkInputs = [ pytest ]; + + checkPhase = '' + touch Makefile + # Disable tests that require network access or access /home + py.test test \ + -k "not test_public_servers and not test_real_ftp \ + and not test_set_parser and not test_repr" + ''; meta = with lib; { description = "High-level FTP client library (virtual file system and more)"; - homepage = https://pypi.python.org/pypi/ftputil; + homepage = http://ftputil.sschwarzer.net/; license = licenses.bsd2; # "Modified BSD license, says pypi" }; }