git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #154153 from dotlambda/django-extensions-3.1.5

python3Packages.django-extensions: 3.1.3 -> 3.1.5

commit91be887b49f7be995b874b6ca6b6059240dee74c authorFabian Affolter <fabian@affolter-engineering.ch> dateThu 13 Jan 2022, 08:58 (5 years ago) parent12384499baa45f
6 files changed+28−32
pkgs/applications/misc/archivebox/default.nix+2−2 pkgs/applications/office/paperless-ng/default.nix+1−1 pkgs/development/python-modules/django-extensions/default.nix+21−26 pkgs/servers/mail/mailman/hyperkitty.nix+2−2 pkgs/top-level/python-aliases.nix+1 pkgs/top-level/python-packages.nix+1−1
pkgs/applications/misc/archivebox/default.nix+2−2
@@ -4,7 +4,7 @@
44, requests
55, mypy-extensions
66, django_3
7−, django_extensions
7+, django-extensions
88, dateparser
99, youtube-dl
1010, python-crontab
@@ -37,7 +37,7 @@ buildPythonApplication rec {
3737 requests
3838 mypy-extensions
3939 django_3'
40− django_extensions
40+ django-extensions
4141 dateparser
4242 youtube-dl
4343 python-crontab
pkgs/applications/office/paperless-ng/default.nix+1−1
@@ -83,7 +83,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
8383 daphne
8484 dateparser
8585 django-cors-headers
86− django_extensions
86+ django-extensions
8787 django-filter
8888 django-picklefield
8989 django-q
pkgs/development/python-modules/django-extensions/default.nix+21−26
@@ -1,59 +1,54 @@
1−{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, django
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, django
25, factory_boy
3−, glibcLocales
46, mock
57, pygments
6−, pytest
7−, pytest-cov
88, pytest-django
9−, python-dateutil
9+, pytestCheckHook
1010, shortuuid
11−, six
12−, tox
13−, typing ? null
1411, vobject
1512, werkzeug
1613}:
1714
1815buildPythonPackage rec {
1916 pname = "django-extensions";
20− version = "3.1.3";
17+ version = "3.1.5";
2118
2219 src = fetchFromGitHub {
2320 owner = pname;
2421 repo = pname;
2522 rev = version;
26− sha256 = "03mhikhh49z8bxajbjf1j790b9c9vl4zf4f86iwz7g0zrd7jqlvm";
23+ sha256 = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM=";
2724 };
2825
29− LC_ALL = "en_US.UTF-8";
30− __darwinAllowLocalNetworking = true;
26+ postPatch = ''
27+ substituteInPlace setup.cfg \
28+ --replace "--cov=django_extensions --cov-report html --cov-report term" ""
29+ '';
3130
32− propagatedBuildInputs = [ six ]
33− ++ lib.optional (pythonOlder "3.5") typing;
31+ propagatedBuildInputs = [
32+ django
33+ ];
34+
35+ __darwinAllowLocalNetworking = true;
3436
3537 checkInputs = [
36− django
3738 factory_boy
38− glibcLocales
3939 mock
4040 pygments # not explicitly declared in setup.py, but some tests require it
41− pytest
42− pytest-cov
4341 pytest-django
44− python-dateutil
42+ pytestCheckHook
4543 shortuuid
46− tox
4744 vobject
4845 werkzeug
4946 ];
5047
51− # remove tests that need network access
52− checkPhase = ''
53− rm tests/management/commands/test_pipchecker.py
54− DJANGO_SETTINGS_MODULE=tests.testapp.settings \
55− pytest django_extensions tests
56− '';
48+ disabledTestPaths = [
49+ # requires network access
50+ "tests/management/commands/test_pipchecker.py"
51+ ];
5752
5853 meta = with lib; {
5954 description = "A collection of custom extensions for the Django Framework";
pkgs/servers/mail/mailman/hyperkitty.nix+2−2
@@ -12,7 +12,7 @@
1212, django-paintstore
1313, django-q
1414, django_compressor
15−, django_extensions
15+, django-extensions
1616, djangorestframework
1717, flufl_lock
1818, mistune_2_0
@@ -52,7 +52,7 @@ buildPythonPackage rec {
5252 django-mailman3
5353 django-q
5454 django_compressor
55− django_extensions
55+ django-extensions
5656 djangorestframework
5757 flufl_lock
5858 mistune_2_0
pkgs/top-level/python-aliases.nix+1
@@ -45,6 +45,7 @@ mapAliases ({
4545 discogs_client = discogs-client; # added 2021-07-02
4646 djangorestframework-jwt = drf-jwt; # added 2021-07-20
4747 django_environ = django-environ; # added 2021-12-25
48+ django_extensions = django-extensions; # added 2022-01-09
4849 django_redis = django-redis; # added 2021-10-11
4950 django_taggit = django-taggit; # added 2021-10-11
5051 dns = dnspython; # added 2017-12-10
pkgs/top-level/python-packages.nix+1−1
@@ -2212,7 +2212,7 @@ in {
22122212
22132213 django-environ = callPackage ../development/python-modules/django_environ { };
22142214
2215− django_extensions = callPackage ../development/python-modules/django-extensions { };
2215+ django-extensions = callPackage ../development/python-modules/django-extensions { };
22162216
22172217 django-filter = callPackage ../development/python-modules/django-filter { };
22182218