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: 6a45d871c71b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4ad932483c58
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Mar 26, 2019

  1. pythonPackages.isort: 4.3.4 -> 4.3.16 

    We set $TMPDIR, because isort refuses to run in paths containing
'build' (since that is part of Python's typical build infrastructure).
    @kwohlfahrt
    kwohlfahrt committed Mar 26, 2019
    Copy the full SHA
    f61ed7f View commit details

  2. python.pkgs.cssselect2: no isort etc. tests 

    The isort tests were broken after upgrading the isort package.
    Robert Schütz committed Mar 26, 2019
    Copy the full SHA
    6dac4d5 View commit details

  3. Merge pull request #56884 from kwohlfahrt/isort 

    pythonPackages.isort: 4.3.4 -> 4.3.15
    @dotlambda
    dotlambda authored Mar 26, 2019
    Copy the full SHA
    4ad9324 View commit details
Showing with 24 additions and 12 deletions.
  1. +14 −4 pkgs/development/python-modules/cssselect2/default.nix
  2. +10 −8 pkgs/development/python-modules/isort/default.nix
18 changes: 14 additions & 4 deletions pkgs/development/python-modules/cssselect2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }:
{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner }:

buildPythonPackage rec {
pname = "cssselect2";
@@ -9,11 +9,21 @@ buildPythonPackage rec {
sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab";
};

propagatedBuildInputs = [ tinycss2 ];
# We're not interested in code quality tests
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-cov" "" \
--replace "pytest-flake8" "" \
--replace "pytest-isort" ""
substituteInPlace setup.cfg \
--replace "--cov=cssselect2" "" \
--replace "--flake8" "" \
--replace "--isort" ""
'';

checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ];
propagatedBuildInputs = [ tinycss2 ];

LC_ALL = "en_US.UTF-8";
checkInputs = [ pytest pytestrunner ];

meta = with lib; {
description = "CSS selectors for Python ElementTree";
18 changes: 10 additions & 8 deletions pkgs/development/python-modules/isort/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }:
{ lib, buildPythonPackage, fetchPypi, isPy27, futures, backports_functools_lru_cache, mock, pytest }:

buildPythonPackage rec {
let
skipTests = lib.optional isPy27 "test_standard_library_deprecates_user_issue_778";
testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests;
in buildPythonPackage rec {
pname = "isort";
version = "4.3.4";
version = "4.3.16"; # Note 4.x is the last version that supports Python2

src = fetchPypi {
inherit pname version;
sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r";
sha256 = "1v6lapqhc33rxr9698lqjyb49fis27i42p3ymngrw95py3qf7y08";
};

propagatedBuildInputs = lib.optional isPy27 futures;
propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ];

checkInputs = [ mock pytest ];

# isort excludes paths that contain /build/, so test fixtures don't work with TMPDIR=/build/
checkPhase = ''
py.test test_isort.py -k "not test_long_line_comments \
and not test_import_case_produces_inconsistent_results_issue_472 \
and not test_no_extra_lines_issue_557"
PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts}
'';

meta = with lib; {