commit 86702b6b75292d7ba729267bf379367decf45ac9 · pyrox.dev/nixpkgs

+3 -8

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

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "configargparse";

     

       14
       -
         version = "1.7";

     

       15
        
         format = "setuptools";

     

       16
        
       

     

       17
        
         disabled = pythonOlder "3.7";

     
···

       20
        
           owner = "bw2";

     

       21
        
           repo = "ConfigArgParse";

     

       22
        
           tag = version;

     

       23
       -
           hash = "sha256-m77MY0IZ1AJkd4/Y7ltApvdF9y17Lgn92WZPYTCU9tA=";

     

       24
        
         };

     

       25
       -
       

     

       26
       -
         patches = [

     

       27
       -
           # https://github.com/bw2/ConfigArgParse/pull/295

     

       28
       -
           ./python3.13-compat.patch

     

       29
       -
         ];

     

       30
        
       

     

       31
        
         optional-dependencies = {

     

       32
        
           yaml = [ pyyaml ];

     
···

       48
        
         meta = with lib; {

     

       49
        
           description = "Drop-in replacement for argparse";

     

       50
        
           homepage = "https://github.com/bw2/ConfigArgParse";

     

       51
       -
           changelog = "https://github.com/bw2/ConfigArgParse/releases/tag/${version}";

     

       52
        
           license = licenses.mit;

     

       53
        
           maintainers = [ ];

     

       54
        
         };

···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "configargparse";

     

       14
       +
         version = "1.7.1";

     

       15
        
         format = "setuptools";

     

       16
        
       

     

       17
        
         disabled = pythonOlder "3.7";

     
···

       20
        
           owner = "bw2";

     

       21
        
           repo = "ConfigArgParse";

     

       22
        
           tag = version;

     

       23
       +
           hash = "sha256-wrWfQzr0smM83helOEJPbayrEpAtXJYYXIw4JnGLNho=";

     

       24
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
       

     

       26
        
         optional-dependencies = {

     

       27
        
           yaml = [ pyyaml ];

     
···

       43
        
         meta = with lib; {

     

       44
        
           description = "Drop-in replacement for argparse";

     

       45
        
           homepage = "https://github.com/bw2/ConfigArgParse";

     

       46
       +
           changelog = "https://github.com/bw2/ConfigArgParse/releases/tag/${src.tag}";

     

       47
        
           license = licenses.mit;

     

       48
        
           maintainers = [ ];

     

       49
        
         };

-112

pkgs/development/python-modules/configargparse/python3.13-compat.patch

···

       1
       -
       From c6a974211f1a13d492bb807ff6d07cefcc948a87 Mon Sep 17 00:00:00 2001

     

       2
       -
       From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>

     

       3
       -
       Date: Fri, 12 Jul 2024 08:15:40 +0200

     

       4
       -
       Subject: [PATCH 1/2] update test expectations for Python 3.13

     

       5
       -
       

     

       6
       -
       Python 3.13 no longer repeats the placeholder for options with multiple

     

       7
       -
       aliases in the help message.  For example, rather than:

     

       8
       -
       

     

       9
       -
           -c CONFIG_FILE, --config CONFIG_FILE

     

       10
       -
       

     

       11
       -
       it now outputs:

     

       12
       -
       

     

       13
       -
           -c, --config CONFIG_FILE

     

       14
       -
       

     

       15
       -
       Update the regular expressions to account for both possibilities.

     

       16
       -
       

     

       17
       -
       Fixes #294

     

       18
       -
       ---

     

       19
       -
        tests/test_configargparse.py | 24 ++++++++++++------------

     

       20
       -
        1 file changed, 12 insertions(+), 12 deletions(-)

     

       21
       -
       

     

       22
       -
       diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py

     

       23
       -
       index 288e082..e325afd 100644

     

       24
       -
       --- a/tests/test_configargparse.py

     

       25
       -
       +++ b/tests/test_configargparse.py

     

       26
       -
       @@ -271,9 +271,9 @@ def testBasicCase2(self, use_groups=False):

     

       27
       -
                        '  -h, --help \\s+ show this help message and exit\n'

     

       28
       -
                        '  --genome GENOME \\s+ Path to genome file\n'

     

       29
       -
                        '  -v\n'

     

       30
       -
       -                '  -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n'

     

       31
       -
       -                '  -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n'

     

       32
       -
       -                '  -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING +

     

       33
       -
       +                '  -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n'

     

       34
       -
       +                '  -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n'

     

       35
       -
       +                '  -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING +

     

       36
       -
                        7*r'(.+\s*)')

     

       37
       -
                else:

     

       38
       -
                    self.assertRegex(self.format_help(),

     

       39
       -
       @@ -286,10 +286,10 @@ def testBasicCase2(self, use_groups=False):

     

       40
       -
                        'g1:\n'

     

       41
       -
                        '  --genome GENOME \\s+ Path to genome file\n'

     

       42
       -
                        '  -v\n'

     

       43
       -
       -                '  -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n\n'

     

       44
       -
       +                '  -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n\n'

     

       45
       -
                        'g2:\n'

     

       46
       -
       -                '  -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n'

     

       47
       -
       -                '  -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING +

     

       48
       -
       +                '  -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n'

     

       49
       -
       +                '  -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING +

     

       50
       -
                        7*r'(.+\s*)')

     

       51
       -
        

     

       52
       -
                self.assertParseArgsRaises("invalid choice: 'ZZZ'",

     

       53
       -
       @@ -387,9 +387,9 @@ def testMutuallyExclusiveArgs(self):

     

       54
       -
                    ' \\s*-f2 TYPE2_CFG_FILE\\)\\s+\\(-f FRMT \\| -b\\)\n\n'

     

       55
       -
                    '%s:\n'

     

       56
       -
                    '  -h, --help            show this help message and exit\n'

     

       57
       -
       -            '  -f1 TYPE1_CFG_FILE, --type1-cfg-file TYPE1_CFG_FILE\n'

     

       58
       -
       -            '  -f2 TYPE2_CFG_FILE, --type2-cfg-file TYPE2_CFG_FILE\n'

     

       59
       -
       -            '  -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n'

     

       60
       -
       +            '  -f1( TYPE1_CFG_FILE)?, --type1-cfg-file TYPE1_CFG_FILE\n'

     

       61
       -
       +            '  -f2( TYPE2_CFG_FILE)?, --type2-cfg-file TYPE2_CFG_FILE\n'

     

       62
       -
       +            '  -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n'

     

       63
       -
                    '  -b, --bam\\s+\\[env var: BAM_FORMAT\\]\n\n'

     

       64
       -
                    'group1:\n'

     

       65
       -
                    '  --genome GENOME       Path to genome file\n'

     

       66
       -
       @@ -875,7 +875,7 @@ def testConstructor_ConfigFileArgs(self):

     

       67
       -
                    'usage: .* \\[-h\\] -c CONFIG_FILE --genome GENOME\n\n'

     

       68
       -
                    '%s:\n'

     

       69
       -
                    '  -h, --help\\s+ show this help message and exit\n'

     

       70
       -
       -            '  -c CONFIG_FILE, --config CONFIG_FILE\\s+ my config file\n'

     

       71
       -
       +            '  -c( CONFIG_FILE)?, --config CONFIG_FILE\\s+ my config file\n'

     

       72
       -
                    '  --genome GENOME\\s+ Path to genome file\n\n'%OPTIONAL_ARGS_STRING +

     

       73
       -
                    5*r'(.+\s*)')

     

       74
       -
        

     

       75
       -
       @@ -935,8 +935,8 @@ def test_FormatHelp(self):

     

       76
       -
                    r'\[-w CONFIG_OUTPUT_PATH\]\s* --arg1\s+ARG1\s*\[--flag\]\s*'

     

       77
       -
                    '%s:\\s*'

     

       78
       -
                    '-h, --help \\s* show this help message and exit '

     

       79
       -
       -            r'-c CONFIG_FILE, --config CONFIG_FILE\s+my config file '

     

       80
       -
       -            r'-w CONFIG_OUTPUT_PATH, --write-config CONFIG_OUTPUT_PATH takes '

     

       81
       -
       +            r'-c( CONFIG_FILE)?, --config CONFIG_FILE\s+my config file '

     

       82
       -
       +            r'-w( CONFIG_OUTPUT_PATH)?, --write-config CONFIG_OUTPUT_PATH takes '

     

       83
       -
                    r'the current command line args and writes them '

     

       84
       -
                    r'out to a config file at the given path, then exits '

     

       85
       -
                    r'--arg1 ARG1 Arg1 help text '

     

       86
       -
       

     

       87
       -
       From 5e9f442374bc6d9707a43df13aaff684dff6b535 Mon Sep 17 00:00:00 2001

     

       88
       -
       From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>

     

       89
       -
       Date: Fri, 12 Jul 2024 08:25:30 +0200

     

       90
       -
       Subject: [PATCH 2/2] skip exit_on_error* tests to fix 3.13 test failures

     

       91
       -
       

     

       92
       -
       Skip `exit_on_error*` tests from `test.test_argparse` to avoid test

     

       93
       -
       failures on Python 3.13.  The `exit_on_error=False` semantics

     

       94
       -
       is not supported by ConfigArgParse at the moment.

     

       95
       -
       ---

     

       96
       -
        tests/test_configargparse.py | 3 ++-

     

       97
       -
        1 file changed, 2 insertions(+), 1 deletion(-)

     

       98
       -
       

     

       99
       -
       diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py

     

       100
       -
       index e325afd..9718d86 100644

     

       101
       -
       --- a/tests/test_configargparse.py

     

       102
       -
       +++ b/tests/test_configargparse.py

     

       103
       -
       @@ -1533,7 +1533,8 @@ def testYAMLConfigFileParser_w_ArgumentParser_parsed_values(self):

     

       104
       -
            test_argparse_source_code = test_argparse_source_code.replace(

     

       105
       -
                'argparse.ArgumentParser', 'configargparse.ArgumentParser').replace(

     

       106
       -
                'TestHelpFormattingMetaclass', '_TestHelpFormattingMetaclass').replace(

     

       107
       -
       -        'test_main', '_test_main')

     

       108
       -
       +        'test_main', '_test_main').replace(

     

       109
       -
       +        'test_exit_on_error', '_test_exit_on_error')

     

       110
       -
        

     

       111
       -
            # pytest tries to collect tests from TestHelpFormattingMetaclass, and

     

       112
       -
            # test_main, and raises a warning when it finds it's not a test class