commit 821e00b1498b27f5217beb0a83bdc5ff6fdb019e · pyrox.dev/nixpkgs

+10 -1

pkgs/development/python-modules/flask-restful/default.nix

···

       5
       5
        
         buildPythonPackage,

     

       6
       6
        
         fetchPypi,

     

       7
       7
        
         flask,

     

       8
       8
       +
         fetchpatch2,

     

       8
       9
        
         mock,

     

       9
       10
        
         nose,

     

       10
       11
        
         pytestCheckHook,

     
···

       30
       31
        
         # conditional so that overrides are easier for web applications

     

       31
       32
        
         patches =

     

       32
       33
        
           lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [ ./werkzeug-2.1.0-compat.patch ]

     

       33
       33
       -
           ++ lib.optionals (lib.versionAtLeast flask.version "3.0.0") [ ./flask-3.0-compat.patch ];

     

       34
       34
       +
           ++ lib.optionals (lib.versionAtLeast flask.version "3.0.0") [ ./flask-3.0-compat.patch ]

     

       35
       35
       +
           ++ [

     

       36
       36
       +
             # replace use nose by pytest: https://github.com/flask-restful/flask-restful/pull/970

     

       37
       37
       +
             (fetchpatch2 {

     

       38
       38
       +
               url = "https://github.com/flask-restful/flask-restful/commit/6cc4b057e5450e0c84b3ee5f6f7a97e648a816d6.patch?full_index=1";

     

       39
       39
       +
               hash = "sha256-kIjrkyL0OfX+gjoiYfchU0QYTPHz4JMCQcHLFH9oEF4=";

     

       40
       40
       +
             })

     

       41
       41
       +
             ./fix-test-inputs.patch

     

       42
       42
       +
           ];

     

       34
       43
        
       

     

       35
       44
        
         propagatedBuildInputs = [

     

       36
       45
        
           aniso8601

+173

pkgs/development/python-modules/flask-restful/fix-test-inputs.patch

···

       1
       1
       +
       diff --git a/tests/test_inputs.py b/tests/test_inputs.py

     

       2
       2
       +
       index 7c30d45..645b728 100644

     

       3
       3
       +
       --- a/tests/test_inputs.py

     

       4
       4
       +
       +++ b/tests/test_inputs.py

     

       5
       5
       +
       @@ -5,6 +5,7 @@ import re

     

       6
       6
       +
        

     

       7
       7
       +
        #noinspection PyUnresolvedReferences

     

       8
       8
       +
        import six

     

       9
       9
       +
       +import pytest

     

       10
       10
       +
        

     

       11
       11
       +
        from flask_restful import inputs

     

       12
       12
       +
        

     

       13
       13
       +
       @@ -17,7 +18,7 @@ def test_reverse_rfc822_datetime():

     

       14
       14
       +
            ]

     

       15
       15
       +
        

     

       16
       16
       +
            for date_string, expected in dates:

     

       17
       17
       +
       -        yield assert_equal, inputs.datetime_from_rfc822(date_string), expected

     

       18
       18
       +
       +        assert inputs.datetime_from_rfc822(date_string) == expected

     

       19
       19
       +
        

     

       20
       20
       +
        

     

       21
       21
       +
        def test_reverse_iso8601_datetime():

     

       22
       22
       +
       @@ -29,7 +30,7 @@ def test_reverse_iso8601_datetime():

     

       23
       23
       +
            ]

     

       24
       24
       +
        

     

       25
       25
       +
            for date_string, expected in dates:

     

       26
       26
       +
       -        yield assert_equal, inputs.datetime_from_iso8601(date_string), expected

     

       27
       27
       +
       +        assert inputs.datetime_from_iso8601(date_string) == expected

     

       28
       28
       +
        

     

       29
       29
       +
        

     

       30
       30
       +
        def test_urls():

     

       31
       31
       +
       @@ -53,7 +54,7 @@ def test_urls():

     

       32
       32
       +
            ]

     

       33
       33
       +
        

     

       34
       34
       +
            for value in urls:

     

       35
       35
       +
       -        yield assert_equal, inputs.url(value), value

     

       36
       36
       +
       +        assert inputs.url(value) == value

     

       37
       37
       +
        

     

       38
       38
       +
        

     

       39
       39
       +
        def check_bad_url_raises(value):

     

       40
       40
       +
       @@ -118,7 +119,8 @@ def test_regex_bad_input():

     

       41
       41
       +
            num_only = inputs.regex(r'^[0-9]+$')

     

       42
       42
       +
        

     

       43
       43
       +
            for value in cases:

     

       44
       44
       +
       -        yield assert_raises, ValueError, lambda: num_only(value)

     

       45
       45
       +
       +        with pytest.raises(ValueError):

     

       46
       46
       +
       +            num_only(value)

     

       47
       47
       +
        

     

       48
       48
       +
        

     

       49
       49
       +
        def test_regex_good_input():

     

       50
       50
       +
       @@ -131,12 +133,13 @@ def test_regex_good_input():

     

       51
       51
       +
            num_only = inputs.regex(r'^[0-9]+$')

     

       52
       52
       +
        

     

       53
       53
       +
            for value in cases:

     

       54
       54
       +
       -        yield assert_equal, num_only(value), value

     

       55
       55
       +
       +        assert num_only(value) == value

     

       56
       56
       +
        

     

       57
       57
       +
        

     

       58
       58
       +
        def test_regex_bad_pattern():

     

       59
       59
       +
            """Regex error raised immediately when regex input parser is created."""

     

       60
       60
       +
       -    assert_raises(re.error, inputs.regex, '[')

     

       61
       61
       +
       +    with pytest.raises(re.error):

     

       62
       62
       +
       +        inputs.regex('[')

     

       63
       63
       +
        

     

       64
       64
       +
        

     

       65
       65
       +
        def test_regex_flags_good_input():

     

       66
       66
       +
       @@ -149,7 +152,7 @@ def test_regex_flags_good_input():

     

       67
       67
       +
            case_insensitive = inputs.regex(r'^[A-Z]+$', re.IGNORECASE)

     

       68
       68
       +
        

     

       69
       69
       +
            for value in cases:

     

       70
       70
       +
       -        yield assert_equal, case_insensitive(value), value

     

       71
       71
       +
       +        assert case_insensitive(value) == value

     

       72
       72
       +
        

     

       73
       73
       +
        

     

       74
       74
       +
        def test_regex_flags_bad_input():

     

       75
       75
       +
       @@ -161,7 +164,8 @@ def test_regex_flags_bad_input():

     

       76
       76
       +
            case_sensitive = inputs.regex(r'^[A-Z]+$')

     

       77
       77
       +
        

     

       78
       78
       +
            for value in cases:

     

       79
       79
       +
       -        yield assert_raises, ValueError, lambda: case_sensitive(value)

     

       80
       80
       +
       +        with pytest.raises(ValueError):

     

       81
       81
       +
       +            case_sensitive(value)

     

       82
       82
       +
        

     

       83
       83
       +
        

     

       84
       84
       +
        class TypesTestCase(unittest.TestCase):

     

       85
       85
       +
       @@ -191,35 +195,41 @@ class TypesTestCase(unittest.TestCase):

     

       86
       86
       +
                assert inputs.boolean(False) == False

     

       87
       87
       +
        

     

       88
       88
       +
            def test_bad_boolean(self):

     

       89
       89
       +
       -        assert_raises(ValueError, lambda: inputs.boolean("blah"))

     

       90
       90
       +
       +        with pytest.raises(ValueError):

     

       91
       91
       +
       +            inputs.boolean("blah")

     

       92
       92
       +
        

     

       93
       93
       +
            def test_date_later_than_1900(self):

     

       94
       94
       +
                assert inputs.date("1900-01-01") == datetime(1900, 1, 1)

     

       95
       95
       +
        

     

       96
       96
       +
            def test_date_input_error(self):

     

       97
       97
       +
       -        assert_raises(ValueError, lambda: inputs.date("2008-13-13"))

     

       98
       98
       +
       +        with pytest.raises(ValueError):

     

       99
       99
       +
       +            inputs.date("2008-13-13")

     

       100
       100
       +
        

     

       101
       101
       +
            def test_date_input(self):

     

       102
       102
       +
                assert inputs.date("2008-08-01") == datetime(2008, 8, 1)

     

       103
       103
       +
        

     

       104
       104
       +
            def test_natual_negative(self):

     

       105
       105
       +
       -        assert_raises(ValueError, lambda: inputs.natural(-1))

     

       106
       106
       +
       +        with pytest.raises(ValueError):

     

       107
       107
       +
       +            inputs.natural(-1)

     

       108
       108
       +
        

     

       109
       109
       +
            def test_natural(self):

     

       110
       110
       +
                assert 3 == inputs.natural(3)

     

       111
       111
       +
        

     

       112
       112
       +
            def test_natual_string(self):

     

       113
       113
       +
       -        assert_raises(ValueError, lambda: inputs.natural('foo'))

     

       114
       114
       +
       +        with pytest.raises(ValueError):

     

       115
       115
       +
       +            inputs.natural('foo')

     

       116
       116
       +
        

     

       117
       117
       +
            def test_positive(self):

     

       118
       118
       +
                assert 1 == inputs.positive(1)

     

       119
       119
       +
                assert 10000 == inputs.positive(10000)

     

       120
       120
       +
        

     

       121
       121
       +
            def test_positive_zero(self):

     

       122
       122
       +
       -        assert_raises(ValueError, lambda: inputs.positive(0))

     

       123
       123
       +
       +        with pytest.raises(ValueError):

     

       124
       124
       +
       +            inputs.positive(0)

     

       125
       125
       +
        

     

       126
       126
       +
            def test_positive_negative_input(self):

     

       127
       127
       +
       -        assert_raises(ValueError, lambda: inputs.positive(-1))

     

       128
       128
       +
       +        with pytest.raises(ValueError):

     

       129
       129
       +
       +            inputs.positive(-1)

     

       130
       130
       +
        

     

       131
       131
       +
            def test_int_range_good(self):

     

       132
       132
       +
                int_range = inputs.int_range(1, 5)

     

       133
       133
       +
       @@ -231,11 +241,13 @@ class TypesTestCase(unittest.TestCase):

     

       134
       134
       +
        

     

       135
       135
       +
            def test_int_range_low(self):

     

       136
       136
       +
                int_range = inputs.int_range(0, 5)

     

       137
       137
       +
       -        assert_raises(ValueError, lambda: int_range(-1))

     

       138
       138
       +
       +        with pytest.raises(ValueError):

     

       139
       139
       +
       +            int_range(-1)

     

       140
       140
       +
        

     

       141
       141
       +
            def test_int_range_high(self):

     

       142
       142
       +
                int_range = inputs.int_range(0, 5)

     

       143
       143
       +
       -        assert_raises(ValueError, lambda: int_range(6))

     

       144
       144
       +
       +        with pytest.raises(ValueError):

     

       145
       145
       +
       +            int_range(6)

     

       146
       146
       +
        

     

       147
       147
       +
        

     

       148
       148
       +
        def test_isointerval():

     

       149
       149
       +
       @@ -389,7 +401,7 @@ def test_isointerval():

     

       150
       150
       +
            ]

     

       151
       151
       +
        

     

       152
       152
       +
            for value, expected in intervals:

     

       153
       153
       +
       -        yield assert_equal, inputs.iso8601interval(value), expected

     

       154
       154
       +
       +        assert inputs.iso8601interval(value) == expected

     

       155
       155
       +
        

     

       156
       156
       +
        

     

       157
       157
       +
        def test_invalid_isointerval_error():

     

       158
       158
       +
       @@ -413,12 +425,9 @@ def test_bad_isointervals():

     

       159
       159
       +
            ]

     

       160
       160
       +
        

     

       161
       161
       +
            for bad_interval in bad_intervals:

     

       162
       162
       +
       -        yield (

     

       163
       163
       +
       -            assert_raises,

     

       164
       164
       +
       -            Exception,

     

       165
       165
       +
       -            inputs.iso8601interval,

     

       166
       166
       +
       -            bad_interval,

     

       167
       167
       +
       -        )

     

       168
       168
       +
       +        with pytest.raises(Exception):

     

       169
       169
       +
       +            inputs.iso8601interval(bad_interval)

     

       170
       170
       +
       +

     

       171
       171
       +
        

     

       172
       172
       +
        if __name__ == '__main__':

     

       173
       173
       +
            unittest.main()