diff --git a/normandy/base/auth_backends.py b/normandy/base/auth_backends.py index b96d73ff9..e71b857e7 100644 --- a/normandy/base/auth_backends.py +++ b/normandy/base/auth_backends.py @@ -20,7 +20,7 @@ class LoggingAuthBackendMixin(object): """ def get_username(self, **kwargs): - raise NotImplemented() + raise NotImplementedError def authenticate(self, request, **kwargs): result = super().authenticate(request, **kwargs) diff --git a/normandy/recipes/filters.py b/normandy/recipes/filters.py index 22042b0b2..3627fe7ec 100644 --- a/normandy/recipes/filters.py +++ b/normandy/recipes/filters.py @@ -34,7 +34,7 @@ def type(self): def to_jexl(self): """Render this filter to a JEXL expression""" - raise NotImplemented() + raise NotImplementedError class ChannelFilter(BaseFilter): diff --git a/normandy/recipes/signing.py b/normandy/recipes/signing.py index b25bf03ff..2b6965d5a 100644 --- a/normandy/recipes/signing.py +++ b/normandy/recipes/signing.py @@ -108,7 +108,7 @@ def verify_signature(data, signature, pubkey): raise WrongPublicKeySize() else: raise - except IndexError as e: + except IndexError: raise WrongPublicKeySize() try: diff --git a/requirements/constraints.txt b/requirements/constraints.txt index d37610463..9d6a398dc 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -4,9 +4,9 @@ atomicwrites==1.2.1 \ attrs==18.2.0 \ --hash=sha256:ca4be454458f9dec299268d472aaa5a11f67a4ff70093396e1ceae9c76cf4bbb \ --hash=sha256:10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69 -botocore==1.12.28 \ - --hash=sha256:b7868bcfddecd269e8f60e9c9b0079e2fa74bd21e0dae89fce70c012127ea4a0 \ - --hash=sha256:e28316bcda7af32dc7273a3842678c38b2c5f80c48f5e9443d7fdd35b138ea9a +botocore==1.12.33 \ + --hash=sha256:848c1f2600ce9e7f86ee769b7de1bd615d0b6c7ac9f123bd5555d8c15f7002fb \ + --hash=sha256:831ef636c525860644f9e322b4f23b0d5c2f959fd635281e4f4ed6d892495063 # NB: botocore 1.12.28 is holding urllib3 at < 1.24. When botocore supports urllib 1.24, remove the pyup hold. certifi==2018.10.15 \ --hash=sha256:339dc09518b07e2fa7eda5450740925974815557727d6bd35d319c1524a04a4c \ @@ -33,8 +33,8 @@ docutils==0.14 \ Faker==0.9.2 \ --hash=sha256:5ed822d31bd2d6edf10944d176d30dc9c886afdd381eefb7ba8b7aad86171646 \ --hash=sha256:2621643b80a10b91999925cfd20f64d2b36f20bf22136bbdc749bb57d6ffe124 -future==0.16.0 \ - --hash=sha256:e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb +future==0.17.0 \ + --hash=sha256:eb6d4df04f1fb538c99f69c9a28b255d1ee4e825d479b9c62fc38c0cf38065a4 greenlet==0.4.15 \ --hash=sha256:99a26afdb82ea83a265137a398f570402aa1f2b5dfb4ac3300c026931817b163 \ --hash=sha256:ac57fcdcfb0b73bb3203b58a14501abb7e5ff9ea5e2edfa06bb03035f0cff248 \ @@ -90,28 +90,27 @@ pluggy==0.8.0 \ py==1.7.0 \ --hash=sha256:e76826342cefe3c3d5f7e8ee4316b80d1dd8a300781612ddbc765c17ba25a6c6 \ --hash=sha256:bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694 -pycodestyle==2.3.1 \ - --hash=sha256:682256a5b318149ca0d2a9185d365d8864a768a28db66a84a2ea946bcc426766 \ - --hash=sha256:6c4245ade1edfad79c3446fadfc96b0de2759662dc29d07d80a6f27ad1ca6ba9 \ - # pyup: >=2.3,<2.4 # flake8 doesn't support >=2.4 +pycodestyle==2.4.0 \ + --hash=sha256:74abc4e221d393ea5ce1f129ea6903209940c1ecd29e002e8c6933c2b21026e0 \ + --hash=sha256:cbc619d09254895b0d12c2c691e237b2e91e9b2ecf5e84c26b35400f93dcfb83 \ + --hash=sha256:cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a pycparser==2.19 \ --hash=sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3 -pyflakes==1.6.0 \ - --hash=sha256:08bd6a50edf8cffa9fa09a463063c425ecaaf10d1eb0335a7e8b1401aef89e6f \ - --hash=sha256:8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805 \ - # pyup: <2.0 # flake8 doesn't support 2.0 -python-dateutil==2.7.3 \ - --hash=sha256:1adb80e7a782c12e52ef9a8182bebeb73f1d7e24e374397af06fb4956c8dc5c0 \ - --hash=sha256:e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8 -pytz==2018.5 \ - --hash=sha256:a061aa0a9e06881eb8b3b2b43f05b9439d6583c206d0a6c340ff72a7b6669053 \ - --hash=sha256:ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277 +pyflakes==2.0.0 \ + --hash=sha256:9a7662ec724d0120012f6e29d6248ae3727d821bba522a0e6b356eff19126a49 \ + --hash=sha256:f661252913bc1dbe7fcfcbf0af0db3f42ab65aabd1a6ca68fe5d466bace94dae +python-dateutil==2.7.5 \ + --hash=sha256:063df5763652e21de43de7d9e00ccf239f953a832941e37be541614732cdfc93 \ + --hash=sha256:88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02 +pytz==2018.7 \ + --hash=sha256:8e0f8568c118d3077b46be7d654cc8167fa916092e28320cde048e54bfc9f1e6 \ + --hash=sha256:31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca s3transfer==0.1.13 \ --hash=sha256:90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1 \ --hash=sha256:c7a9ec356982d5e9ab2d4b46391a7d6a950e2b04c472419f5fdec70cc0ada72f -setuptools==40.4.3 \ - --hash=sha256:ce4137d58b444bac11a31d4e0c1805c69d89e8ed4e91fde1999674ecc2f6f9ff \ - --hash=sha256:acbc5740dd63f243f46c2b4b8e2c7fd92259c2ddb55a4115b16418a2ed371b15 +setuptools==40.5.0 \ + --hash=sha256:e329a5c458c6acb5edc2b5c4ad44280c053ba827dc82fd5e84a83e22bb05460d \ + --hash=sha256:2a2a200f4a760adbded23a091a00be2eca4e28efed65c6120ea275f7e89a1eab simplejson==3.16.0 \ --hash=sha256:6c3258ffff58712818a233b9737fe4be943d306c40cf63d14ddc82ba563f483a \ --hash=sha256:2fc546e6af49fb45b93bbe878dea4c48edc34083729c0abd09981fe55bdf7f91 \ @@ -144,9 +143,9 @@ uritemplate==3.0.0 \ --hash=sha256:01c69f4fe8ed503b2951bef85d996a9d22434d2431584b5b107b2981ff416fbd \ --hash=sha256:1b9c467a940ce9fb9f50df819e8ddd14696f89b9a8cc87ac77952ba416e0a8fd \ --hash=sha256:c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d -urllib3==1.23 \ - --hash=sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5 \ - --hash=sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf +urllib3==1.24 \ + --hash=sha256:8819bba37a02d143296a4d032373c4dd4aca11f6d4c9973335ca75f9c8475f59 \ + --hash=sha256:41c3db2fc01e5b907288010dec72f9d0a74e37d6994e6eb56849f59fea2265ae # pyup: <1.24 # botocore 1.12.28 has requirement urllib3<1.24,>=1.20 webencodings==0.5.1 \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ diff --git a/requirements/default.txt b/requirements/default.txt index d552cce84..0f1ad1b53 100644 --- a/requirements/default.txt +++ b/requirements/default.txt @@ -7,9 +7,9 @@ bcrypt==3.1.4 \ --hash=sha256:49e96267cd9be55a349fd74f9852eb9ae2c427cd7f6455d0f1765d7332292832 \ --hash=sha256:67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d \ --hash=sha256:9a6fedda73aba1568962f7543a1f586051c54febbc74e87769bad6a4b8587c39 -boto3==1.9.28 \ - --hash=sha256:0556441f2cc5f8a84f57a5cb28ae5b23f9ddacc84aa5b4728e73e02cd9e21021 \ - --hash=sha256:73f8918a919bd753cf3a9d03f4387ce65b82b677c89c600e67ce3deaa9302524 +boto3==1.9.33 \ + --hash=sha256:cd7052ca5afd327b2c4ea09d2766703b52314dab2f33eeca08c1a84c7adaed38 \ + --hash=sha256:d99e944da4976400a5a80ae79a5c6ec6212ded4db6c4292b9d48228770fd7db1 dj-database-url==0.5.0 \ --hash=sha256:4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163 \ --hash=sha256:851785365761ebe4994a921b433062309eb882fedd318e1b0fcecc607ed02da9 @@ -62,9 +62,9 @@ ecdsa==0.13 \ factory_boy==2.11.1 \ --hash=sha256:d552cb872b310ae78bd7429bf318e42e1e903b1a109e899a523293dfa762ea4f \ --hash=sha256:6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca -flake8==3.5.0 \ - --hash=sha256:7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0 \ - --hash=sha256:c7841163e2b576d435799169b78703ad6ac1bbb0f199994fc05f700b2a90ea37 +flake8==3.6.0 \ + --hash=sha256:c01f8a3963b3571a8e6bd7a4063359aff90749e160778e03817cd9b71c9e07d2 \ + --hash=sha256:6a35f5b8761f45c5513e3405f110a86bea57982c3b75b766ce7b65217abe1670 flake8-junit-report==2.1.0 \ --hash=sha256:f8890c1ebe0acb516fefacddec4b802bca9f89bb07db933e4ee3cd11ceaa1e8b geoip2==2.9.0 \ @@ -167,14 +167,14 @@ pyjexl==0.2.3 \ pytest-django==3.4.3 \ --hash=sha256:49e9ffc856bc6a1bec1c26c5c7b7213dff7cc8bc6b64d624c4d143d04aff0bcf \ --hash=sha256:b379282feaf89069cb790775ab6bbbd2bd2038a68c7ef9b84a41898e0b551081 -pytest==3.9.1 \ - --hash=sha256:10e59f84267370ab20cec9305bafe7505ba4d6b93ecbf66a1cce86193ed511d5 \ - --hash=sha256:8c827e7d4816dfe13e9329c8226aef8e6e75d65b939bc74fda894143b6d1df59 +pytest==3.9.3 \ + --hash=sha256:bf47e8ed20d03764f963f0070ff1c8fda6e2671fc5dd562a4d3b7148ad60f5ca \ + --hash=sha256:a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db pytest-mock==1.10.0 \ --hash=sha256:53801e621223d34724926a5c98bd90e8e417ce35264365d39d6c896388dcc928 \ --hash=sha256:d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0 -pytest-testrail==1.1.6 \ - --hash=sha256:4b4a3a892419b1ce1bbdfd093680d9f6b77efde60181f7294093270bac4e04fe +pytest-testrail==2.3.0 \ + --hash=sha256:816e2e232728d3dfd651c230c7036a2ba5afb7532f91544ee14999a5ae61cfd0 raven==6.9.0 \ --hash=sha256:95f44f3ea2c1b176d5450df4becdb96c15bf2632888f9ab193e9dd22300ce46a \ --hash=sha256:3fd787d19ebb49919268f06f19310e8112d619ef364f7989246fc8753d469888