From 6d2dd3307060a0a9dc3532e123726c8657ba6c98 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 14 Apr 2018 17:11:50 +0200 Subject: python.pkgs.bootstrapped-pip: 9.0.3 -> 10.0.1 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 4ff4c687e5c0..28962d0c9361 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "pip"; - version = "9.0.3"; + version = "10.0.1"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "c3ede34530e0e0b2381e7363aded78e0c33291654937e7373032fda04e8803e5"; + sha256 = "717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7"; }; unpackPhase = '' @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { # install pip binary echo '#!${python.interpreter}' > $out/bin/pip - echo 'import sys;from pip import main' >> $out/bin/pip + echo 'import sys;from pip._internal import main' >> $out/bin/pip echo 'sys.exit(main())' >> $out/bin/pip chmod +x $out/bin/pip -- cgit 1.4.1 From e5f57757d0396841bb6d9f215cb6777f1914c9dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 14 Apr 2018 17:12:10 +0200 Subject: python.pkgs.pip: 9.0.3 -> 10.0.1 --- pkgs/development/python-modules/pip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index a566e31e035f..20558312f290 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "9.0.3"; + version = "10.0.1"; src = fetchPypi { inherit pname version; - sha256 = "7bf48f9a693be1d58f49f7af7e0ae9fe29fd671cde8a55e6edca3581c4ef5796"; + sha256 = "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68"; }; # pip detects that we already have bootstrapped_pip "installed", so we need @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = https://pip.pypa.io/; priority = 10; }; -} \ No newline at end of file +} -- cgit 1.4.1 From 6a45d0b1791ae7f35f5b1478416893e8782fbd71 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 17 Apr 2018 17:23:52 +0200 Subject: python.pkgs.flake8-future-import: 0.4.3 -> 0.4.5 --- .../python-modules/flake8-future-import/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 2ece8ba85abc..2612cfde1f50 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -3,27 +3,18 @@ buildPythonPackage rec { pname = "flake8-future-import"; - name = "${pname}-${version}"; - version = "0.4.3"; + version = "0.4.5"; + # PyPI tarball doesn't include the test suite src = fetchFromGitHub { owner = "xZise"; repo = "flake8-future-import"; rev = version; - sha256 = "0622bdcfa588m7g8igag6hf4rhjdwh74yfnrjwlxw4vlqhg344k4"; + sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr"; }; - patches = [ - # Tests in 0.4.3 are broken. We can remove this patch after - # the next release. - (fetchurl { - url = "https://github.com/xZise/flake8-future-import/commit/b4f5a06b22c574fb5270574d1420715667768d5c.patch"; - sha256 = "06n9ggz9p9kiwjb3vmaj44pm5vi4nhgzjfn7i730m85xn67xzmyn"; - }) - ]; - - propagatedBuildInputs = [ flake8 six ]; + meta = { homepage = https://github.com/xZise/flake8-future-import; description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base"; -- cgit 1.4.1 From 1c84ac797d84b6f2eb086dcc8aeb48f07143b038 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 17 Apr 2018 17:26:17 +0200 Subject: python: pip-tools: 1.11.0 -> 2.0.1 --- pkgs/development/python-modules/pip-tools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 752047d04f7e..abe2dff6441b 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "1.11.0"; + version = "2.0.1"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "ba427b68443466c389e3b0b0ef55f537ab39344190ea980dfebb333d0e6a50a3"; + sha256 = "81abea4ba206051ddaf90854b7302849002fdd0084450d2dd7f5c44a6d0ddf16"; }; LC_ALL = "en_US.UTF-8"; @@ -22,6 +22,8 @@ buildPythonPackage rec { "test_generate_hashes_without_interfering_with_each_other" "test_realistic_complex_sub_dependencies" "test_generate_hashes_with_editable" + "test_filter_pip_markes" + "test_get_hashes_local_repository_cache_miss" # Expect specific version of "six": "test_editable_package" "test_input_file_without_extension" -- cgit 1.4.1 From b07201882481eedc3c09669c2c14c620d293537c Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 26 Apr 2018 08:14:35 +0200 Subject: python: docker-pycreds: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/docker-pycreds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index 9cc510bf9af3..dd20400ea4f4 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "docker-pycreds"; - version = "0.2.2"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299"; + sha256 = "e3732a03610a00461a716997670c7010bf1c214a3edc440f7d6a2a3a830ecd9d"; }; # require docker-credential-helpers binaries -- cgit 1.4.1 From df7efec99533e5c21530051a174e0a5ad19f8856 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 26 Apr 2018 08:11:30 +0200 Subject: python: docker: 3.2.1 -> 3.3.0 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index c290c6bd177b..2ae56b7dc5a7 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.2.1"; + version = "3.3.0"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "0d698c3dc4df66c988de5df21a62cdc3450de2fa8523772779e5e23799c41f43"; + sha256 = "dc5cc0971a0d36fe94c5ce89bd4adb6c892713500af7b0818708229c3199911a"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From e04a4d3c9ebc5e6725091238f7b530b6e55a77fe Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 26 Apr 2018 08:46:54 +0200 Subject: python.pkgs.tweepy: move expression --- pkgs/development/python-modules/tweepy/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/tweepy/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix new file mode 100644 index 000000000000..562edf3d15ab --- /dev/null +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, requests, six, requests_oauthlib }: + +buildPythonPackage rec { + pname = "tweepy"; + version = "3.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h"; + }; + + doCheck = false; + propagatedBuildInputs = [ requests six requests_oauthlib ]; + + meta = with lib; { + homepage = https://github.com/tweepy/tweepy; + description = "Twitter library for python"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6fee2dcd65b8..8d899f94abd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14387,25 +14387,7 @@ in { TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - tweepy = buildPythonPackage (rec { - name = "tweepy-3.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tweepy/${name}.tar.gz"; - sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h"; - }; - - doCheck = false; - propagatedBuildInputs = with self; [ requests six requests_oauthlib ]; - - meta = { - homepage = "https://github.com/tweepy/tweepy"; - description = "Twitter library for python"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; - }; - }); + tweepy = callPackage ../development/python-modules/tweepy { }; twiggy = buildPythonPackage rec { name = "Twiggy-${version}"; -- cgit 1.4.1 From 4d0989fe046bdca41f07bbf3d6fa86d7a3cdf792 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 26 Apr 2018 08:53:00 +0200 Subject: python: tweepy: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/tweepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 562edf3d15ab..3020ef80aa41 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h"; + sha256 = "901500666de5e265d93e611dc05066bb020481c85550d6bcbf8030212938902c"; }; doCheck = false; -- cgit 1.4.1 From c63a32357a807a6e967c5853220293b86c439549 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Thu, 26 Apr 2018 08:53:27 +0200 Subject: python.pkgs.tweepy: fix build with pip 10 This applies https://github.com/tweepy/tweepy/pull/1030. --- pkgs/development/python-modules/tweepy/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 3020ef80aa41..c0c74743044d 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, six, requests_oauthlib }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, requests, six, requests_oauthlib }: buildPythonPackage rec { pname = "tweepy"; @@ -9,6 +9,13 @@ buildPythonPackage rec { sha256 = "901500666de5e265d93e611dc05066bb020481c85550d6bcbf8030212938902c"; }; + # Fix build with pip 10 + # https://github.com/tweepy/tweepy/pull/1030 + patches = fetchpatch { + url = "${meta.homepage}/commit/778bd7a31d2f5fae98652735e7844533589ca221.patch"; + sha256 = "1sqmjn0ngiynhfkdkcs33qmvl49ysfp8522hvxjk8bx252y9qw2h"; + }; + doCheck = false; propagatedBuildInputs = [ requests six requests_oauthlib ]; -- cgit 1.4.1 From b99d7727b9acfdb80d85f4179423d7273d10d9a9 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 5 May 2018 07:27:10 +0200 Subject: python.pkgs.bootstrapped-pip: remove pkg_resources patch --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 28962d0c9361..e6f751714451 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -14,14 +14,6 @@ let sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8"; }; - # TODO: Shouldn't be necessary anymore for pip >= 10! - # https://github.com/NixOS/nixpkgs/issues/26392 - # https://github.com/pypa/setuptools/issues/885 - pkg_resources = fetchurl { - url = "https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py"; - sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv"; - }; - in stdenv.mkDerivation rec { pname = "pip"; version = "10.0.1"; @@ -38,8 +30,6 @@ in stdenv.mkDerivation rec { unzip -d $out/${python.sitePackages} $src unzip -d $out/${python.sitePackages} ${setuptools_source} unzip -d $out/${python.sitePackages} ${wheel_source} - # TODO: Shouldn't be necessary anymore for pip >= 10! - cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py ''; patchPhase = '' -- cgit 1.4.1 From f13cf52a843f2bca9ecdeb6f58db0b20244672f5 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 5 May 2018 07:36:39 +0200 Subject: python.pkgs.bootstrapped-pip: wheel: 0.30.0 -> 0.31.0 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index e6f751714451..250703cbc53b 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -3,9 +3,9 @@ let wheel_source = fetchPypi { pname = "wheel"; - version = "0.30.0"; + version = "0.31.0"; format = "wheel"; - sha256 = "e721e53864f084f956f40f96124a74da0631ac13fbbd1ba99e8e2b5e9cafdf64"; + sha256 = "9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107"; }; setuptools_source = fetchPypi { pname = "setuptools"; -- cgit 1.4.1