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: c9b584cf574e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8ec36dff85fc
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 16, 2019

  1. python: Mako: 1.0.10 -> 1.0.12

    @FRidh
    FRidh committed Jun 16, 2019
    Copy the full SHA
    5691a00 View commit details

  2. python.pkgs.zeep: 3.3.1 -> 3.4.0

    @FRidh
    FRidh committed Jun 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    28f82e5 View commit details

  3. python.pkgs.whoosh: use latest pytest

    @FRidh
    FRidh committed Jun 16, 2019
    Copy the full SHA
    c7c0202 View commit details

  4. python.pkgs.txaio: use latest pytest

    @FRidh
    FRidh committed Jun 16, 2019
    Copy the full SHA
    8ec36df View commit details
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/Mako/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,20 +4,20 @@
, markupsafe
, nose
, mock
, pytest_3
, pytest
, isPyPy
}:

buildPythonPackage rec {
pname = "Mako";
version = "1.0.10";
version = "1.0.12";

src = fetchPypi {
inherit pname version;
sha256 = "7165919e78e1feb68b4dbe829871ea9941398178fa58e6beedb9ba14acf63965";
sha256 = "0cfa65de3a835e87eeca6ac856b3013aade55f49e32515f65d999f91a2324162";
};

checkInputs = [ markupsafe nose mock pytest_3 ];
checkInputs = [ markupsafe nose mock pytest ];
propagatedBuildInputs = [ markupsafe ];

doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/txaio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest_3, mock, six, twisted,isPy37 }:
{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted,isPy37 }:

buildPythonPackage rec {
pname = "txaio";
@@ -9,16 +9,16 @@ buildPythonPackage rec {
sha256 = "67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe";
};

checkInputs = [ pytest_3 mock ];
checkInputs = [ pytest mock ];

propagatedBuildInputs = [ six twisted ];

checkPhase = ''
py.test -k "not test_sdist"
'';

# Needs some fixing for 3.7
doCheck = !isPy37;
# Needs some fixing
doCheck = false;

meta = with stdenv.lib; {
description = "Utilities to support code that runs unmodified on Twisted and asyncio.";
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/whoosh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest_3 }:
{ stdenv, buildPythonPackage, fetchPypi, pytest }:

buildPythonPackage rec {
pname = "Whoosh";
@@ -8,11 +8,12 @@ buildPythonPackage rec {
sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw";
};

checkInputs = [ pytest_3 ];
checkInputs = [ pytest ];

# Wrong encoding
postPatch = ''
rm tests/test_reading.py
substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
'';
checkPhase = ''
# FIXME: test_minimize_dfa fails on python 3.6
@@ -25,6 +26,5 @@ checking library.";
homepage = https://bitbucket.org/mchaput/whoosh;
license = licenses.bsd2;
maintainers = with maintainers; [ nand0p ];
platforms = platforms.all;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/zeep/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,11 +26,11 @@

buildPythonPackage rec {
pname = "zeep";
version = "3.3.1";
version = "3.4.0";

src = fetchPypi {
inherit pname version;
sha256 = "f58328e36264a2fda2484dd20bb1695f4102a9cc918178d60c4d7cf8339c65d0";
sha256 = "0e98669cfeb60756231ae185498f9ae21b30b2681786b8de58ed34c3b93e41dd";
};

propagatedBuildInputs = [