commit ebbcf9bdda805a76669eed07c8df273658b7ac55 · pyrox.dev/nixpkgs

pkgs/by-name/pr/pretalx/package.nix

···

       80
       80
        
       

     

       81
       81
        
         pythonRelaxDeps = [

     

       82
       82
        
           "bleach"

     

       83
       83
       +
           "beautifulsoup4"

     

       83
       84
        
           "celery"

     

       84
       85
        
           "css-inline"

     

       85
       86
        
           "cssutils"

+26 -23

pkgs/development/python-modules/beautifulsoup4/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchPypi,

     

       5
       5
       -
         fetchpatch,

     

       5
       5
       +
       

     

       6
       6
       +
         # build-system

     

       7
       7
       +
         hatchling,

     

       8
       8
       +
       

     

       9
       9
       +
         # docs

     

       10
       10
       +
         sphinxHook,

     

       11
       11
       +
       

     

       12
       12
       +
         # dependencies

     

       13
       13
       +
         soupsieve,

     

       14
       14
       +
         typing-extensions,

     

       15
       15
       +
       

     

       16
       16
       +
         # optional-dependencies

     

       6
       17
        
         chardet,

     

       7
       7
       -
         hatchling,

     

       18
       18
       +
         charset-normalizer,

     

       19
       19
       +
         faust-cchardet,

     

       8
       20
        
         html5lib,

     

       9
       21
        
         lxml,

     

       22
       22
       +
       

     

       23
       23
       +
         # tests

     

       10
       24
        
         pytestCheckHook,

     

       11
       11
       -
         pythonOlder,

     

       12
       12
       -
         soupsieve,

     

       13
       13
       -
         sphinxHook,

     

       14
       25
        
       

     

       15
       26
        
         # for passthru.tests

     

       16
       27
        
         html-sanitizer,

     
···

       23
       34
        
       

     

       24
       35
        
       buildPythonPackage rec {

     

       25
       36
        
         pname = "beautifulsoup4";

     

       26
       26
       -
         version = "4.12.3";

     

       37
       37
       +
         version = "4.13.4";

     

       27
       38
        
         pyproject = true;

     

       28
       39
        
       

     

       29
       40
        
         outputs = [

     

       30
       41
        
           "out"

     

       31
       42
        
           "doc"

     

       32
       43
        
         ];

     

       33
       33
       -
       

     

       34
       34
       -
         disabled = pythonOlder "3.6";

     

       35
       44
        
       

     

       36
       45
        
         src = fetchPypi {

     

       37
       46
        
           inherit pname version;

     

       38
       38
       -
           hash = "sha256-dOPRko7cBw0hdIGFxG4/szSQ8i9So63e6a7g9Pd4EFE=";

     

       47
       47
       +
           hash = "sha256-27PE4c6uau/r2vJCMkcmDNBiQwpBDjjGbyuqUKhDcZU=";

     

       39
       48
        
         };

     

       40
       49
        
       

     

       41
       41
       -
         patches = [

     

       42
       42
       -
           (fetchpatch {

     

       43
       43
       -
             name = "tests.patch";

     

       44
       44
       -
             url = "https://git.launchpad.net/beautifulsoup/patch/?id=9786a62726de5a8caba10021c4d4a58c8a3e9e3f";

     

       45
       45
       -
             hash = "sha256-FOMoJjT0RgqKjbTLN/qCuc0HjhKeenMcgwb9Fp8atAY=";

     

       46
       46
       -
           })

     

       47
       47
       -
         ];

     

       50
       50
       +
         build-system = [ hatchling ];

     

       48
       51
        
       

     

       49
       49
       -
         nativeBuildInputs = [

     

       50
       50
       -
           hatchling

     

       51
       51
       -
           sphinxHook

     

       52
       52
       -
         ];

     

       52
       52
       +
         nativeBuildInputs = [ sphinxHook ];

     

       53
       53
        
       

     

       54
       54
       -
         propagatedBuildInputs = [

     

       55
       55
       -
           chardet

     

       54
       54
       +
         dependencies = [

     

       56
       55
        
           soupsieve

     

       56
       56
       +
           typing-extensions

     

       57
       57
        
         ];

     

       58
       58
        
       

     

       59
       59
        
         optional-dependencies = {

     

       60
       60
       +
           chardet = [ chardet ];

     

       61
       61
       +
           cchardet = [ faust-cchardet ];

     

       62
       62
       +
           charset-normalizer = [ charset-normalizer ];

     

       60
       63
        
           html5lib = [ html5lib ];

     

       61
       64
        
           lxml = [ lxml ];

     

       62
       65
        
         };

     

       63
       66
        
       

     

       64
       67
        
         nativeCheckInputs = [

     

       65
       68
        
           pytestCheckHook

     

       66
       66
       -
         ] ++ lib.flatten (builtins.attrValues optional-dependencies);

     

       69
       69
       +
         ] ++ lib.flatten (lib.attrValues optional-dependencies);

     

       67
       70
        
       

     

       68
       71
        
         pythonImportsCheck = [ "bs4" ];

     

       69
       72

+39

pkgs/development/python-modules/django-compressor/bs4-4.13-compat.patch

···

       1
       1
       +
       From 53f50bc0cee1cdfaf023ba65e1524b820cb7c18e Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Matthias Kestenholz <mk@feinheit.ch>

     

       3
       3
       +
       Date: Thu, 22 May 2025 10:37:20 +0200

     

       4
       4
       +
       Subject: [PATCH] Disable bs4's multi valued attributes

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        compressor/parser/beautifulsoup.py | 12 ++++--------

     

       8
       8
       +
        1 file changed, 4 insertions(+), 8 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/compressor/parser/beautifulsoup.py b/compressor/parser/beautifulsoup.py

     

       11
       11
       +
       index 91897485..f673410e 100644

     

       12
       12
       +
       --- a/compressor/parser/beautifulsoup.py

     

       13
       13
       +
       +++ b/compressor/parser/beautifulsoup.py

     

       14
       14
       +
       @@ -10,7 +10,9 @@ def __init__(self, content):

     

       15
       15
       +
                try:

     

       16
       16
       +
                    from bs4 import BeautifulSoup

     

       17
       17
       +
        

     

       18
       18
       +
       -            self.soup = BeautifulSoup(self.content, "html.parser")

     

       19
       19
       +
       +            # Disable multi_valued_attributes

     

       20
       20
       +
       +            # http://www.crummy.com/software/BeautifulSoup/bs4/doc/#multi-valued-attributes

     

       21
       21
       +
       +            self.soup = BeautifulSoup(self.content, "html.parser", multi_valued_attributes={})

     

       22
       22
       +
                except ImportError as err:

     

       23
       23
       +
                    raise ImproperlyConfigured("Error while importing BeautifulSoup: %s" % err)

     

       24
       24
       +
        

     

       25
       25
       +
       @@ -21,13 +23,7 @@ def js_elems(self):

     

       26
       26
       +
                return self.soup.find_all("script")

     

       27
       27
       +
        

     

       28
       28
       +
            def elem_attribs(self, elem):

     

       29
       29
       +
       -        attrs = dict(elem.attrs)

     

       30
       30
       +
       -        # hack around changed behaviour in bs4, it returns lists now instead of one string, see

     

       31
       31
       +
       -        # http://www.crummy.com/software/BeautifulSoup/bs4/doc/#multi-valued-attributes

     

       32
       32
       +
       -        for key, value in attrs.items():

     

       33
       33
       +
       -            if type(value) is list:

     

       34
       34
       +
       -                attrs[key] = " ".join(value)

     

       35
       35
       +
       -        return attrs

     

       36
       36
       +
       +        return elem.attrs

     

       37
       37
       +
        

     

       38
       38
       +
            def elem_content(self, elem):

     

       39
       39
       +
                return elem.string

pkgs/development/python-modules/django-compressor/default.nix

···

       34
       34
        
           hash = "sha256-wdikii7k2LfyPEEeucl+LYjbGKGLocnoF41fW4NmqCI=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
       +
         patches = [

     

       38
       38
       +
           # https://github.com/django-compressor/django-compressor/issues/1279

     

       39
       39
       +
           # https://github.com/django-compressor/django-compressor/pull/1296

     

       40
       40
       +
           ./bs4-4.13-compat.patch

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       37
       43
        
         build-system = [

     

       38
       44
        
           setuptools

     

       39
       45
        
         ];

+14 -7

pkgs/development/python-modules/django-scheduler/default.nix

···

       4
       4
        
         django,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
        
         icalendar,

     

       7
       7
       -
         python,

     

       7
       7
       +
         pytestCheckHook,

     

       8
       8
       +
         pytest-django,

     

       8
       9
        
         python-dateutil,

     

       9
       10
        
         pythonOlder,

     

       10
       11
        
         pytz,

     

       12
       12
       +
         setuptools,

     

       11
       13
        
       }:

     

       12
       14
        
       

     

       13
       15
        
       buildPythonPackage rec {

     

       14
       16
        
         pname = "django-scheduler";

     

       15
       17
        
         version = "0.10.1";

     

       16
       16
       -
         format = "setuptools";

     

       18
       18
       +
         pyproject = true;

     

       17
       19
        
       

     

       18
       20
        
         disabled = pythonOlder "3.7";

     

       19
       21
        
       

     
···

       24
       26
        
           hash = "sha256-dY2TPo15RRWrv7LheUNJSQl4d/HeptSMM/wQirRSI5w=";

     

       25
       27
        
         };

     

       26
       28
        
       

     

       27
       27
       -
         propagatedBuildInputs = [

     

       29
       29
       +
         build-system = [ setuptools ];

     

       30
       30
       +
       

     

       31
       31
       +
         dependencies = [

     

       28
       32
        
           django

     

       29
       33
        
           python-dateutil

     

       30
       34
        
           pytz

     

       31
       35
        
           icalendar

     

       32
       36
        
         ];

     

       33
       37
        
       

     

       34
       34
       -
         checkPhase = ''

     

       35
       35
       -
           runHook preCheck

     

       36
       36
       -
           ${python.interpreter} -m django check --settings=tests.settings

     

       37
       37
       -
           runHook postCheck

     

       38
       38
       +
         nativeCheckInputs = [

     

       39
       39
       +
           pytestCheckHook

     

       40
       40
       +
           pytest-django

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         preCheck = ''

     

       44
       44
       +
           export DJANGO_SETTINGS_MODULE=tests.settings

     

       38
       45
        
         '';

     

       39
       46
        
       

     

       40
       47
        
         pythonImportsCheck = [ "schedule" ];

+9 -18

pkgs/development/python-modules/inline-snapshot/default.nix

···

       3
       3
        
         asttokens,

     

       4
       4
        
         black,

     

       5
       5
        
         buildPythonPackage,

     

       6
       6
       -
         click,

     

       7
       6
        
         dirty-equals,

     

       8
       7
        
         executing,

     

       9
       8
        
         fetchFromGitHub,

     
···

       21
       20
        
         rich,

     

       22
       21
        
         time-machine,

     

       23
       22
        
         toml,

     

       24
       24
       -
         types-toml,

     

       25
       25
       -
         typing-extensions,

     

       26
       23
        
       }:

     

       27
       24
        
       

     

       28
       25
        
       buildPythonPackage rec {

     

       29
       26
        
         pname = "inline-snapshot";

     

       30
       30
       -
         version = "0.21.3";

     

       27
       27
       +
         version = "0.23.0";

     

       31
       28
        
         pyproject = true;

     

       32
       32
       -
       

     

       33
       33
       -
         disabled = pythonOlder "3.10";

     

       34
       29
        
       

     

       35
       30
        
         src = fetchFromGitHub {

     

       36
       31
        
           owner = "15r10nk";

     

       37
       32
        
           repo = "inline-snapshot";

     

       38
       33
        
           tag = version;

     

       39
       39
       -
           hash = "sha256-ll2wSSTr2QEUXE5liYw+JhcYsTEcJCWWTFXRagd6fCw=";

     

       34
       34
       +
           hash = "sha256-UiVxG9W1lwvvoflVey4250iL8gL8Tm41LBo0ab0tTqk=";

     

       40
       35
        
         };

     

       41
       36
        
       

     

       42
       37
        
         build-system = [ hatchling ];

     
···

       44
       39
        
         dependencies =

     

       45
       40
        
           [

     

       46
       41
        
             asttokens

     

       47
       47
       -
             black

     

       48
       48
       -
             click

     

       49
       42
        
             executing

     

       50
       43
        
             rich

     

       51
       51
       -
             typing-extensions

     

       44
       44
       +
             toml

     

       52
       45
        
           ]

     

       53
       46
        
           ++ lib.optionals (pythonOlder "3.11") [

     

       54
       54
       -
             types-toml

     

       55
       47
        
             toml

     

       56
       48
        
           ];

     

       57
       49
        
       

     

       58
       50
        
         nativeCheckInputs = [

     

       59
       59
       -
           dirty-equals

     

       60
       51
        
           freezegun

     

       61
       52
        
           hypothesis

     

       62
       53
        
           pydantic

     
···

       67
       58
        
           pytest-xdist

     

       68
       59
        
           pytestCheckHook

     

       69
       60
        
           time-machine

     

       70
       70
       -
         ];

     

       61
       61
       +
         ] ++ lib.flatten (lib.attrValues optional-dependencies);

     

       62
       62
       +
       

     

       63
       63
       +
         optional-dependencies = {

     

       64
       64
       +
           black = [ black ];

     

       65
       65
       +
           dirty-equals = [ dirty-equals ];

     

       66
       66
       +
         };

     

       71
       67
        
       

     

       72
       68
        
         pythonImportsCheck = [ "inline_snapshot" ];

     

       73
       69
        
       

     

       74
       70
        
         disabledTestPaths = [

     

       75
       71
        
           # Tests don't play nice with pytest-xdist

     

       76
       72
        
           "tests/test_typing.py"

     

       77
       77
       -
         ];

     

       78
       78
       -
       

     

       79
       79
       -
         disabledTests = [

     

       80
       80
       -
           # Tests for precise formatting

     

       81
       81
       -
           "test_empty_sub_snapshot"

     

       82
       73
        
         ];

     

       83
       74
        
       

     

       84
       75
        
         meta = with lib; {