From 41405995d6dc893a105845ed4890663ccb9cd65a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Feb 2021 11:42:30 +0100 Subject: [PATCH 1/4] python3Packages.django-mailman3: 1.3.4 -> 1.3.5 --- .../python-modules/django-mailman3/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 11939b9b773..fbac0a82a17 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "7e37b68bb47e9ae196ca19018f576e2c8c90189c5bd82d4e549d0c2f2f3f35fb"; + sha256 = "sha256-NoWVs8JiPt6spb7qXxKIdCTDhO3W9wUs9EJEMHUIQxM="; }; propagatedBuildInputs = [ @@ -21,10 +21,12 @@ buildPythonPackage rec { PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test ''; + pythonImportsCheck = [ "django_mailman3" ]; + meta = with lib; { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ globin peti ]; }; } From 8a20e93b5036a275462de883bb2a8d9032993b22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Feb 2021 11:50:07 +0100 Subject: [PATCH 2/4] python3Packages.postorius: 1.3.3 -> 1.3.4 --- pkgs/servers/mail/mailman/postorius.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 9330de3a8f3..fc9f6217d93 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "postorius"; - version = "1.3.3"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "08jn23gblbkfl09qlykbpsmp39mmach3sl69h1j5cd5kkx839rwa"; + sha256 = "sha256-L2ApUGQNvR0UVvodVM+wMzjYLZkegI4fT4yUiU/cibU="; }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; @@ -17,10 +17,10 @@ buildPythonPackage rec { # Tries to connect to database. doCheck = false; - meta = { - homepage = "https://www.gnu.org/software/mailman/"; + meta = with lib; { + homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ globin peti ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ globin peti ]; }; } From 96997fc0b4d48f480dd2758ac5fbc893b2ad0fda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Feb 2021 11:29:40 +0100 Subject: [PATCH 3/4] python3Packages.readme_renderer: 28.0 -> 29.0 python3Packages.readme_renderer: update Python release --- pkgs/development/python-modules/readme_renderer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 57a84e69d20..3a54251886d 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -9,15 +9,17 @@ , future , pygments , six +, pythonOlder }: buildPythonPackage rec { pname = "readme_renderer"; - version = "28.0"; + version = "29.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6b7e5aa59210a40de72eb79931491eaf46fefca2952b9181268bd7c7c65c260a"; + sha256 = "sha256-kv1awr+Gd/MQ8zA6pLzludX58glKuYwp8TeR17gFo9s="; }; checkInputs = [ pytest mock ]; From 62a76604dcedd879fcb2d2f54031f5b558dd17ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Feb 2021 11:31:26 +0100 Subject: [PATCH 4/4] python3Packages.readme_renderer: update check part --- .../readme_renderer/default.nix | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 3a54251886d..0d22a0c56c9 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -1,14 +1,13 @@ { lib -, buildPythonPackage -, fetchPypi -, pytest -, mock -, cmarkgfm , bleach +, buildPythonPackage +, cmarkgfm , docutils +, fetchPypi , future +, mock , pygments -, six +, pytestCheckHook , pythonOlder }: @@ -22,21 +21,25 @@ buildPythonPackage rec { sha256 = "sha256-kv1awr+Gd/MQ8zA6pLzludX58glKuYwp8TeR17gFo9s="; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ - bleach cmarkgfm docutils future pygments six + bleach + cmarkgfm + docutils + future + pygments ]; - checkPhase = '' - # disable one failing test case - # fixtures test is failing for incorrect class name - py.test -k "not test_invalid_link and not fixtures" - ''; + checkInputs = [ + mock + pytestCheckHook + ]; - meta = { - description = "readme_renderer is a library for rendering readme descriptions for Warehouse"; + pythonImportsCheck = [ "readme_renderer" ]; + + meta = with lib; { + description = "Python library for rendering readme descriptions"; homepage = "https://github.com/pypa/readme_renderer"; - license = lib.licenses.asl20; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; }; }