Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5647e9ae4ea3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1d61c41646bf
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Oct 13, 2018

  1. pythonPackages.pytest.setupHook: run in correct phase 

    It was reported that the 2nd solution wasn't working as expected because
it was ran in the wrong phase.

This commit creates a new phase, in between the installCheckPhase and distPhase.

(cherry picked from commit 20a4a4b)
    @FRidh
    FRidh committed Oct 13, 2018
    Copy the full SHA
    284a128 View commit details

  2. pythonPackages.autobahn: run hooks 

    (cherry picked from commit b75ea62)
    @FRidh
    FRidh committed Oct 13, 2018
    Copy the full SHA
    c918e05 View commit details

  3. pythonPackages.autobahn: use checkInputs 

    (cherry picked from commit 1c3f730)
    @lopsided98 @FRidh
    lopsided98 authored and FRidh committed Oct 13, 2018
    Copy the full SHA
    6306db4 View commit details

  4. python.pkgs.bootstrapped-pip: update pip, setuptools and wheel 

    (cherry picked from commit b05a596)
    @FRidh
    FRidh committed Oct 13, 2018
    Copy the full SHA
    de7a2df View commit details

  5. python.pkgs.pip: 18.0 -> 18.1 

    (cherry picked from commit 474c78a)
    @FRidh
    FRidh committed Oct 13, 2018
    Copy the full SHA
    1d61c41 View commit details
22 changes: 10 additions & 12 deletions pkgs/development/python-modules/autobahn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy33,
unittest2, mock, pytest, trollius, asyncio,
pytest-asyncio, futures, cffi,
six, twisted, txaio, zope_interface
{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy33,
six, txaio, twisted, zope_interface, cffi, asyncio, trollius, futures,
mock, pytest
}:
buildPythonPackage rec {
pname = "autobahn";
@@ -12,19 +11,18 @@ buildPythonPackage rec {
sha256 = "b69858e0be4bff8437b0bd82a0db1cbef7405e16bd9354ba587c043d6d5e1ad9";
};

# Upstream claim python2 support, but tests require pytest-asyncio which
# is pythn3 only. Therefore, tests are skipped for python2.
doCheck = isPy3k;
checkInputs = stdenv.lib.optionals isPy3k [ unittest2 mock pytest pytest-asyncio ];
propagatedBuildInputs = [ cffi six twisted zope_interface txaio ] ++
(stdenv.lib.optional isPy33 asyncio) ++
(stdenv.lib.optionals (!isPy3k) [ trollius futures ]);
propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
(lib.optional isPy33 asyncio) ++
(lib.optionals (!isPy3k) [ trollius futures ]);

checkInputs = [ mock pytest ];
checkPhase = ''
runHook preCheck
USE_TWISTED=true py.test $out
runHook postCheck
'';

meta = with stdenv.lib; {
meta = with lib; {
description = "WebSocket and WAMP in Python for Twisted and asyncio.";
homepage = "https://crossbar.io/autobahn";
license = licenses.mit;
12 changes: 6 additions & 6 deletions pkgs/development/python-modules/bootstrapped-pip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,26 +3,26 @@
let
wheel_source = fetchPypi {
pname = "wheel";
version = "0.31.1";
version = "0.32.1";
format = "wheel";
sha256 = "80044e51ec5bbf6c894ba0bc48d26a8c20a9ba629f4ca19ea26ecfcf87685f5f";
sha256 = "15hizylh761jcaz8zfdc3wg30jf33izaakyv1p82ppx2y5rgg8cz";
};
setuptools_source = fetchPypi {
pname = "setuptools";
version = "40.2.0";
version = "40.4.3";
format = "wheel";
sha256 = "ea3796a48a207b46ea36a9d26de4d0cc87c953a683a7b314ea65d666930ea8e6";
sha256 = "1zzryv1fqx4nk7hzv4afxpl8k7f60lc0qkhxlc8sqjs4igakfhff";
};

in stdenv.mkDerivation rec {
pname = "pip";
version = "18.0";
version = "18.1";
name = "${python.libPrefix}-bootstrapped-${pname}-${version}";

src = fetchPypi {
inherit pname version;
format = "wheel";
sha256 = "070e4bf493c7c2c9f6a08dd797dd3c066d64074c38e9e8a0fb4e6541f266d96c";
sha256 = "7909d0a0932e88ea53a7014dfd14522ffef91a464daaaf5c573343852ef98550";
};

unpackPhase = ''
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@

buildPythonPackage rec {
pname = "pip";
version = "18.0";
version = "18.1";

src = fetchPypi {
inherit pname version;
sha256 = "a0e11645ee37c90b40c46d607070c4fd583e2cd46231b1c06e389c5e814eed76";
sha256 = "c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1";
};

# pip detects that we already have bootstrapped_pip "installed", so we need
8 changes: 5 additions & 3 deletions pkgs/development/python-modules/pytest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -29,9 +29,11 @@ buildPythonPackage rec {

# Remove .pytest_cache when using py.test in a Nix build
setupHook = writeText "pytest-hook" ''
postFixupHooks+=(
'find $out -name .pytest_cache -type d -exec rm -rf {} +'
)
pytestcachePhase() {
find $out -name .pytest_cache -type d -exec rm -rf {} +
}
preDistPhases+=" pytestcachePhase"
'';

meta = with stdenv.lib; {