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

Commits on Sep 10, 2019

  1. python.pkgs.blessed: disable failing test

    @FRidh
    FRidh committed Sep 10, 2019
    Copy the full SHA
    4dd38c4 View commit details

  2. python.pkgs.django_extensions: 2.1.4 -> 2.1.9

    @FRidh
    FRidh committed Sep 10, 2019
    Copy the full SHA
    aa6c38d View commit details
Showing with 14 additions and 6 deletions.
  1. +1 −1 pkgs/development/python-modules/blessed/default.nix
  2. +13 −5 pkgs/development/python-modules/django-extensions/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/blessed/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ buildPythonPackage rec {
checkInputs = [ pytest mock glibcLocales ];

checkPhase = ''
LANG=en_US.utf-8 py.test blessed/tests
LANG=en_US.utf-8 py.test blessed/tests -k 'not test_nested_formattingstring_type_error'
'';

propagatedBuildInputs = [ wcwidth six ];
18 changes: 13 additions & 5 deletions pkgs/development/python-modules/django-extensions/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,39 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, six, typing
, six, typing, pygments
, django, shortuuid, python-dateutil, pytest
, pytest-django, pytestcov, mock, vobject
, werkzeug, glibcLocales
, werkzeug, glibcLocales, factory_boy
}:

buildPythonPackage rec {
pname = "django-extensions";
version = "2.1.4";
version = "2.1.9";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1bp0ybarkrj66qx2gn9954vsjqq2ya1w4bppfhr763mkis8qnb4f";
sha256 = "08vggm6wrn5cbf8brfprif0rjrkqz06wddsw0ir1skkk8q2sp1b2";
};

postPatch = ''
substituteInPlace setup.py --replace "'tox'," ""
# not yet pytest 5 compatible?
rm tests/management/commands/test_set_fake_emails.py
rm tests/management/commands/test_set_fake_passwords.py
rm tests/management/commands/test_validate_templates.py
# pip should not be used during tests...
rm tests/management/commands/test_pipchecker.py
'';

propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") typing;

checkInputs = [
django shortuuid python-dateutil pytest
pytest-django pytestcov mock vobject
werkzeug glibcLocales
werkzeug glibcLocales factory_boy pygments
];

LC_ALL = "en_US.UTF-8";