mirror of
				https://github.com/zulip/zulip.git
				synced 2025-10-31 12:03:46 +00:00 
			
		
		
		
	requirements: Upgrade Thumbor to 7.0.0a5 on Python 3.
Co-authored-by: Anders Kaseorg <anders@zulip.com> Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
		| @@ -1,23 +0,0 @@ | ||||
| # | ||||
| # This file is GENERATED.  Don't edit directly. | ||||
| # | ||||
| # To update, edit the non-"lock" files in requirements/*.txt, then: | ||||
| # | ||||
| #    tools/update-locked-requirements | ||||
| # | ||||
| # For details, see requirements/README.md . | ||||
| # | ||||
| wheel==0.34.2 \ | ||||
|     --hash=sha256:8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96 \ | ||||
|     --hash=sha256:df277cb51e61359aba502208d680f90c0493adec6f0e848af94948778aed386e \ | ||||
|     # via -r requirements/pip2.in | ||||
|  | ||||
| # The following packages are considered to be unsafe in a requirements file: | ||||
| pip==20.1.1 \ | ||||
|     --hash=sha256:27f8dc29387dd83249e06e681ce087e6061826582198a425085e0bf4c1cf3a55 \ | ||||
|     --hash=sha256:b27c4dedae8c41aa59108f2fa38bf78e0890e590545bc8ece7cdceb4ba60f6e4 \ | ||||
|     # via -r requirements/pip2.in | ||||
| setuptools==44.1.1 \ | ||||
|     --hash=sha256:27a714c09253134e60a6fa68130f78c7037e5562c4f21f8f318f2ae900d152d5 \ | ||||
|     --hash=sha256:c67aa55db532a0dadc4d2e20ba9961cbd3ccc84d544e9029699822542b5a476b \ | ||||
|     # via -r requirements/pip2.in | ||||
| @@ -1,3 +1,2 @@ | ||||
| -r pip.in | ||||
| -r thumbor.in | ||||
| pip-tools | ||||
|   | ||||
| @@ -7,85 +7,176 @@ | ||||
| # | ||||
| # For details, see requirements/README.md . | ||||
| # | ||||
| argparse==1.4.0 \ | ||||
|     --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \ | ||||
|     --hash=sha256:c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314 \ | ||||
| aiobotocore==1.0.7 \ | ||||
|     --hash=sha256:9589d812714a5b78f0b8249916c17374e507dd7edfd5038a85cd6f25028506f3 \ | ||||
|     --hash=sha256:d3183a22a376a97ed0a739854408fcf4ee9f24a629b38f84451b7e2111622ae3 \ | ||||
|     # via tc-aws | ||||
| aiohttp==3.6.2 \ | ||||
|     --hash=sha256:1e984191d1ec186881ffaed4581092ba04f7c61582a177b187d3a2f07ed9719e \ | ||||
|     --hash=sha256:259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326 \ | ||||
|     --hash=sha256:2f4d1a4fdce595c947162333353d4a44952a724fba9ca3205a3df99a33d1307a \ | ||||
|     --hash=sha256:32e5f3b7e511aa850829fbe5aa32eb455e5534eaa4b1ce93231d00e2f76e5654 \ | ||||
|     --hash=sha256:344c780466b73095a72c616fac5ea9c4665add7fc129f285fbdbca3cccf4612a \ | ||||
|     --hash=sha256:460bd4237d2dbecc3b5ed57e122992f60188afe46e7319116da5eb8a9dfedba4 \ | ||||
|     --hash=sha256:4c6efd824d44ae697814a2a85604d8e992b875462c6655da161ff18fd4f29f17 \ | ||||
|     --hash=sha256:50aaad128e6ac62e7bf7bd1f0c0a24bc968a0c0590a726d5a955af193544bcec \ | ||||
|     --hash=sha256:6206a135d072f88da3e71cc501c59d5abffa9d0bb43269a6dcd28d66bfafdbdd \ | ||||
|     --hash=sha256:65f31b622af739a802ca6fd1a3076fd0ae523f8485c52924a89561ba10c49b48 \ | ||||
|     --hash=sha256:ae55bac364c405caa23a4f2d6cfecc6a0daada500274ffca4a9230e7129eac59 \ | ||||
|     --hash=sha256:b778ce0c909a2653741cb4b1ac7015b5c130ab9c897611df43ae6a58523cb965 \ | ||||
|     # via aiobotocore | ||||
| aioitertools==0.7.0 \ | ||||
|     --hash=sha256:341cb05a0903177ef1b73d4cc12c92aee18e81c364e0138f4efc7ec3c47b8177 \ | ||||
|     --hash=sha256:e931a2f0dcabd4a8446b5cc2fc71b8bb14716e6adf37728a70869213f1f741cd \ | ||||
|     # via aiobotocore | ||||
| async-timeout==3.0.1 \ | ||||
|     --hash=sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f \ | ||||
|     --hash=sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3 \ | ||||
|     # via aiohttp | ||||
| attrs==19.3.0 \ | ||||
|     --hash=sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c \ | ||||
|     --hash=sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72 \ | ||||
|     # via aiohttp | ||||
| botocore==1.15.32 \ | ||||
|     --hash=sha256:3ea89601ee452b65084005278bd832be854cfde5166685dcb14b6c8f19d3fc6d \ | ||||
|     --hash=sha256:a963af564d94107787ff3d2c534e8b7aed7f12e014cdd609f8fcb17bf9d9b19a \ | ||||
|     # via aiobotocore | ||||
| chardet==3.0.4 \ | ||||
|     --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \ | ||||
|     --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \ | ||||
|     # via aiohttp | ||||
| colorful==0.5.4 \ | ||||
|     --hash=sha256:86848ad4e2eda60cd2519d8698945d22f6f6551e23e95f3f14dfbb60997807ea \ | ||||
|     --hash=sha256:8d264b52a39aae4c0ba3e2a46afbaec81b0559a99be0d2cfe2aba4cf94531348 \ | ||||
|     # via thumbor | ||||
| backports-abc==0.5 \ | ||||
|     --hash=sha256:033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde \ | ||||
|     --hash=sha256:52089f97fe7a9aa0d3277b220c1d730a85aefd64e1b2664696fe35317c5470a7 \ | ||||
|     # via tornado | ||||
| botocore==1.17.16 \ | ||||
|     --hash=sha256:99d995ef99cf77458a661f3fc64e0c3a4ce77ca30facfdf0472f44b2953dd856 \ | ||||
|     --hash=sha256:fe0c4f7cd6b67eff3b7cb8dff6709a65d6fca10b7b7449a493b2036915e98b4c \ | ||||
|     # via tornado-botocore | ||||
| click==7.1.2 \ | ||||
|     --hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \ | ||||
|     --hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc \ | ||||
|     # via pip-tools | ||||
| derpconf==0.8.3 \ | ||||
|     --hash=sha256:1bb152d8a1cf5c2a6d629bf29acd4af0c00811339642fc0a56172b0a83b31a15 \ | ||||
|     # via thumbor | ||||
| django-auth-ldap==1.7.0 \ | ||||
|     --hash=sha256:72848b3b036d299114be3c6ef38b12f83f6cf1cf1696c5f92e06fe45a1b8e27b \ | ||||
|     --hash=sha256:f96398ce957bb8aaaee2e9d93e3eaf9955ab95a6d342303b5519350eb834f5d1 \ | ||||
| django-auth-ldap==2.2.0 \ | ||||
|     --hash=sha256:0ed2d88d81c39be915a9ab53b97ec0a33a3d16055518ab4c9bcffe8236d40370 \ | ||||
|     --hash=sha256:11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf \ | ||||
|     # via -r requirements/thumbor.in | ||||
| django==1.11.29 \ | ||||
|     --hash=sha256:014e3392058d94f40569206a24523ce254d55ad2f9f46c6550b0fe2e4f94cf3f \ | ||||
|     --hash=sha256:4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c \ | ||||
| django==2.2.14 \ | ||||
|     --hash=sha256:edf0ecf6657713b0435b6757e6069466925cae70d634a3283c96b80c01e06191 \ | ||||
|     --hash=sha256:f2250bd35d0f6c23e930c544629934144e5dd39a4c06092e1050c731c1712ba8 \ | ||||
|     # via -r requirements/thumbor.in, django-auth-ldap | ||||
| docutils==0.15.2 \ | ||||
|     --hash=sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0 \ | ||||
|     --hash=sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827 \ | ||||
|     --hash=sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 \ | ||||
|     # via botocore | ||||
| futures==3.3.0 \ | ||||
|     --hash=sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16 \ | ||||
|     --hash=sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794 \ | ||||
|     # via thumbor, tornado | ||||
| idna-ssl==1.1.0 \ | ||||
|     --hash=sha256:a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c \ | ||||
|     # via aiohttp | ||||
| idna==2.10 \ | ||||
|     --hash=sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6 \ | ||||
|     --hash=sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0 \ | ||||
|     # via idna-ssl, yarl | ||||
| jmespath==0.10.0 \ | ||||
|     --hash=sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9 \ | ||||
|     --hash=sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f \ | ||||
|     # via botocore | ||||
| libthumbor==1.3.2 \ | ||||
|     --hash=sha256:2ba48729e9e52fed235c6948f40ffd5c59c9bc74593ccf4d988972e4f4d750ee \ | ||||
| libthumbor==2.0.1 \ | ||||
|     --hash=sha256:3c4e1a59c019d22f868d225315c06f97fad30fb5e78112d6a230b978e7d24e38 \ | ||||
|     --hash=sha256:ed4fe5f27f8f90e7285b7e6dce99c1b67d43a140bf370e989080b43d80ce25f0 \ | ||||
|     # via thumbor | ||||
| pillow==6.2.2 \ | ||||
|     --hash=sha256:00e0bbe9923adc5cc38a8da7d87d4ce16cde53b8d3bba8886cb928e84522d963 \ | ||||
|     --hash=sha256:03457e439d073770d88afdd90318382084732a5b98b0eb6f49454746dbaae701 \ | ||||
|     --hash=sha256:0d5c99f80068f13231ac206bd9b2e80ea357f5cf9ae0fa97fab21e32d5b61065 \ | ||||
|     --hash=sha256:1a3bc8e1db5af40a81535a62a591fafdb30a8a1b319798ea8052aa65ef8f06d2 \ | ||||
|     --hash=sha256:2b4a94be53dff02af90760c10a2e3634c3c7703410f38c98154d5ce71fe63d20 \ | ||||
|     --hash=sha256:3ba7d8f1d962780f86aa747fef0baf3211b80cb13310fff0c375da879c0656d4 \ | ||||
|     --hash=sha256:3e81485cec47c24f5fb27acb485a4fc97376b2b332ed633867dc68ac3077998c \ | ||||
|     --hash=sha256:43ef1cff7ee57f9c8c8e6fa02a62eae9fa23a7e34418c7ce88c0e3fe09d1fb38 \ | ||||
|     --hash=sha256:4adc3302df4faf77c63ab3a83e1a3e34b94a6a992084f4aa1cb236d1deaf4b39 \ | ||||
|     --hash=sha256:535e8e0e02c9f1fc2e307256149d6ee8ad3aa9a6e24144b7b6e6fb6126cb0e99 \ | ||||
|     --hash=sha256:5ccfcb0a34ad9b77ad247c231edb781763198f405a5c8dc1b642449af821fb7f \ | ||||
|     --hash=sha256:5dcbbaa3a24d091a64560d3c439a8962866a79a033d40eb1a75f1b3413bfc2bc \ | ||||
|     --hash=sha256:6e2a7e74d1a626b817ecb7a28c433b471a395c010b2a1f511f976e9ea4363e64 \ | ||||
|     --hash=sha256:82859575005408af81b3e9171ae326ff56a69af5439d3fc20e8cb76cd51c8246 \ | ||||
|     --hash=sha256:834dd023b7f987d6b700ad93dc818098d7eb046bd445e9992b3093c6f9d7a95f \ | ||||
|     --hash=sha256:87ef0eca169f7f0bc050b22f05c7e174a65c36d584428431e802c0165c5856ea \ | ||||
|     --hash=sha256:900de1fdc93764be13f6b39dc0dd0207d9ff441d87ad7c6e97e49b81987dc0f3 \ | ||||
|     --hash=sha256:92b83b380f9181cacc994f4c983d95a9c8b00b50bf786c66d235716b526a3332 \ | ||||
|     --hash=sha256:aa1b0297e352007ec781a33f026afbb062a9a9895bb103c8f49af434b1666880 \ | ||||
|     --hash=sha256:aa4792ab056f51b49e7d59ce5733155e10a918baf8ce50f64405db23d5627fa2 \ | ||||
|     --hash=sha256:b72c39585f1837d946bd1a829a4820ccf86e361f28cbf60f5d646f06318b61e2 \ | ||||
|     --hash=sha256:bb7861e4618a0c06c40a2e509c1bea207eea5fd4320d486e314e00745a402ca5 \ | ||||
|     --hash=sha256:bc149dab804291a18e1186536519e5e122a2ac1316cb80f506e855a500b1cdd4 \ | ||||
|     --hash=sha256:c424d35a5259be559b64490d0fd9e03fba81f1ce8e5b66e0a59de97547351d80 \ | ||||
|     --hash=sha256:cbd5647097dc55e501f459dbac7f1d0402225636deeb9e0a98a8d2df649fc19d \ | ||||
|     --hash=sha256:ccf16fe444cc43800eeacd4f4769971200982200a71b1368f49410d0eb769543 \ | ||||
|     --hash=sha256:d3a98444a00b4643b22b0685dbf9e0ddcaf4ebfd4ea23f84f228adf5a0765bb2 \ | ||||
|     --hash=sha256:d6b4dc325170bee04ca8292bbd556c6f5398d52c6149ca881e67daf62215426f \ | ||||
|     --hash=sha256:db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950 \ | ||||
|     --hash=sha256:e3a797a079ce289e59dbd7eac9ca3bf682d52687f718686857281475b7ca8e6a \ | ||||
| multidict==4.7.6 \ | ||||
|     --hash=sha256:1ece5a3369835c20ed57adadc663400b5525904e53bae59ec854a5d36b39b21a \ | ||||
|     --hash=sha256:275ca32383bc5d1894b6975bb4ca6a7ff16ab76fa622967625baeebcf8079000 \ | ||||
|     --hash=sha256:3750f2205b800aac4bb03b5ae48025a64e474d2c6cc79547988ba1d4122a09e2 \ | ||||
|     --hash=sha256:4538273208e7294b2659b1602490f4ed3ab1c8cf9dbdd817e0e9db8e64be2507 \ | ||||
|     --hash=sha256:5141c13374e6b25fe6bf092052ab55c0c03d21bd66c94a0e3ae371d3e4d865a5 \ | ||||
|     --hash=sha256:51a4d210404ac61d32dada00a50ea7ba412e6ea945bbe992e4d7a595276d2ec7 \ | ||||
|     --hash=sha256:5cf311a0f5ef80fe73e4f4c0f0998ec08f954a6ec72b746f3c179e37de1d210d \ | ||||
|     --hash=sha256:6513728873f4326999429a8b00fc7ceddb2509b01d5fd3f3be7881a257b8d463 \ | ||||
|     --hash=sha256:7388d2ef3c55a8ba80da62ecfafa06a1c097c18032a501ffd4cabbc52d7f2b19 \ | ||||
|     --hash=sha256:9456e90649005ad40558f4cf51dbb842e32807df75146c6d940b6f5abb4a78f3 \ | ||||
|     --hash=sha256:c026fe9a05130e44157b98fea3ab12969e5b60691a276150db9eda71710cd10b \ | ||||
|     --hash=sha256:d14842362ed4cf63751648e7672f7174c9818459d169231d03c56e84daf90b7c \ | ||||
|     --hash=sha256:e0d072ae0f2a179c375f67e3da300b47e1a83293c554450b29c900e50afaae87 \ | ||||
|     --hash=sha256:f07acae137b71af3bb548bd8da720956a3bc9f9a0b87733e0899226a2317aeb7 \ | ||||
|     --hash=sha256:fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430 \ | ||||
|     --hash=sha256:fcfbb44c59af3f8ea984de67ec7c306f618a3ec771c2843804069917a8f2e255 \ | ||||
|     --hash=sha256:feed85993dbdb1dbc29102f50bca65bdc68f2c0c8d352468c25b54874f23c39d \ | ||||
|     # via aiohttp, yarl | ||||
| numpy==1.19.0 \ | ||||
|     --hash=sha256:13af0184177469192d80db9bd02619f6fa8b922f9f327e077d6f2a6acb1ce1c0 \ | ||||
|     --hash=sha256:26a45798ca2a4e168d00de75d4a524abf5907949231512f372b217ede3429e98 \ | ||||
|     --hash=sha256:26f509450db547e4dfa3ec739419b31edad646d21fb8d0ed0734188b35ff6b27 \ | ||||
|     --hash=sha256:30a59fb41bb6b8c465ab50d60a1b298d1cd7b85274e71f38af5a75d6c475d2d2 \ | ||||
|     --hash=sha256:33c623ef9ca5e19e05991f127c1be5aeb1ab5cdf30cb1c5cf3960752e58b599b \ | ||||
|     --hash=sha256:356f96c9fbec59974a592452ab6a036cd6f180822a60b529a975c9467fcd5f23 \ | ||||
|     --hash=sha256:3c40c827d36c6d1c3cf413694d7dc843d50997ebffbc7c87d888a203ed6403a7 \ | ||||
|     --hash=sha256:4d054f013a1983551254e2379385e359884e5af105e3efe00418977d02f634a7 \ | ||||
|     --hash=sha256:63d971bb211ad3ca37b2adecdd5365f40f3b741a455beecba70fd0dde8b2a4cb \ | ||||
|     --hash=sha256:658624a11f6e1c252b2cd170d94bf28c8f9410acab9f2fd4369e11e1cd4e1aaf \ | ||||
|     --hash=sha256:76766cc80d6128750075378d3bb7812cf146415bd29b588616f72c943c00d598 \ | ||||
|     --hash=sha256:7b57f26e5e6ee2f14f960db46bd58ffdca25ca06dd997729b1b179fddd35f5a3 \ | ||||
|     --hash=sha256:7b852817800eb02e109ae4a9cef2beda8dd50d98b76b6cfb7b5c0099d27b52d4 \ | ||||
|     --hash=sha256:8cde829f14bd38f6da7b2954be0f2837043e8b8d7a9110ec5e318ae6bf706610 \ | ||||
|     --hash=sha256:a2e3a39f43f0ce95204beb8fe0831199542ccab1e0c6e486a0b4947256215632 \ | ||||
|     --hash=sha256:a86c962e211f37edd61d6e11bb4df7eddc4a519a38a856e20a6498c319efa6b0 \ | ||||
|     --hash=sha256:a8705c5073fe3fcc297fb8e0b31aa794e05af6a329e81b7ca4ffecab7f2b95ef \ | ||||
|     --hash=sha256:b6aaeadf1e4866ca0fdf7bb4eed25e521ae21a7947c59f78154b24fc7abbe1dd \ | ||||
|     --hash=sha256:be62aeff8f2f054eff7725f502f6228298891fd648dc2630e03e44bf63e8cee0 \ | ||||
|     --hash=sha256:c2edbb783c841e36ca0fa159f0ae97a88ce8137fb3a6cd82eae77349ba4b607b \ | ||||
|     --hash=sha256:cbe326f6d364375a8e5a8ccb7e9cd73f4b2f6dc3b2ed205633a0db8243e2a96a \ | ||||
|     --hash=sha256:d34fbb98ad0d6b563b95de852a284074514331e6b9da0a9fc894fb1cdae7a79e \ | ||||
|     --hash=sha256:d97a86937cf9970453c3b62abb55a6475f173347b4cde7f8dcdb48c8e1b9952d \ | ||||
|     --hash=sha256:dd53d7c4a69e766e4900f29db5872f5824a06827d594427cf1a4aa542818b796 \ | ||||
|     --hash=sha256:df1889701e2dfd8ba4dc9b1a010f0a60950077fb5242bb92c8b5c7f1a6f2668a \ | ||||
|     --hash=sha256:fa1fe75b4a9e18b66ae7f0b122543c42debcf800aaafa0212aaff3ad273c2596 \ | ||||
|     # via opencv-python-headless | ||||
| opencv-python-headless==4.2.0.34 \ | ||||
|     --hash=sha256:06a96ec4866aa40c68c255042ea0ab8a96c07f2eb54f5b0dc6b8ac08b00c1b7e \ | ||||
|     --hash=sha256:1641d82b94ce496e6f3df8f2a337eae94cd608e0e61dbb4b697577438d88c258 \ | ||||
|     --hash=sha256:1df0adfc1b893615ab8487cd207aae356936b0ba1823520e2292c928853c2930 \ | ||||
|     --hash=sha256:20c450943acebd9aa04566fdef4a658b94eec80a0c39a8f480c9aa1696034fcb \ | ||||
|     --hash=sha256:28b28e3462500dccf75ac5efb2b885494d050fb6444fee37b53f9f950bccca57 \ | ||||
|     --hash=sha256:3aadcd93f1ad9a92dbfbfdeacb7ffca115f137aa2b07d36495fd141f2a553479 \ | ||||
|     --hash=sha256:45f90a872bc2e3d3257e06508ea18b3e2d429cf1b20de1a8f5c57251cc39fae4 \ | ||||
|     --hash=sha256:4c3004573ecfbdf46785682a294923661903eb18e4c188106998ef5be255df1f \ | ||||
|     --hash=sha256:4e9de88b1376f904158698c3335f184cbcdc68eda018eb8f751e27e7407dddd1 \ | ||||
|     --hash=sha256:64292b593367e5b37556900b132861d94c05f616d8569c5625b02be6d51e13f7 \ | ||||
|     --hash=sha256:67c6ff682e413db759f49a206bafa5ebb8b01dfdefa5199df32741b58772c3d7 \ | ||||
|     --hash=sha256:70117cd51b158f7628cf2dab24805df40173c3794ca3dfeec22defb326ec0173 \ | ||||
|     --hash=sha256:904f0b4a358b3260d7572956026bf6a0fa0cda31d5a6afeed3e55341a3f36c8d \ | ||||
|     --hash=sha256:aca7419cae1390a8f2d6776571d1d19db66dadbff2ded79e4ff4bad5d9df6633 \ | ||||
|     --hash=sha256:ca9a5f4b04f2b423892ef5934fdd685edd0bc458c77fc7e164156a50e6be0377 \ | ||||
|     --hash=sha256:cef7e844f5fd73cb602b8ba3f048a68dc2c59b7abb55ca99cceee9f688e909a4 \ | ||||
|     --hash=sha256:ed5c7d2fd8dc08ebcb9f8ed09883e3a083a5e0bc35f863ac280f61cec9560b09 \ | ||||
|     --hash=sha256:edfaeea04982166a02c87b85ed5451b77485c86db7a4b216a42e6b686e1b5f1a \ | ||||
|     --hash=sha256:f93bec89d943ca1877c38920e934ed1d6193cdc6ff09cb910c19c15643ee07df \ | ||||
|     --hash=sha256:ffe74fc421fc77b649f4b762e115fd2b9cea9ba86b4590f7939bd15f92f11f80 \ | ||||
|     # via thumbor | ||||
| pillow==7.2.0 \ | ||||
|     --hash=sha256:0295442429645fa16d05bd567ef5cff178482439c9aad0411d3f0ce9b88b3a6f \ | ||||
|     --hash=sha256:06aba4169e78c439d528fdeb34762c3b61a70813527a2c57f0540541e9f433a8 \ | ||||
|     --hash=sha256:09d7f9e64289cb40c2c8d7ad674b2ed6105f55dc3b09aa8e4918e20a0311e7ad \ | ||||
|     --hash=sha256:0a80dd307a5d8440b0a08bd7b81617e04d870e40a3e46a32d9c246e54705e86f \ | ||||
|     --hash=sha256:1ca594126d3c4def54babee699c055a913efb01e106c309fa6b04405d474d5ae \ | ||||
|     --hash=sha256:25930fadde8019f374400f7986e8404c8b781ce519da27792cbe46eabec00c4d \ | ||||
|     --hash=sha256:431b15cffbf949e89df2f7b48528be18b78bfa5177cb3036284a5508159492b5 \ | ||||
|     --hash=sha256:52125833b070791fcb5710fabc640fc1df07d087fc0c0f02d3661f76c23c5b8b \ | ||||
|     --hash=sha256:5e51ee2b8114def244384eda1c82b10e307ad9778dac5c83fb0943775a653cd8 \ | ||||
|     --hash=sha256:612cfda94e9c8346f239bf1a4b082fdd5c8143cf82d685ba2dba76e7adeeb233 \ | ||||
|     --hash=sha256:6d7741e65835716ceea0fd13a7d0192961212fd59e741a46bbed7a473c634ed6 \ | ||||
|     --hash=sha256:6edb5446f44d901e8683ffb25ebdfc26988ee813da3bf91e12252b57ac163727 \ | ||||
|     --hash=sha256:725aa6cfc66ce2857d585f06e9519a1cc0ef6d13f186ff3447ab6dff0a09bc7f \ | ||||
|     --hash=sha256:8dad18b69f710bf3a001d2bf3afab7c432785d94fcf819c16b5207b1cfd17d38 \ | ||||
|     --hash=sha256:94cf49723928eb6070a892cb39d6c156f7b5a2db4e8971cb958f7b6b104fb4c4 \ | ||||
|     --hash=sha256:97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626 \ | ||||
|     --hash=sha256:9ad7f865eebde135d526bb3163d0b23ffff365cf87e767c649550964ad72785d \ | ||||
|     --hash=sha256:a060cf8aa332052df2158e5a119303965be92c3da6f2d93b6878f0ebca80b2f6 \ | ||||
|     --hash=sha256:c79f9c5fb846285f943aafeafda3358992d64f0ef58566e23484132ecd8d7d63 \ | ||||
|     --hash=sha256:c92302a33138409e8f1ad16731568c55c9053eee71bb05b6b744067e1b62380f \ | ||||
|     --hash=sha256:d08b23fdb388c0715990cbc06866db554e1822c4bdcf6d4166cf30ac82df8c41 \ | ||||
|     --hash=sha256:d350f0f2c2421e65fbc62690f26b59b0bcda1b614beb318c81e38647e0f673a1 \ | ||||
|     --hash=sha256:ec29604081f10f16a7aea809ad42e27764188fc258b02259a03a8ff7ded3808d \ | ||||
|     --hash=sha256:edf31f1150778abd4322444c393ab9c7bd2af271dd4dafb4208fb613b1f3cdc9 \ | ||||
|     --hash=sha256:f7e30c27477dffc3e85c2463b3e649f751789e0f6c8456099eea7ddd53be4a8a \ | ||||
|     --hash=sha256:ffe538682dc19cc542ae7c3e504fdf54ca7f86fb8a135e59dd6bc8627eae6cce \ | ||||
|     # via thumbor | ||||
| pip-tools==5.2.1 \ | ||||
|     --hash=sha256:1690bef5f0f714160c3aedacb03520e2359a78f7f9fa17e574cf8659cf2ef614 \ | ||||
|     --hash=sha256:5b4b6e7b6e66357685c73e856296b4792b2d159ff6074729e250e291834bfd9d \ | ||||
|     # via -r requirements/thumbor-dev.in | ||||
| pyasn1-modules==0.2.8 \ | ||||
|     --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \ | ||||
|     --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74 \ | ||||
| @@ -94,17 +185,6 @@ pyasn1==0.4.8 \ | ||||
|     --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ | ||||
|     --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba \ | ||||
|     # via pyasn1-modules, python-ldap | ||||
| pycurl==7.43.0.5 \ | ||||
|     --hash=sha256:1957c867e2a341f5526c107c7bbc5014d6e75fdc2a14294fcb8a47663fbd2e15 \ | ||||
|     --hash=sha256:50aee0469511a9708a1f1a50d510b5ec2013fc6f5e720c32bbcb3b9c7b0f45b1 \ | ||||
|     --hash=sha256:667db26516e50ce4a853745906f3b149c24756d85061b9d966eb7ec43a8c48a4 \ | ||||
|     --hash=sha256:7cc13d3421cbd31921d77e22d1f57c0e1a8d0fb461938a587689a93162ccef2f \ | ||||
|     --hash=sha256:a0c62dbc66b9b947832307d6cf7bdb5e4da906ce7b3efe6f74292e8f3dc5abe3 \ | ||||
|     --hash=sha256:a6966e8d9ccda31c6d077c4f8673aaa88141cc73d50e110e93e627b816d17fd1 \ | ||||
|     --hash=sha256:beadfa7f052626864d70eb33cec8f2aeece12dfb483c2424cc07b057f83b7d35 \ | ||||
|     --hash=sha256:c5c379c8cc777dda397f86f0d0049480250ae84a82a9d99d668f461d368fb39c \ | ||||
|     --hash=sha256:ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3 \ | ||||
|     # via thumbor | ||||
| python-dateutil==2.8.1 \ | ||||
|     --hash=sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c \ | ||||
|     --hash=sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a \ | ||||
| @@ -112,41 +192,44 @@ python-dateutil==2.8.1 \ | ||||
| python-ldap==3.3.1 \ | ||||
|     --hash=sha256:4711cacf013e298754abd70058ccc995758177fb425f1c2d30e71adfc1d00aa5 \ | ||||
|     # via django-auth-ldap | ||||
| pytz==2020.1 \ | ||||
|     --hash=sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed \ | ||||
|     --hash=sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048 \ | ||||
| pytz==2019.3 \ | ||||
|     --hash=sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d \ | ||||
|     --hash=sha256:b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be \ | ||||
|     # via django, thumbor | ||||
| singledispatch==3.4.0.3 \ | ||||
|     --hash=sha256:5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c \ | ||||
|     --hash=sha256:833b46966687b3de7f438c761ac475213e53b306740f1abfaa86e1d1aae56aa8 \ | ||||
|     # via tornado | ||||
| six==1.15.0 \ | ||||
|     --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \ | ||||
|     --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced \ | ||||
|     # via derpconf, libthumbor, pip-tools, python-dateutil, singledispatch, thumbor, webcolors | ||||
|     # via derpconf, libthumbor, python-dateutil | ||||
| sqlparse==0.3.1 \ | ||||
|     --hash=sha256:022fb9c87b524d1f7862b3037e541f68597a730a8843245c349fc93e1643dc4e \ | ||||
|     --hash=sha256:e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548 \ | ||||
|     # via django | ||||
| statsd==3.3.0 \ | ||||
|     --hash=sha256:c610fb80347fca0ef62666d241bce64184bd7cc1efe582f9690e045c25535eaa \ | ||||
|     --hash=sha256:e3e6db4c246f7c59003e51c9720a51a7f39a396541cb9b147ff4b14d15b5dd1f \ | ||||
|     # via thumbor | ||||
| tc-aws==6.2.15 \ | ||||
|     --hash=sha256:1c9e1ca443f1b5681bc7e9ca07a5825acad9477f6625ef19cf61b6f917b5ce95 \ | ||||
| https://github.com/kkopachev/aws/archive/0d02528b47273e143be750ba237f71a076e8f251.zip#egg=tc_aws==6.3 \ | ||||
|     --hash=sha256:866d18ffbfd5a1627ed3973757e4c282745de8f30ed85f5ce8e80ae04932f8f3 \ | ||||
|     # via -r requirements/thumbor.in | ||||
| thumbor==6.7.5 \ | ||||
|     --hash=sha256:3895c367b6bc88d2afadc80212471d300727c69c8750eb164d9eae0d098077ca \ | ||||
| thumbor==7.0.0a5 \ | ||||
|     --hash=sha256:5042c9c8facf0da028a22f1aee717f856d213ec037835ca0edaa0282217654bb \ | ||||
|     # via -r requirements/thumbor.in, tc-aws | ||||
| tornado-botocore==1.5.0 \ | ||||
|     --hash=sha256:3113072ddf8b996316118562543b6826ffe628bd6afdadfe641555c45da450e7 \ | ||||
|     --hash=sha256:6e3894840aaf1edc76eccfc4e180b9b5c26487b690fc596e581d42f4219e47df \ | ||||
|     # via tc-aws | ||||
| tornado==5.1.1 \ | ||||
|     --hash=sha256:0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d \ | ||||
|     --hash=sha256:4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409 \ | ||||
|     --hash=sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f \ | ||||
|     --hash=sha256:8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f \ | ||||
|     --hash=sha256:8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5 \ | ||||
|     --hash=sha256:d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb \ | ||||
|     --hash=sha256:e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444 \ | ||||
|     # via thumbor, tornado-botocore | ||||
| tornado==6.0.4 \ | ||||
|     --hash=sha256:0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc \ | ||||
|     --hash=sha256:22aed82c2ea340c3771e3babc5ef220272f6fd06b5108a53b4976d0d722bcd52 \ | ||||
|     --hash=sha256:2c027eb2a393d964b22b5c154d1a23a5f8727db6fda837118a776b29e2b8ebc6 \ | ||||
|     --hash=sha256:5217e601700f24e966ddab689f90b7ea4bd91ff3357c3600fa1045e26d68e55d \ | ||||
|     --hash=sha256:5618f72e947533832cbc3dec54e1dffc1747a5cb17d1fd91577ed14fa0dc081b \ | ||||
|     --hash=sha256:5f6a07e62e799be5d2330e68d808c8ac41d4a259b9cea61da4101b83cb5dc673 \ | ||||
|     --hash=sha256:c58d56003daf1b616336781b26d184023ea4af13ae143d9dda65e31e534940b9 \ | ||||
|     --hash=sha256:c952975c8ba74f546ae6de2e226ab3cc3cc11ae47baf607459a6728585bb542a \ | ||||
|     --hash=sha256:c98232a3ac391f5faea6821b53db8db461157baa788f5d6222a193e9456e1740 \ | ||||
|     # via thumbor | ||||
| typing-extensions==3.7.4.2 \ | ||||
|     --hash=sha256:6e95524d8a547a91e08f404ae485bbb71962de46967e1b71a0cb89af24e761c5 \ | ||||
|     --hash=sha256:79ee589a3caca649a9bfd2a8de4709837400dfa00b6cc81962a1e6a1815969ae \ | ||||
|     --hash=sha256:f8d2bd89d25bc39dabe7d23df520442fa1d8969b82544370e03d88b5a591c392 \ | ||||
|     # via aiohttp, aioitertools | ||||
| typing==3.7.4.1 \ | ||||
|     --hash=sha256:91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23 \ | ||||
|     --hash=sha256:c8cabb5ab8945cd2f54917be357d134db9cc1eb039e59d1606dc1e60cb1d9d36 \ | ||||
| @@ -160,21 +243,43 @@ virtualenv-clone==0.5.4 \ | ||||
|     --hash=sha256:07e74418b7cc64f4fda987bf5bc71ebd59af27a7bc9e8a8ee9fd54b1f2390a27 \ | ||||
|     --hash=sha256:665e48dd54c84b98b71a657acb49104c54e7652bce9c1c4f6c6976ed4c827a29 \ | ||||
|     # via -r requirements/thumbor.in | ||||
| webcolors==1.10 \ | ||||
|     --hash=sha256:2559b4f4694bfcd61c87ee06acad921bd2fdbf0c844bee65fc844c6910c413dd \ | ||||
|     --hash=sha256:7b11194c414dcf4b9bd8fb5ceaafc9da183b27430883c62f620589eb79b91b6e \ | ||||
| webcolors==1.11.1 \ | ||||
|     --hash=sha256:76f360636957d1c976db7466bc71dcb713bb95ac8911944dffc55c01cb516de6 \ | ||||
|     --hash=sha256:b8cd5d865a25c51ff1218f0c90d0c0781fc64312a49b746b320cf50de1648f6e \ | ||||
|     # via thumbor | ||||
| wheel==0.34.2 \ | ||||
|     --hash=sha256:8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96 \ | ||||
|     --hash=sha256:df277cb51e61359aba502208d680f90c0493adec6f0e848af94948778aed386e \ | ||||
|     # via -r requirements/pip.in | ||||
| wrapt==1.12.1 \ | ||||
|     --hash=sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7 \ | ||||
|     # via aiobotocore | ||||
| yarl==1.4.2 \ | ||||
|     --hash=sha256:0c2ab325d33f1b824734b3ef51d4d54a54e0e7a23d13b86974507602334c2cce \ | ||||
|     --hash=sha256:0ca2f395591bbd85ddd50a82eb1fde9c1066fafe888c5c7cc1d810cf03fd3cc6 \ | ||||
|     --hash=sha256:2098a4b4b9d75ee352807a95cdf5f10180db903bc5b7270715c6bbe2551f64ce \ | ||||
|     --hash=sha256:25e66e5e2007c7a39541ca13b559cd8ebc2ad8fe00ea94a2aad28a9b1e44e5ae \ | ||||
|     --hash=sha256:26d7c90cb04dee1665282a5d1a998defc1a9e012fdca0f33396f81508f49696d \ | ||||
|     --hash=sha256:308b98b0c8cd1dfef1a0311dc5e38ae8f9b58349226aa0533f15a16717ad702f \ | ||||
|     --hash=sha256:3ce3d4f7c6b69c4e4f0704b32eca8123b9c58ae91af740481aa57d7857b5e41b \ | ||||
|     --hash=sha256:58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b \ | ||||
|     --hash=sha256:5b10eb0e7f044cf0b035112446b26a3a2946bca9d7d7edb5e54a2ad2f6652abb \ | ||||
|     --hash=sha256:6faa19d3824c21bcbfdfce5171e193c8b4ddafdf0ac3f129ccf0cdfcb083e462 \ | ||||
|     --hash=sha256:944494be42fa630134bf907714d40207e646fd5a94423c90d5b514f7b0713fea \ | ||||
|     --hash=sha256:a161de7e50224e8e3de6e184707476b5a989037dcb24292b391a3d66ff158e70 \ | ||||
|     --hash=sha256:a4844ebb2be14768f7994f2017f70aca39d658a96c786211be5ddbe1c68794c1 \ | ||||
|     --hash=sha256:c2b509ac3d4b988ae8769901c66345425e361d518aecbe4acbfc2567e416626a \ | ||||
|     --hash=sha256:c9959d49a77b0e07559e579f38b2f3711c2b8716b8410b320bf9713013215a1b \ | ||||
|     --hash=sha256:d8cdee92bc930d8b09d8bd2043cedd544d9c8bd7436a77678dd602467a993080 \ | ||||
|     --hash=sha256:e15199cdb423316e15f108f51249e44eb156ae5dba232cb73be555324a1d49c2 \ | ||||
|     # via aiohttp | ||||
|  | ||||
| # The following packages are considered to be unsafe in a requirements file: | ||||
| pip==20.1.1 \ | ||||
|     --hash=sha256:27f8dc29387dd83249e06e681ce087e6061826582198a425085e0bf4c1cf3a55 \ | ||||
|     --hash=sha256:b27c4dedae8c41aa59108f2fa38bf78e0890e590545bc8ece7cdceb4ba60f6e4 \ | ||||
|     # via -r requirements/pip.in, pip-tools | ||||
| setuptools==44.1.1 \ | ||||
|     --hash=sha256:27a714c09253134e60a6fa68130f78c7037e5562c4f21f8f318f2ae900d152d5 \ | ||||
|     --hash=sha256:c67aa55db532a0dadc4d2e20ba9961cbd3ccc84d544e9029699822542b5a476b \ | ||||
|     # via -r requirements/pip.in | ||||
| setuptools==49.1.0 \ | ||||
|     --hash=sha256:60351853f8c093ef57224695ee989d5d074168f6b93dae000fa9996072adaba3 \ | ||||
|     --hash=sha256:daf2e1c215f805b0ddc3b4262886bb6667ae0d4563887a8374fb766adc47c324 \ | ||||
|     # via -r requirements/pip.in | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| tc-aws | ||||
| thumbor | ||||
| https://github.com/kkopachev/aws/archive/0d02528b47273e143be750ba237f71a076e8f251.zip#egg=tc_aws==6.3 | ||||
| thumbor>=7.dev | ||||
|  | ||||
| # Required for just importing settings from our main django app. | ||||
| django-auth-ldap | ||||
| Django==1.11.* | ||||
| Django==2.2.* | ||||
| typing | ||||
|  | ||||
| # Needed for cloning virtual environments | ||||
|   | ||||
| @@ -7,76 +7,175 @@ | ||||
| # | ||||
| # For details, see requirements/README.md . | ||||
| # | ||||
| argparse==1.4.0 \ | ||||
|     --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \ | ||||
|     --hash=sha256:c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314 \ | ||||
| aiobotocore==1.0.7 \ | ||||
|     --hash=sha256:9589d812714a5b78f0b8249916c17374e507dd7edfd5038a85cd6f25028506f3 \ | ||||
|     --hash=sha256:d3183a22a376a97ed0a739854408fcf4ee9f24a629b38f84451b7e2111622ae3 \ | ||||
|     # via tc-aws | ||||
| aiohttp==3.6.2 \ | ||||
|     --hash=sha256:1e984191d1ec186881ffaed4581092ba04f7c61582a177b187d3a2f07ed9719e \ | ||||
|     --hash=sha256:259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326 \ | ||||
|     --hash=sha256:2f4d1a4fdce595c947162333353d4a44952a724fba9ca3205a3df99a33d1307a \ | ||||
|     --hash=sha256:32e5f3b7e511aa850829fbe5aa32eb455e5534eaa4b1ce93231d00e2f76e5654 \ | ||||
|     --hash=sha256:344c780466b73095a72c616fac5ea9c4665add7fc129f285fbdbca3cccf4612a \ | ||||
|     --hash=sha256:460bd4237d2dbecc3b5ed57e122992f60188afe46e7319116da5eb8a9dfedba4 \ | ||||
|     --hash=sha256:4c6efd824d44ae697814a2a85604d8e992b875462c6655da161ff18fd4f29f17 \ | ||||
|     --hash=sha256:50aaad128e6ac62e7bf7bd1f0c0a24bc968a0c0590a726d5a955af193544bcec \ | ||||
|     --hash=sha256:6206a135d072f88da3e71cc501c59d5abffa9d0bb43269a6dcd28d66bfafdbdd \ | ||||
|     --hash=sha256:65f31b622af739a802ca6fd1a3076fd0ae523f8485c52924a89561ba10c49b48 \ | ||||
|     --hash=sha256:ae55bac364c405caa23a4f2d6cfecc6a0daada500274ffca4a9230e7129eac59 \ | ||||
|     --hash=sha256:b778ce0c909a2653741cb4b1ac7015b5c130ab9c897611df43ae6a58523cb965 \ | ||||
|     # via aiobotocore | ||||
| aioitertools==0.7.0 \ | ||||
|     --hash=sha256:341cb05a0903177ef1b73d4cc12c92aee18e81c364e0138f4efc7ec3c47b8177 \ | ||||
|     --hash=sha256:e931a2f0dcabd4a8446b5cc2fc71b8bb14716e6adf37728a70869213f1f741cd \ | ||||
|     # via aiobotocore | ||||
| async-timeout==3.0.1 \ | ||||
|     --hash=sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f \ | ||||
|     --hash=sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3 \ | ||||
|     # via aiohttp | ||||
| attrs==19.3.0 \ | ||||
|     --hash=sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c \ | ||||
|     --hash=sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72 \ | ||||
|     # via aiohttp | ||||
| botocore==1.15.32 \ | ||||
|     --hash=sha256:3ea89601ee452b65084005278bd832be854cfde5166685dcb14b6c8f19d3fc6d \ | ||||
|     --hash=sha256:a963af564d94107787ff3d2c534e8b7aed7f12e014cdd609f8fcb17bf9d9b19a \ | ||||
|     # via aiobotocore | ||||
| chardet==3.0.4 \ | ||||
|     --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \ | ||||
|     --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \ | ||||
|     # via aiohttp | ||||
| colorful==0.5.4 \ | ||||
|     --hash=sha256:86848ad4e2eda60cd2519d8698945d22f6f6551e23e95f3f14dfbb60997807ea \ | ||||
|     --hash=sha256:8d264b52a39aae4c0ba3e2a46afbaec81b0559a99be0d2cfe2aba4cf94531348 \ | ||||
|     # via thumbor | ||||
| backports-abc==0.5 \ | ||||
|     --hash=sha256:033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde \ | ||||
|     --hash=sha256:52089f97fe7a9aa0d3277b220c1d730a85aefd64e1b2664696fe35317c5470a7 \ | ||||
|     # via tornado | ||||
| botocore==1.17.16 \ | ||||
|     --hash=sha256:99d995ef99cf77458a661f3fc64e0c3a4ce77ca30facfdf0472f44b2953dd856 \ | ||||
|     --hash=sha256:fe0c4f7cd6b67eff3b7cb8dff6709a65d6fca10b7b7449a493b2036915e98b4c \ | ||||
|     # via tornado-botocore | ||||
| derpconf==0.8.3 \ | ||||
|     --hash=sha256:1bb152d8a1cf5c2a6d629bf29acd4af0c00811339642fc0a56172b0a83b31a15 \ | ||||
|     # via thumbor | ||||
| django-auth-ldap==1.7.0 \ | ||||
|     --hash=sha256:72848b3b036d299114be3c6ef38b12f83f6cf1cf1696c5f92e06fe45a1b8e27b \ | ||||
|     --hash=sha256:f96398ce957bb8aaaee2e9d93e3eaf9955ab95a6d342303b5519350eb834f5d1 \ | ||||
| django-auth-ldap==2.2.0 \ | ||||
|     --hash=sha256:0ed2d88d81c39be915a9ab53b97ec0a33a3d16055518ab4c9bcffe8236d40370 \ | ||||
|     --hash=sha256:11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf \ | ||||
|     # via -r requirements/thumbor.in | ||||
| django==1.11.29 \ | ||||
|     --hash=sha256:014e3392058d94f40569206a24523ce254d55ad2f9f46c6550b0fe2e4f94cf3f \ | ||||
|     --hash=sha256:4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c \ | ||||
| django==2.2.14 \ | ||||
|     --hash=sha256:edf0ecf6657713b0435b6757e6069466925cae70d634a3283c96b80c01e06191 \ | ||||
|     --hash=sha256:f2250bd35d0f6c23e930c544629934144e5dd39a4c06092e1050c731c1712ba8 \ | ||||
|     # via -r requirements/thumbor.in, django-auth-ldap | ||||
| docutils==0.15.2 \ | ||||
|     --hash=sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0 \ | ||||
|     --hash=sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827 \ | ||||
|     --hash=sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 \ | ||||
|     # via botocore | ||||
| futures==3.3.0 \ | ||||
|     --hash=sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16 \ | ||||
|     --hash=sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794 \ | ||||
|     # via thumbor, tornado | ||||
| idna-ssl==1.1.0 \ | ||||
|     --hash=sha256:a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c \ | ||||
|     # via aiohttp | ||||
| idna==2.10 \ | ||||
|     --hash=sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6 \ | ||||
|     --hash=sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0 \ | ||||
|     # via idna-ssl, yarl | ||||
| jmespath==0.10.0 \ | ||||
|     --hash=sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9 \ | ||||
|     --hash=sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f \ | ||||
|     # via botocore | ||||
| libthumbor==1.3.2 \ | ||||
|     --hash=sha256:2ba48729e9e52fed235c6948f40ffd5c59c9bc74593ccf4d988972e4f4d750ee \ | ||||
| libthumbor==2.0.1 \ | ||||
|     --hash=sha256:3c4e1a59c019d22f868d225315c06f97fad30fb5e78112d6a230b978e7d24e38 \ | ||||
|     --hash=sha256:ed4fe5f27f8f90e7285b7e6dce99c1b67d43a140bf370e989080b43d80ce25f0 \ | ||||
|     # via thumbor | ||||
| pillow==6.2.2 \ | ||||
|     --hash=sha256:00e0bbe9923adc5cc38a8da7d87d4ce16cde53b8d3bba8886cb928e84522d963 \ | ||||
|     --hash=sha256:03457e439d073770d88afdd90318382084732a5b98b0eb6f49454746dbaae701 \ | ||||
|     --hash=sha256:0d5c99f80068f13231ac206bd9b2e80ea357f5cf9ae0fa97fab21e32d5b61065 \ | ||||
|     --hash=sha256:1a3bc8e1db5af40a81535a62a591fafdb30a8a1b319798ea8052aa65ef8f06d2 \ | ||||
|     --hash=sha256:2b4a94be53dff02af90760c10a2e3634c3c7703410f38c98154d5ce71fe63d20 \ | ||||
|     --hash=sha256:3ba7d8f1d962780f86aa747fef0baf3211b80cb13310fff0c375da879c0656d4 \ | ||||
|     --hash=sha256:3e81485cec47c24f5fb27acb485a4fc97376b2b332ed633867dc68ac3077998c \ | ||||
|     --hash=sha256:43ef1cff7ee57f9c8c8e6fa02a62eae9fa23a7e34418c7ce88c0e3fe09d1fb38 \ | ||||
|     --hash=sha256:4adc3302df4faf77c63ab3a83e1a3e34b94a6a992084f4aa1cb236d1deaf4b39 \ | ||||
|     --hash=sha256:535e8e0e02c9f1fc2e307256149d6ee8ad3aa9a6e24144b7b6e6fb6126cb0e99 \ | ||||
|     --hash=sha256:5ccfcb0a34ad9b77ad247c231edb781763198f405a5c8dc1b642449af821fb7f \ | ||||
|     --hash=sha256:5dcbbaa3a24d091a64560d3c439a8962866a79a033d40eb1a75f1b3413bfc2bc \ | ||||
|     --hash=sha256:6e2a7e74d1a626b817ecb7a28c433b471a395c010b2a1f511f976e9ea4363e64 \ | ||||
|     --hash=sha256:82859575005408af81b3e9171ae326ff56a69af5439d3fc20e8cb76cd51c8246 \ | ||||
|     --hash=sha256:834dd023b7f987d6b700ad93dc818098d7eb046bd445e9992b3093c6f9d7a95f \ | ||||
|     --hash=sha256:87ef0eca169f7f0bc050b22f05c7e174a65c36d584428431e802c0165c5856ea \ | ||||
|     --hash=sha256:900de1fdc93764be13f6b39dc0dd0207d9ff441d87ad7c6e97e49b81987dc0f3 \ | ||||
|     --hash=sha256:92b83b380f9181cacc994f4c983d95a9c8b00b50bf786c66d235716b526a3332 \ | ||||
|     --hash=sha256:aa1b0297e352007ec781a33f026afbb062a9a9895bb103c8f49af434b1666880 \ | ||||
|     --hash=sha256:aa4792ab056f51b49e7d59ce5733155e10a918baf8ce50f64405db23d5627fa2 \ | ||||
|     --hash=sha256:b72c39585f1837d946bd1a829a4820ccf86e361f28cbf60f5d646f06318b61e2 \ | ||||
|     --hash=sha256:bb7861e4618a0c06c40a2e509c1bea207eea5fd4320d486e314e00745a402ca5 \ | ||||
|     --hash=sha256:bc149dab804291a18e1186536519e5e122a2ac1316cb80f506e855a500b1cdd4 \ | ||||
|     --hash=sha256:c424d35a5259be559b64490d0fd9e03fba81f1ce8e5b66e0a59de97547351d80 \ | ||||
|     --hash=sha256:cbd5647097dc55e501f459dbac7f1d0402225636deeb9e0a98a8d2df649fc19d \ | ||||
|     --hash=sha256:ccf16fe444cc43800eeacd4f4769971200982200a71b1368f49410d0eb769543 \ | ||||
|     --hash=sha256:d3a98444a00b4643b22b0685dbf9e0ddcaf4ebfd4ea23f84f228adf5a0765bb2 \ | ||||
|     --hash=sha256:d6b4dc325170bee04ca8292bbd556c6f5398d52c6149ca881e67daf62215426f \ | ||||
|     --hash=sha256:db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950 \ | ||||
|     --hash=sha256:e3a797a079ce289e59dbd7eac9ca3bf682d52687f718686857281475b7ca8e6a \ | ||||
| multidict==4.7.6 \ | ||||
|     --hash=sha256:1ece5a3369835c20ed57adadc663400b5525904e53bae59ec854a5d36b39b21a \ | ||||
|     --hash=sha256:275ca32383bc5d1894b6975bb4ca6a7ff16ab76fa622967625baeebcf8079000 \ | ||||
|     --hash=sha256:3750f2205b800aac4bb03b5ae48025a64e474d2c6cc79547988ba1d4122a09e2 \ | ||||
|     --hash=sha256:4538273208e7294b2659b1602490f4ed3ab1c8cf9dbdd817e0e9db8e64be2507 \ | ||||
|     --hash=sha256:5141c13374e6b25fe6bf092052ab55c0c03d21bd66c94a0e3ae371d3e4d865a5 \ | ||||
|     --hash=sha256:51a4d210404ac61d32dada00a50ea7ba412e6ea945bbe992e4d7a595276d2ec7 \ | ||||
|     --hash=sha256:5cf311a0f5ef80fe73e4f4c0f0998ec08f954a6ec72b746f3c179e37de1d210d \ | ||||
|     --hash=sha256:6513728873f4326999429a8b00fc7ceddb2509b01d5fd3f3be7881a257b8d463 \ | ||||
|     --hash=sha256:7388d2ef3c55a8ba80da62ecfafa06a1c097c18032a501ffd4cabbc52d7f2b19 \ | ||||
|     --hash=sha256:9456e90649005ad40558f4cf51dbb842e32807df75146c6d940b6f5abb4a78f3 \ | ||||
|     --hash=sha256:c026fe9a05130e44157b98fea3ab12969e5b60691a276150db9eda71710cd10b \ | ||||
|     --hash=sha256:d14842362ed4cf63751648e7672f7174c9818459d169231d03c56e84daf90b7c \ | ||||
|     --hash=sha256:e0d072ae0f2a179c375f67e3da300b47e1a83293c554450b29c900e50afaae87 \ | ||||
|     --hash=sha256:f07acae137b71af3bb548bd8da720956a3bc9f9a0b87733e0899226a2317aeb7 \ | ||||
|     --hash=sha256:fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430 \ | ||||
|     --hash=sha256:fcfbb44c59af3f8ea984de67ec7c306f618a3ec771c2843804069917a8f2e255 \ | ||||
|     --hash=sha256:feed85993dbdb1dbc29102f50bca65bdc68f2c0c8d352468c25b54874f23c39d \ | ||||
|     # via aiohttp, yarl | ||||
| numpy==1.19.0 \ | ||||
|     --hash=sha256:13af0184177469192d80db9bd02619f6fa8b922f9f327e077d6f2a6acb1ce1c0 \ | ||||
|     --hash=sha256:26a45798ca2a4e168d00de75d4a524abf5907949231512f372b217ede3429e98 \ | ||||
|     --hash=sha256:26f509450db547e4dfa3ec739419b31edad646d21fb8d0ed0734188b35ff6b27 \ | ||||
|     --hash=sha256:30a59fb41bb6b8c465ab50d60a1b298d1cd7b85274e71f38af5a75d6c475d2d2 \ | ||||
|     --hash=sha256:33c623ef9ca5e19e05991f127c1be5aeb1ab5cdf30cb1c5cf3960752e58b599b \ | ||||
|     --hash=sha256:356f96c9fbec59974a592452ab6a036cd6f180822a60b529a975c9467fcd5f23 \ | ||||
|     --hash=sha256:3c40c827d36c6d1c3cf413694d7dc843d50997ebffbc7c87d888a203ed6403a7 \ | ||||
|     --hash=sha256:4d054f013a1983551254e2379385e359884e5af105e3efe00418977d02f634a7 \ | ||||
|     --hash=sha256:63d971bb211ad3ca37b2adecdd5365f40f3b741a455beecba70fd0dde8b2a4cb \ | ||||
|     --hash=sha256:658624a11f6e1c252b2cd170d94bf28c8f9410acab9f2fd4369e11e1cd4e1aaf \ | ||||
|     --hash=sha256:76766cc80d6128750075378d3bb7812cf146415bd29b588616f72c943c00d598 \ | ||||
|     --hash=sha256:7b57f26e5e6ee2f14f960db46bd58ffdca25ca06dd997729b1b179fddd35f5a3 \ | ||||
|     --hash=sha256:7b852817800eb02e109ae4a9cef2beda8dd50d98b76b6cfb7b5c0099d27b52d4 \ | ||||
|     --hash=sha256:8cde829f14bd38f6da7b2954be0f2837043e8b8d7a9110ec5e318ae6bf706610 \ | ||||
|     --hash=sha256:a2e3a39f43f0ce95204beb8fe0831199542ccab1e0c6e486a0b4947256215632 \ | ||||
|     --hash=sha256:a86c962e211f37edd61d6e11bb4df7eddc4a519a38a856e20a6498c319efa6b0 \ | ||||
|     --hash=sha256:a8705c5073fe3fcc297fb8e0b31aa794e05af6a329e81b7ca4ffecab7f2b95ef \ | ||||
|     --hash=sha256:b6aaeadf1e4866ca0fdf7bb4eed25e521ae21a7947c59f78154b24fc7abbe1dd \ | ||||
|     --hash=sha256:be62aeff8f2f054eff7725f502f6228298891fd648dc2630e03e44bf63e8cee0 \ | ||||
|     --hash=sha256:c2edbb783c841e36ca0fa159f0ae97a88ce8137fb3a6cd82eae77349ba4b607b \ | ||||
|     --hash=sha256:cbe326f6d364375a8e5a8ccb7e9cd73f4b2f6dc3b2ed205633a0db8243e2a96a \ | ||||
|     --hash=sha256:d34fbb98ad0d6b563b95de852a284074514331e6b9da0a9fc894fb1cdae7a79e \ | ||||
|     --hash=sha256:d97a86937cf9970453c3b62abb55a6475f173347b4cde7f8dcdb48c8e1b9952d \ | ||||
|     --hash=sha256:dd53d7c4a69e766e4900f29db5872f5824a06827d594427cf1a4aa542818b796 \ | ||||
|     --hash=sha256:df1889701e2dfd8ba4dc9b1a010f0a60950077fb5242bb92c8b5c7f1a6f2668a \ | ||||
|     --hash=sha256:fa1fe75b4a9e18b66ae7f0b122543c42debcf800aaafa0212aaff3ad273c2596 \ | ||||
|     # via opencv-python-headless | ||||
| opencv-python-headless==4.2.0.34 \ | ||||
|     --hash=sha256:06a96ec4866aa40c68c255042ea0ab8a96c07f2eb54f5b0dc6b8ac08b00c1b7e \ | ||||
|     --hash=sha256:1641d82b94ce496e6f3df8f2a337eae94cd608e0e61dbb4b697577438d88c258 \ | ||||
|     --hash=sha256:1df0adfc1b893615ab8487cd207aae356936b0ba1823520e2292c928853c2930 \ | ||||
|     --hash=sha256:20c450943acebd9aa04566fdef4a658b94eec80a0c39a8f480c9aa1696034fcb \ | ||||
|     --hash=sha256:28b28e3462500dccf75ac5efb2b885494d050fb6444fee37b53f9f950bccca57 \ | ||||
|     --hash=sha256:3aadcd93f1ad9a92dbfbfdeacb7ffca115f137aa2b07d36495fd141f2a553479 \ | ||||
|     --hash=sha256:45f90a872bc2e3d3257e06508ea18b3e2d429cf1b20de1a8f5c57251cc39fae4 \ | ||||
|     --hash=sha256:4c3004573ecfbdf46785682a294923661903eb18e4c188106998ef5be255df1f \ | ||||
|     --hash=sha256:4e9de88b1376f904158698c3335f184cbcdc68eda018eb8f751e27e7407dddd1 \ | ||||
|     --hash=sha256:64292b593367e5b37556900b132861d94c05f616d8569c5625b02be6d51e13f7 \ | ||||
|     --hash=sha256:67c6ff682e413db759f49a206bafa5ebb8b01dfdefa5199df32741b58772c3d7 \ | ||||
|     --hash=sha256:70117cd51b158f7628cf2dab24805df40173c3794ca3dfeec22defb326ec0173 \ | ||||
|     --hash=sha256:904f0b4a358b3260d7572956026bf6a0fa0cda31d5a6afeed3e55341a3f36c8d \ | ||||
|     --hash=sha256:aca7419cae1390a8f2d6776571d1d19db66dadbff2ded79e4ff4bad5d9df6633 \ | ||||
|     --hash=sha256:ca9a5f4b04f2b423892ef5934fdd685edd0bc458c77fc7e164156a50e6be0377 \ | ||||
|     --hash=sha256:cef7e844f5fd73cb602b8ba3f048a68dc2c59b7abb55ca99cceee9f688e909a4 \ | ||||
|     --hash=sha256:ed5c7d2fd8dc08ebcb9f8ed09883e3a083a5e0bc35f863ac280f61cec9560b09 \ | ||||
|     --hash=sha256:edfaeea04982166a02c87b85ed5451b77485c86db7a4b216a42e6b686e1b5f1a \ | ||||
|     --hash=sha256:f93bec89d943ca1877c38920e934ed1d6193cdc6ff09cb910c19c15643ee07df \ | ||||
|     --hash=sha256:ffe74fc421fc77b649f4b762e115fd2b9cea9ba86b4590f7939bd15f92f11f80 \ | ||||
|     # via thumbor | ||||
| pillow==7.2.0 \ | ||||
|     --hash=sha256:0295442429645fa16d05bd567ef5cff178482439c9aad0411d3f0ce9b88b3a6f \ | ||||
|     --hash=sha256:06aba4169e78c439d528fdeb34762c3b61a70813527a2c57f0540541e9f433a8 \ | ||||
|     --hash=sha256:09d7f9e64289cb40c2c8d7ad674b2ed6105f55dc3b09aa8e4918e20a0311e7ad \ | ||||
|     --hash=sha256:0a80dd307a5d8440b0a08bd7b81617e04d870e40a3e46a32d9c246e54705e86f \ | ||||
|     --hash=sha256:1ca594126d3c4def54babee699c055a913efb01e106c309fa6b04405d474d5ae \ | ||||
|     --hash=sha256:25930fadde8019f374400f7986e8404c8b781ce519da27792cbe46eabec00c4d \ | ||||
|     --hash=sha256:431b15cffbf949e89df2f7b48528be18b78bfa5177cb3036284a5508159492b5 \ | ||||
|     --hash=sha256:52125833b070791fcb5710fabc640fc1df07d087fc0c0f02d3661f76c23c5b8b \ | ||||
|     --hash=sha256:5e51ee2b8114def244384eda1c82b10e307ad9778dac5c83fb0943775a653cd8 \ | ||||
|     --hash=sha256:612cfda94e9c8346f239bf1a4b082fdd5c8143cf82d685ba2dba76e7adeeb233 \ | ||||
|     --hash=sha256:6d7741e65835716ceea0fd13a7d0192961212fd59e741a46bbed7a473c634ed6 \ | ||||
|     --hash=sha256:6edb5446f44d901e8683ffb25ebdfc26988ee813da3bf91e12252b57ac163727 \ | ||||
|     --hash=sha256:725aa6cfc66ce2857d585f06e9519a1cc0ef6d13f186ff3447ab6dff0a09bc7f \ | ||||
|     --hash=sha256:8dad18b69f710bf3a001d2bf3afab7c432785d94fcf819c16b5207b1cfd17d38 \ | ||||
|     --hash=sha256:94cf49723928eb6070a892cb39d6c156f7b5a2db4e8971cb958f7b6b104fb4c4 \ | ||||
|     --hash=sha256:97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626 \ | ||||
|     --hash=sha256:9ad7f865eebde135d526bb3163d0b23ffff365cf87e767c649550964ad72785d \ | ||||
|     --hash=sha256:a060cf8aa332052df2158e5a119303965be92c3da6f2d93b6878f0ebca80b2f6 \ | ||||
|     --hash=sha256:c79f9c5fb846285f943aafeafda3358992d64f0ef58566e23484132ecd8d7d63 \ | ||||
|     --hash=sha256:c92302a33138409e8f1ad16731568c55c9053eee71bb05b6b744067e1b62380f \ | ||||
|     --hash=sha256:d08b23fdb388c0715990cbc06866db554e1822c4bdcf6d4166cf30ac82df8c41 \ | ||||
|     --hash=sha256:d350f0f2c2421e65fbc62690f26b59b0bcda1b614beb318c81e38647e0f673a1 \ | ||||
|     --hash=sha256:ec29604081f10f16a7aea809ad42e27764188fc258b02259a03a8ff7ded3808d \ | ||||
|     --hash=sha256:edf31f1150778abd4322444c393ab9c7bd2af271dd4dafb4208fb613b1f3cdc9 \ | ||||
|     --hash=sha256:f7e30c27477dffc3e85c2463b3e649f751789e0f6c8456099eea7ddd53be4a8a \ | ||||
|     --hash=sha256:ffe538682dc19cc542ae7c3e504fdf54ca7f86fb8a135e59dd6bc8627eae6cce \ | ||||
|     # via thumbor | ||||
| pyasn1-modules==0.2.8 \ | ||||
|     --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \ | ||||
| @@ -86,17 +185,6 @@ pyasn1==0.4.8 \ | ||||
|     --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ | ||||
|     --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba \ | ||||
|     # via pyasn1-modules, python-ldap | ||||
| pycurl==7.43.0.5 \ | ||||
|     --hash=sha256:1957c867e2a341f5526c107c7bbc5014d6e75fdc2a14294fcb8a47663fbd2e15 \ | ||||
|     --hash=sha256:50aee0469511a9708a1f1a50d510b5ec2013fc6f5e720c32bbcb3b9c7b0f45b1 \ | ||||
|     --hash=sha256:667db26516e50ce4a853745906f3b149c24756d85061b9d966eb7ec43a8c48a4 \ | ||||
|     --hash=sha256:7cc13d3421cbd31921d77e22d1f57c0e1a8d0fb461938a587689a93162ccef2f \ | ||||
|     --hash=sha256:a0c62dbc66b9b947832307d6cf7bdb5e4da906ce7b3efe6f74292e8f3dc5abe3 \ | ||||
|     --hash=sha256:a6966e8d9ccda31c6d077c4f8673aaa88141cc73d50e110e93e627b816d17fd1 \ | ||||
|     --hash=sha256:beadfa7f052626864d70eb33cec8f2aeece12dfb483c2424cc07b057f83b7d35 \ | ||||
|     --hash=sha256:c5c379c8cc777dda397f86f0d0049480250ae84a82a9d99d668f461d368fb39c \ | ||||
|     --hash=sha256:ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3 \ | ||||
|     # via thumbor | ||||
| python-dateutil==2.8.1 \ | ||||
|     --hash=sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c \ | ||||
|     --hash=sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a \ | ||||
| @@ -104,41 +192,44 @@ python-dateutil==2.8.1 \ | ||||
| python-ldap==3.3.1 \ | ||||
|     --hash=sha256:4711cacf013e298754abd70058ccc995758177fb425f1c2d30e71adfc1d00aa5 \ | ||||
|     # via django-auth-ldap | ||||
| pytz==2020.1 \ | ||||
|     --hash=sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed \ | ||||
|     --hash=sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048 \ | ||||
| pytz==2019.3 \ | ||||
|     --hash=sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d \ | ||||
|     --hash=sha256:b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be \ | ||||
|     # via django, thumbor | ||||
| singledispatch==3.4.0.3 \ | ||||
|     --hash=sha256:5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c \ | ||||
|     --hash=sha256:833b46966687b3de7f438c761ac475213e53b306740f1abfaa86e1d1aae56aa8 \ | ||||
|     # via tornado | ||||
| six==1.15.0 \ | ||||
|     --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \ | ||||
|     --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced \ | ||||
|     # via derpconf, libthumbor, python-dateutil, singledispatch, thumbor, webcolors | ||||
|     # via derpconf, libthumbor, python-dateutil | ||||
| sqlparse==0.3.1 \ | ||||
|     --hash=sha256:022fb9c87b524d1f7862b3037e541f68597a730a8843245c349fc93e1643dc4e \ | ||||
|     --hash=sha256:e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548 \ | ||||
|     # via django | ||||
| statsd==3.3.0 \ | ||||
|     --hash=sha256:c610fb80347fca0ef62666d241bce64184bd7cc1efe582f9690e045c25535eaa \ | ||||
|     --hash=sha256:e3e6db4c246f7c59003e51c9720a51a7f39a396541cb9b147ff4b14d15b5dd1f \ | ||||
|     # via thumbor | ||||
| tc-aws==6.2.15 \ | ||||
|     --hash=sha256:1c9e1ca443f1b5681bc7e9ca07a5825acad9477f6625ef19cf61b6f917b5ce95 \ | ||||
| https://github.com/kkopachev/aws/archive/0d02528b47273e143be750ba237f71a076e8f251.zip#egg=tc_aws==6.3 \ | ||||
|     --hash=sha256:866d18ffbfd5a1627ed3973757e4c282745de8f30ed85f5ce8e80ae04932f8f3 \ | ||||
|     # via -r requirements/thumbor.in | ||||
| thumbor==6.7.5 \ | ||||
|     --hash=sha256:3895c367b6bc88d2afadc80212471d300727c69c8750eb164d9eae0d098077ca \ | ||||
| thumbor==7.0.0a5 \ | ||||
|     --hash=sha256:5042c9c8facf0da028a22f1aee717f856d213ec037835ca0edaa0282217654bb \ | ||||
|     # via -r requirements/thumbor.in, tc-aws | ||||
| tornado-botocore==1.5.0 \ | ||||
|     --hash=sha256:3113072ddf8b996316118562543b6826ffe628bd6afdadfe641555c45da450e7 \ | ||||
|     --hash=sha256:6e3894840aaf1edc76eccfc4e180b9b5c26487b690fc596e581d42f4219e47df \ | ||||
|     # via tc-aws | ||||
| tornado==5.1.1 \ | ||||
|     --hash=sha256:0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d \ | ||||
|     --hash=sha256:4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409 \ | ||||
|     --hash=sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f \ | ||||
|     --hash=sha256:8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f \ | ||||
|     --hash=sha256:8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5 \ | ||||
|     --hash=sha256:d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb \ | ||||
|     --hash=sha256:e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444 \ | ||||
|     # via thumbor, tornado-botocore | ||||
| tornado==6.0.4 \ | ||||
|     --hash=sha256:0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc \ | ||||
|     --hash=sha256:22aed82c2ea340c3771e3babc5ef220272f6fd06b5108a53b4976d0d722bcd52 \ | ||||
|     --hash=sha256:2c027eb2a393d964b22b5c154d1a23a5f8727db6fda837118a776b29e2b8ebc6 \ | ||||
|     --hash=sha256:5217e601700f24e966ddab689f90b7ea4bd91ff3357c3600fa1045e26d68e55d \ | ||||
|     --hash=sha256:5618f72e947533832cbc3dec54e1dffc1747a5cb17d1fd91577ed14fa0dc081b \ | ||||
|     --hash=sha256:5f6a07e62e799be5d2330e68d808c8ac41d4a259b9cea61da4101b83cb5dc673 \ | ||||
|     --hash=sha256:c58d56003daf1b616336781b26d184023ea4af13ae143d9dda65e31e534940b9 \ | ||||
|     --hash=sha256:c952975c8ba74f546ae6de2e226ab3cc3cc11ae47baf607459a6728585bb542a \ | ||||
|     --hash=sha256:c98232a3ac391f5faea6821b53db8db461157baa788f5d6222a193e9456e1740 \ | ||||
|     # via thumbor | ||||
| typing-extensions==3.7.4.2 \ | ||||
|     --hash=sha256:6e95524d8a547a91e08f404ae485bbb71962de46967e1b71a0cb89af24e761c5 \ | ||||
|     --hash=sha256:79ee589a3caca649a9bfd2a8de4709837400dfa00b6cc81962a1e6a1815969ae \ | ||||
|     --hash=sha256:f8d2bd89d25bc39dabe7d23df520442fa1d8969b82544370e03d88b5a591c392 \ | ||||
|     # via aiohttp, aioitertools | ||||
| typing==3.7.4.1 \ | ||||
|     --hash=sha256:91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23 \ | ||||
|     --hash=sha256:c8cabb5ab8945cd2f54917be357d134db9cc1eb039e59d1606dc1e60cb1d9d36 \ | ||||
| @@ -152,7 +243,29 @@ virtualenv-clone==0.5.4 \ | ||||
|     --hash=sha256:07e74418b7cc64f4fda987bf5bc71ebd59af27a7bc9e8a8ee9fd54b1f2390a27 \ | ||||
|     --hash=sha256:665e48dd54c84b98b71a657acb49104c54e7652bce9c1c4f6c6976ed4c827a29 \ | ||||
|     # via -r requirements/thumbor.in | ||||
| webcolors==1.10 \ | ||||
|     --hash=sha256:2559b4f4694bfcd61c87ee06acad921bd2fdbf0c844bee65fc844c6910c413dd \ | ||||
|     --hash=sha256:7b11194c414dcf4b9bd8fb5ceaafc9da183b27430883c62f620589eb79b91b6e \ | ||||
| webcolors==1.11.1 \ | ||||
|     --hash=sha256:76f360636957d1c976db7466bc71dcb713bb95ac8911944dffc55c01cb516de6 \ | ||||
|     --hash=sha256:b8cd5d865a25c51ff1218f0c90d0c0781fc64312a49b746b320cf50de1648f6e \ | ||||
|     # via thumbor | ||||
| wrapt==1.12.1 \ | ||||
|     --hash=sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7 \ | ||||
|     # via aiobotocore | ||||
| yarl==1.4.2 \ | ||||
|     --hash=sha256:0c2ab325d33f1b824734b3ef51d4d54a54e0e7a23d13b86974507602334c2cce \ | ||||
|     --hash=sha256:0ca2f395591bbd85ddd50a82eb1fde9c1066fafe888c5c7cc1d810cf03fd3cc6 \ | ||||
|     --hash=sha256:2098a4b4b9d75ee352807a95cdf5f10180db903bc5b7270715c6bbe2551f64ce \ | ||||
|     --hash=sha256:25e66e5e2007c7a39541ca13b559cd8ebc2ad8fe00ea94a2aad28a9b1e44e5ae \ | ||||
|     --hash=sha256:26d7c90cb04dee1665282a5d1a998defc1a9e012fdca0f33396f81508f49696d \ | ||||
|     --hash=sha256:308b98b0c8cd1dfef1a0311dc5e38ae8f9b58349226aa0533f15a16717ad702f \ | ||||
|     --hash=sha256:3ce3d4f7c6b69c4e4f0704b32eca8123b9c58ae91af740481aa57d7857b5e41b \ | ||||
|     --hash=sha256:58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b \ | ||||
|     --hash=sha256:5b10eb0e7f044cf0b035112446b26a3a2946bca9d7d7edb5e54a2ad2f6652abb \ | ||||
|     --hash=sha256:6faa19d3824c21bcbfdfce5171e193c8b4ddafdf0ac3f129ccf0cdfcb083e462 \ | ||||
|     --hash=sha256:944494be42fa630134bf907714d40207e646fd5a94423c90d5b514f7b0713fea \ | ||||
|     --hash=sha256:a161de7e50224e8e3de6e184707476b5a989037dcb24292b391a3d66ff158e70 \ | ||||
|     --hash=sha256:a4844ebb2be14768f7994f2017f70aca39d658a96c786211be5ddbe1c68794c1 \ | ||||
|     --hash=sha256:c2b509ac3d4b988ae8769901c66345425e361d518aecbe4acbfc2567e416626a \ | ||||
|     --hash=sha256:c9959d49a77b0e07559e579f38b2f3711c2b8716b8410b320bf9713013215a1b \ | ||||
|     --hash=sha256:d8cdee92bc930d8b09d8bd2043cedd544d9c8bd7436a77678dd602467a993080 \ | ||||
|     --hash=sha256:e15199cdb423316e15f108f51249e44eb156ae5dba232cb73be555324a1d49c2 \ | ||||
|     # via aiohttp | ||||
|   | ||||
| @@ -31,5 +31,4 @@ else: | ||||
| venv_name = "zulip-thumbor-venv" | ||||
| cached_venv_path = setup_virtualenv( | ||||
|     os.path.join(args.deploy_path, venv_name), | ||||
|     os.path.join(ZULIP_PATH, "requirements", "thumbor.txt"), | ||||
|     python2=True) | ||||
|     os.path.join(ZULIP_PATH, "requirements", "thumbor.txt")) | ||||
|   | ||||
| @@ -273,15 +273,9 @@ if [ -z "$NO_DIST_UPGRADE" ]; then | ||||
| fi | ||||
|  | ||||
| if [ "$package_system" = apt ]; then | ||||
|     if [ "$os_id" = ubuntu ] && [ "$os_version_id" = 20.04 ]; then | ||||
|         PYTHON2="python2" | ||||
|     else | ||||
|         PYTHON2="python" | ||||
|     fi | ||||
|  | ||||
|     if ! apt-get install -y \ | ||||
|          puppet git curl wget jq \ | ||||
|          "$PYTHON2" python3 python-six python3-six crudini \ | ||||
|          python3 python3-six crudini \ | ||||
|          "${ADDITIONAL_PACKAGES[@]}"; then | ||||
|         set +x | ||||
|         echo -e '\033[0;31m' >&2 | ||||
| @@ -293,7 +287,7 @@ if [ "$package_system" = apt ]; then | ||||
| elif [ "$package_system" = yum ]; then | ||||
|     if ! yum install -y \ | ||||
|          puppet git curl wget jq \ | ||||
|          python python3 python-six python3-six crudini \ | ||||
|          python3 python3-six crudini \ | ||||
|          "${ADDITIONAL_PACKAGES[@]}"; then | ||||
|         set +x | ||||
|         echo -e '\033[0;31m' >&2 | ||||
|   | ||||
| @@ -38,10 +38,6 @@ VENV_DEPENDENCIES = [ | ||||
|     "jq",                   # Used by scripts/lib/install-node to check yarn version | ||||
| ] | ||||
|  | ||||
| # python-dev is depreciated in Focal but can be used as python2-dev. | ||||
| # So it is removed from VENV_DEPENDENCIES and added here. | ||||
| PYTHON_DEV_DEPENDENCY = "python{}-dev" | ||||
|  | ||||
| COMMON_YUM_VENV_DEPENDENCIES = [ | ||||
|     "libffi-devel", | ||||
|     "freetype-devel", | ||||
| @@ -49,9 +45,6 @@ COMMON_YUM_VENV_DEPENDENCIES = [ | ||||
|     "libjpeg-turbo-devel", | ||||
|     "openldap-devel", | ||||
|     "libmemcached-devel", | ||||
|     "python-devel", | ||||
|     "python2-pip", | ||||
|     "python-six", | ||||
|     # Needed by python-xmlsec: | ||||
|     "gcc" | ||||
|     "python3-devel", | ||||
| @@ -59,7 +52,6 @@ COMMON_YUM_VENV_DEPENDENCIES = [ | ||||
|     "xmlsec1-devel", | ||||
|     "xmlsec1-openssl-devel", | ||||
|     "libtool-ltdl-devel", | ||||
|  | ||||
|     "libxslt-devel", | ||||
|     "postgresql-libs",  # libpq-dev on apt | ||||
|     "openssl-devel", | ||||
| @@ -97,10 +89,8 @@ YUM_THUMBOR_VENV_DEPENDENCIES = [ | ||||
| ] | ||||
|  | ||||
| def get_venv_dependencies(vendor: str, os_version: str) -> List[str]: | ||||
|     if vendor == 'ubuntu' and os_version == '20.04': | ||||
|         return VENV_DEPENDENCIES + [PYTHON_DEV_DEPENDENCY.format("2")] | ||||
|     elif "debian" in os_families(): | ||||
|         return VENV_DEPENDENCIES + [PYTHON_DEV_DEPENDENCY.format("")] | ||||
|     if "debian" in os_families(): | ||||
|         return VENV_DEPENDENCIES | ||||
|     elif "rhel" in os_families(): | ||||
|         return REDHAT_VENV_DEPENDENCIES | ||||
|     elif "fedora" in os_families(): | ||||
| @@ -108,8 +98,8 @@ def get_venv_dependencies(vendor: str, os_version: str) -> List[str]: | ||||
|     else: | ||||
|         raise AssertionError("Invalid vendor") | ||||
|  | ||||
| def install_venv_deps(pip: str, requirements_file: str, python2: bool) -> None: | ||||
|     pip_requirements = os.path.join(ZULIP_PATH, "requirements", "pip2.txt" if python2 else "pip.txt") | ||||
| def install_venv_deps(pip: str, requirements_file: str) -> None: | ||||
|     pip_requirements = os.path.join(ZULIP_PATH, "requirements", "pip.txt") | ||||
|     run([pip, "install", "--force-reinstall", "--require-hashes", "--requirement", pip_requirements]) | ||||
|     run([pip, "install", "--no-deps", "--require-hashes", "--requirement", requirements_file]) | ||||
|  | ||||
| @@ -278,7 +268,6 @@ def do_patch_activate_script(venv_path: str) -> None: | ||||
| def setup_virtualenv( | ||||
|     target_venv_path: Optional[str], | ||||
|     requirements_file: str, | ||||
|     python2: bool = False, | ||||
|     patch_activate_script: bool = False, | ||||
| ) -> str: | ||||
|  | ||||
| @@ -292,7 +281,7 @@ def setup_virtualenv( | ||||
|         cached_venv_path = os.path.join(VENV_CACHE_PATH, sha1sum, os.path.basename(target_venv_path)) | ||||
|     success_stamp = os.path.join(cached_venv_path, "success-stamp") | ||||
|     if not os.path.exists(success_stamp): | ||||
|         do_setup_virtualenv(cached_venv_path, requirements_file, python2) | ||||
|         do_setup_virtualenv(cached_venv_path, requirements_file) | ||||
|         with open(success_stamp, 'w') as f: | ||||
|             f.close() | ||||
|  | ||||
| @@ -309,7 +298,7 @@ def add_cert_to_pipconf() -> None: | ||||
|     os.makedirs(confdir, exist_ok=True) | ||||
|     run(["crudini", "--set", conffile, "global", "cert", os.environ["CUSTOM_CA_CERTIFICATES"]]) | ||||
|  | ||||
| def do_setup_virtualenv(venv_path: str, requirements_file: str, python2: bool) -> None: | ||||
| def do_setup_virtualenv(venv_path: str, requirements_file: str) -> None: | ||||
|  | ||||
|     # Setup Python virtualenv | ||||
|     new_packages = set(get_package_names(requirements_file)) | ||||
| @@ -318,7 +307,7 @@ def do_setup_virtualenv(venv_path: str, requirements_file: str, python2: bool) - | ||||
|     if not try_to_copy_venv(venv_path, new_packages): | ||||
|         # Create new virtualenv. | ||||
|         run_as_root(["mkdir", "-p", venv_path]) | ||||
|         run_as_root(["virtualenv", "-p", "python2.7" if python2 else "python3", venv_path]) | ||||
|         run_as_root(["virtualenv", "-p", "python3", venv_path]) | ||||
|         run_as_root(["chown", "-R", | ||||
|                      "{}:{}".format(os.getuid(), os.getgid()), venv_path]) | ||||
|         create_log_entry(get_logfile_name(venv_path), "", set(), new_packages) | ||||
| @@ -333,10 +322,10 @@ def do_setup_virtualenv(venv_path: str, requirements_file: str, python2: bool) - | ||||
|         add_cert_to_pipconf() | ||||
|  | ||||
|     try: | ||||
|         install_venv_deps(pip, requirements_file, python2) | ||||
|         install_venv_deps(pip, requirements_file) | ||||
|     except subprocess.CalledProcessError: | ||||
|         # Might be a failure due to network connection issues. Retrying... | ||||
|         print(WARNING + "`pip install` failed; retrying..." + ENDC) | ||||
|         install_venv_deps(pip, requirements_file, python2) | ||||
|         install_venv_deps(pip, requirements_file) | ||||
|  | ||||
|     run_as_root(["chmod", "-R", "a+rX", venv_path]) | ||||
|   | ||||
| @@ -1,7 +1,5 @@ | ||||
| bionic: | ||||
|   base_image: buildpack-deps:bionic-scm | ||||
|   extra_packages: python-dev | ||||
|  | ||||
| focal: | ||||
|   base_image: buildpack-deps:focal-scm | ||||
|   extra_packages: python2-dev | ||||
|   | ||||
| @@ -17,7 +17,7 @@ THUMBOR_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "thumbor-dev.txt") | ||||
|  | ||||
| def main() -> None: | ||||
|     setup_virtualenv("/srv/zulip-thumbor-venv", THUMBOR_REQS_FILE, | ||||
|                      patch_activate_script=True, python2=True) | ||||
|                      patch_activate_script=True) | ||||
|     cached_venv_path = setup_virtualenv( | ||||
|         VENV_PATH, DEV_REQS_FILE, patch_activate_script=True) | ||||
|     overwrite_symlink(cached_venv_path, os.path.join(ZULIP_PATH, "zulip-py3-venv")) | ||||
|   | ||||
| @@ -9,14 +9,9 @@ fi | ||||
| compile_requirements () { | ||||
|     source="$1" | ||||
|     output="$2" | ||||
|     python_version="$3" | ||||
|  | ||||
|     echo "Compiling $output" | ||||
|     if [ "$python_version" == "py2" ]; then | ||||
|         /srv/zulip-thumbor-venv/bin/pip-compile --quiet --allow-unsafe --generate-hashes --no-header --output-file "$output" "$source" | ||||
|     else | ||||
|         /srv/zulip-py3-venv/bin/pip-compile --quiet --allow-unsafe --generate-hashes --no-header --output-file "$output" "$source" | ||||
|     fi | ||||
|     /srv/zulip-py3-venv/bin/pip-compile --quiet --allow-unsafe --generate-hashes --no-header --output-file "$output" "$source" | ||||
|  | ||||
|     cat - "$output" <<EOF | sponge "$output" | ||||
| # | ||||
| @@ -60,8 +55,6 @@ for name in pip prod mypy docs; do | ||||
|     compile_requirements "requirements/$name.in" "$OUTPUT_BASE_DIR/$name.txt" | ||||
| done | ||||
|  | ||||
| compile_requirements requirements/thumbor-dev.in "$OUTPUT_BASE_DIR/thumbor-dev.txt" py2 | ||||
| for name in pip2 thumbor; do | ||||
|     cp "$OUTPUT_BASE_DIR/thumbor-dev.txt" "$OUTPUT_BASE_DIR/$name.txt" | ||||
|     compile_requirements "requirements/$name.in" "$OUTPUT_BASE_DIR/$name.txt" py2 | ||||
| done | ||||
| compile_requirements requirements/thumbor-dev.in "$OUTPUT_BASE_DIR/thumbor-dev.txt" | ||||
| cp "$OUTPUT_BASE_DIR/thumbor-dev.txt" "$OUTPUT_BASE_DIR/thumbor.txt" | ||||
| compile_requirements "requirements/thumbor.in" "$OUTPUT_BASE_DIR/thumbor.txt" | ||||
|   | ||||
| @@ -44,4 +44,4 @@ API_FEATURE_LEVEL = 23 | ||||
| #   historical commits sharing the same major version, in which case a | ||||
| #   minor version bump suffices. | ||||
|  | ||||
| PROVISION_VERSION = '88.1' | ||||
| PROVISION_VERSION = '89.0' | ||||
|   | ||||
| @@ -3,13 +3,11 @@ from __future__ import absolute_import | ||||
|  | ||||
| import base64 | ||||
| import logging | ||||
| from typing import Any, Callable | ||||
|  | ||||
| from six.moves import urllib | ||||
| from tc_aws.loaders import s3_loader | ||||
| from thumbor.context import Context | ||||
| from thumbor.loaders import LoaderResult, file_loader, https_loader | ||||
| from tornado.concurrent import return_future | ||||
|  | ||||
| from .helpers import ( | ||||
|     THUMBOR_EXTERNAL_TYPE, | ||||
| @@ -26,16 +24,10 @@ def get_not_found_result(): | ||||
|     result.successful = False | ||||
|     return result | ||||
|  | ||||
| @return_future | ||||
| def load(context, url, callback): | ||||
|     # type: (Context, str, Callable[..., Any]) -> None | ||||
| async def load(context, url): | ||||
|     # type: (Context, str) -> LoaderResult | ||||
|     source_type, encoded_url = separate_url_and_source_type(url) | ||||
|     actual_url = base64.urlsafe_b64decode(urllib.parse.unquote(encoded_url)).decode('utf-8') | ||||
|     if source_type not in (THUMBOR_S3_TYPE, THUMBOR_LOCAL_FILE_TYPE, | ||||
|                            THUMBOR_EXTERNAL_TYPE): | ||||
|         callback(get_not_found_result()) | ||||
|         logging.warning('INVALID SOURCE TYPE: ' + source_type) | ||||
|         return | ||||
|  | ||||
|     if source_type == THUMBOR_S3_TYPE: | ||||
|         if actual_url.startswith('/user_uploads/'): | ||||
| @@ -43,7 +35,7 @@ def load(context, url, callback): | ||||
|         else: | ||||
|             raise AssertionError("Unexpected s3 file.") | ||||
|  | ||||
|         s3_loader.load(context, actual_url, callback) | ||||
|         return await s3_loader.load(context, actual_url) | ||||
|     elif source_type == THUMBOR_LOCAL_FILE_TYPE: | ||||
|         if actual_url.startswith('/user_uploads/'): | ||||
|             actual_url = actual_url[len('/user_uploads/'):] | ||||
| @@ -52,6 +44,9 @@ def load(context, url, callback): | ||||
|             raise AssertionError("Unexpected local file.") | ||||
|  | ||||
|         patched_local_url = local_file_path_prefix + actual_url | ||||
|         file_loader.load(context, patched_local_url, callback) | ||||
|         return await file_loader.load(context, patched_local_url) | ||||
|     elif source_type == THUMBOR_EXTERNAL_TYPE: | ||||
|         https_loader.load(context, actual_url, callback) | ||||
|         return await https_loader.load(context, actual_url) | ||||
|     else: | ||||
|         logging.warning('INVALID SOURCE TYPE: ' + source_type) | ||||
|         return get_not_found_result() | ||||
|   | ||||
		Reference in New Issue
	
	Block a user