From b7a63a33b0f7d285d2fd78381676e17f84a5653d Mon Sep 17 00:00:00 2001 From: James Zhu Date: Mon, 10 Jun 2019 22:19:56 -0700 Subject: [PATCH] Fix social-auth dependency, pin Pipfile exactly (#73) * Update Pipfile / requirements with social-auth-app-django * Lock Pipfile exactly --- Pipfile | 7 +- Pipfile.lock | 205 +++++++++++++++++-------------------------- requirements-dev.txt | 23 ++--- requirements.txt | 29 +++++- 4 files changed, 124 insertions(+), 140 deletions(-) diff --git a/Pipfile b/Pipfile index 3bdfebc2..39e86171 100644 --- a/Pipfile +++ b/Pipfile @@ -4,13 +4,14 @@ verify_ssl = true name = 'pypi' [packages] -django = "~=2.1.5" -mysqlclient = "~=1.3.13" +django = "==2.1.9" +mysqlclient = "==1.3.14" whitenoise = "==4.1.1" pillow = "==5.3.0" django-markdownx = "==2.0.27" gunicorn = "==19.9.0" -fabric = "*" +fabric = "==2.4.0" +social-auth-app-django = "==3.1.0" [dev-packages] pre-commit = "==1.14.4" diff --git a/Pipfile.lock b/Pipfile.lock index caefceba..5b85e738 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "a7c19a70bf84fa2f28a2d79da87ef25dd1ee2ca5ff7ab94833bc196977b489fe" + "sha256": "c8c095c1d9badeb8ef3b6947b6a80c3c9ef9a604b1602b36c49a49bdebccf935" }, "pipfile-spec": 6, "requires": {}, @@ -45,14 +45,6 @@ ], "version": "==3.1.6" }, - "captcha": { - "hashes": [ - "sha256:1671f194da3b535fc12f6b0eb349195c7b28a6641381b2c07e31d04aa92fb6fc", - "sha256:a6b28a120de0a37c44415e70225978e36b2645940133f2474c7a109b2d4683e2" - ], - "index": "pypi", - "version": "==0.3" - }, "certifi": { "hashes": [ "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5", @@ -102,27 +94,24 @@ }, "cryptography": { "hashes": [ - "sha256:066f815f1fe46020877c5983a7e747ae140f517f1b09030ec098503575265ce1", - "sha256:210210d9df0afba9e000636e97810117dc55b7157c903a55716bb73e3ae07705", - "sha256:26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6", - "sha256:2afb83308dc5c5255149ff7d3fb9964f7c9ee3d59b603ec18ccf5b0a8852e2b1", - "sha256:2db34e5c45988f36f7a08a7ab2b69638994a8923853dec2d4af121f689c66dc8", - "sha256:409c4653e0f719fa78febcb71ac417076ae5e20160aec7270c91d009837b9151", - "sha256:45a4f4cf4f4e6a55c8128f8b76b4c057027b27d4c67e3fe157fa02f27e37830d", - "sha256:48eab46ef38faf1031e58dfcc9c3e71756a1108f4c9c966150b605d4a1a7f659", - "sha256:6b9e0ae298ab20d371fc26e2129fd683cfc0cfde4d157c6341722de645146537", - "sha256:6c4778afe50f413707f604828c1ad1ff81fadf6c110cb669579dea7e2e98a75e", - "sha256:8c33fb99025d353c9520141f8bc989c2134a1f76bac6369cea060812f5b5c2bb", - "sha256:9873a1760a274b620a135054b756f9f218fa61ca030e42df31b409f0fb738b6c", - "sha256:9b069768c627f3f5623b1cbd3248c5e7e92aec62f4c98827059eed7053138cc9", - "sha256:9e4ce27a507e4886efbd3c32d120db5089b906979a4debf1d5939ec01b9dd6c5", - "sha256:acb424eaca214cb08735f1a744eceb97d014de6530c1ea23beb86d9c6f13c2ad", - "sha256:c8181c7d77388fe26ab8418bb088b1a1ef5fde058c6926790c8a0a3d94075a4a", - "sha256:d4afbb0840f489b60f5a580a41a1b9c3622e08ecb5eec8614d4fb4cd914c4460", - "sha256:d9ed28030797c00f4bc43c86bf819266c76a5ea61d006cd4078a93ebf7da6bfd", - "sha256:e603aa7bb52e4e8ed4119a58a03b60323918467ef209e6ff9db3ac382e5cf2c6" - ], - "version": "==2.6.1" + "sha256:24b61e5fcb506424d3ec4e18bca995833839bf13c59fc43e530e488f28d46b8c", + "sha256:25dd1581a183e9e7a806fe0543f485103232f940fcfc301db65e630512cce643", + "sha256:3452bba7c21c69f2df772762be0066c7ed5dc65df494a1d53a58b683a83e1216", + "sha256:41a0be220dd1ed9e998f5891948306eb8c812b512dc398e5a01846d855050799", + "sha256:5751d8a11b956fbfa314f6553d186b94aa70fdb03d8a4d4f1c82dcacf0cbe28a", + "sha256:5f61c7d749048fa6e3322258b4263463bfccefecb0dd731b6561cb617a1d9bb9", + "sha256:72e24c521fa2106f19623a3851e9f89ddfdeb9ac63871c7643790f872a305dfc", + "sha256:7b97ae6ef5cba2e3bb14256625423413d5ce8d1abb91d4f29b6d1a081da765f8", + "sha256:961e886d8a3590fd2c723cf07be14e2a91cf53c25f02435c04d39e90780e3b53", + "sha256:96d8473848e984184b6728e2c9d391482008646276c3ff084a1bd89e15ff53a1", + "sha256:ae536da50c7ad1e002c3eee101871d93abdc90d9c5f651818450a0d3af718609", + "sha256:b0db0cecf396033abb4a93c95d1602f268b3a68bb0a9cc06a7cff587bb9a7292", + "sha256:cfee9164954c186b191b91d4193989ca994703b2fff406f71cf454a2d3c7327e", + "sha256:e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6", + "sha256:f27d93f0139a3c056172ebb5d4f9056e770fdf0206c2f422ff2ebbad142e09ed", + "sha256:f57b76e46a58b63d1c6375017f4564a28f19a5ca912691fd2e4261b3414b618d" + ], + "version": "==2.7" }, "defusedxml": { "hashes": [ @@ -134,18 +123,11 @@ }, "django": { "hashes": [ - "sha256:0fd54e4f27bc3e0b7054a11e6b3a18fa53f2373f6b2df8a22e8eadfe018970a5", - "sha256:f3b28084101d516f56104856761bc247f85a2a5bbd9da39d9f6197ff461b3ee4" - ], - "index": "pypi", - "version": "==2.1.8" - }, - "django-captcha": { - "hashes": [ - "sha256:d7f89f6b8f06ff22b72a73fca5ff2b515ec051987641de7de7cc8b0b1899abcc" + "sha256:5052def4ff0a84bdf669827fdbd7b7cc1ac058f10232be6b21f37c6824f578da", + "sha256:bb72b5f8b53f8156280eaea520b548ac128a53f80cebc856c5e0fb555d44d529" ], "index": "pypi", - "version": "==1.0.0" + "version": "==2.1.9" }, "django-markdownx": { "hashes": [ @@ -155,14 +137,6 @@ "index": "pypi", "version": "==2.0.27" }, - "django-recaptcha": { - "hashes": [ - "sha256:a2bf66ee9fc770b806ccac22800892cac066fa5aae0b49af45a79250239c2ade", - "sha256:ae6abba8457a8aec9692ffc845e832b127c77134650daa3c03075b2189991628" - ], - "index": "pypi", - "version": "==1.5.0" - }, "fabric": { "hashes": [ "sha256:93684ceaac92e0b78faae551297e29c48370cede12ff0f853cdebf67d4b87068", @@ -196,10 +170,10 @@ }, "markdown": { "hashes": [ - "sha256:fc4a6f69a656b8d858d7503bda633f4dd63c2d70cf80abdc6eafa64c4ae8c250", - "sha256:fe463ff51e679377e3624984c829022e2cfb3be5518726b06f608a07a3aad680" + "sha256:2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a", + "sha256:56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c" ], - "version": "==3.1" + "version": "==3.1.1" }, "mysqlclient": { "hashes": [ @@ -219,10 +193,10 @@ }, "paramiko": { "hashes": [ - "sha256:3c16b2bfb4c0d810b24c40155dbfd113c0521e7e6ee593d704e84b4c658a1f3b", - "sha256:a8975a7df3560c9f1e2b43dc54ebd40fd00a7017392ca5445ce7df409f900fcb" + "sha256:69c219df239775800a2589ee60159aa7cfd87175809b6557da7fb9dcb44ca430", + "sha256:9f081281064b5180dc0ef60e256224a280ff16f603a99f3dd4ba6334ebb65f7e" ], - "version": "==2.4.2" + "version": "==2.5.0" }, "pillow": { "hashes": [ @@ -260,13 +234,6 @@ "index": "pypi", "version": "==5.3.0" }, - "pyasn1": { - "hashes": [ - "sha256:da2420fe13a9452d8ae97a0e478adde1dee153b11ba832a95b223a2ba01c10f7", - "sha256:da6b43a8c9ae93bc80e2739efb38cc776ba74a886e3e9318d65fe81a8b8a2c6e" - ], - "version": "==0.4.5" - }, "pycparser": { "hashes": [ "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" @@ -321,10 +288,10 @@ }, "requests": { "hashes": [ - "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", - "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" + "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", + "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" ], - "version": "==2.21.0" + "version": "==2.22.0" }, "requests-oauthlib": { "hashes": [ @@ -351,18 +318,18 @@ }, "social-auth-core": { "hashes": [ - "sha256:65122fb4287c70ff7915be0f52150fc1a9b9515eab3c3f0e4cd9dbb2a442a5c3", - "sha256:cc871fb4528f7cbba67efdba0bc0f7d7c6eeb92113b0cdc9368dd91ffe965782", - "sha256:f9f36dfa6af2823efb35a5ef65dfd02f66c944f389c33c25dd9621f8bb75a7da" + "sha256:47cd2458c8fefd02466b0c514643e02ad8b61d8b4b69f7573e80882e3a97b0f0", + "sha256:8320666548a532eb158968eda542bbe1863682357c432d8c4e28034a7f1e3b58", + "sha256:d81ed681e3c0722300b61a0792c5db5d21206793f95ca810f010c1cc931c8d89" ], - "version": "==3.1.0" + "version": "==3.2.0" }, "urllib3": { "hashes": [ - "sha256:4c291ca23bbb55c76518905869ef34bdd5f0e46af7afe6861e8375643ffee1a0", - "sha256:9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3" + "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", + "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" ], - "version": "==1.24.2" + "version": "==1.25.3" }, "whitenoise": { "hashes": [ @@ -376,10 +343,10 @@ "develop": { "aspy.yaml": { "hashes": [ - "sha256:ae249074803e8b957c83fdd82a99160d0d6d26dff9ba81ba608b42eebd7d8cd3", - "sha256:c7390d79f58eb9157406966201abf26da0d56c07e0ff0deadc39c8f4dbc13482" + "sha256:463372c043f70160a9ec950c3f1e4c3a82db5fca01d334b6bc89c7164d744bdc", + "sha256:e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45" ], - "version": "==1.2.0" + "version": "==1.3.0" }, "atomicwrites": { "hashes": [ @@ -397,39 +364,39 @@ }, "cfgv": { "hashes": [ - "sha256:6e9f2feea5e84bc71e56abd703140d7a2c250fc5ba38b8702fd6a68ed4e3b2ef", - "sha256:e7f186d4a36c099a9e20b04ac3108bd8bb9b9257e692ce18c8c3764d5cb12172" + "sha256:32edbe09de6f4521224b87822103a8c16a614d31a894735f7a5b3bcf0eb3c37e", + "sha256:3bd31385cd2bebddbba8012200aaf15aa208539f1b33973759b4d02fc2148da5" ], - "version": "==1.6.0" + "version": "==2.0.0" }, - "filelock": { + "colorama": { "hashes": [ - "sha256:b8d5ca5ca1c815e1574aee746650ea7301de63d87935b3463d26368b76e31633", - "sha256:d610c1bb404daf85976d7a82eb2ada120f04671007266b708606565dd03b5be6" + "sha256:05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d", + "sha256:f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48" ], - "version": "==3.0.10" + "markers": "sys_platform == 'win32'", + "version": "==0.4.1" }, - "identify": { + "filelock": { "hashes": [ - "sha256:244e7864ef59f0c7c50c6db73f58564151d91345cd9b76ed793458953578cadd", - "sha256:8ff062f90ad4b09cfe79b5dfb7a12e40f19d2e68a5c9598a49be45f16aba7171" + "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", + "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836" ], - "version": "==1.4.1" + "version": "==3.0.12" }, - "importlib-metadata": { + "identify": { "hashes": [ - "sha256:46fc60c34b6ed7547e2a723fc8de6dc2e3a1173f8423246b3ce497f064e9c3de", - "sha256:bc136180e961875af88b1ab85b4009f4f1278f8396a60526c0009f503a1a96ca" + "sha256:432c548d6138cb57a3d8f62f079a025a29b8ae34a50dd3b496bbf661818f2bc0", + "sha256:d4401d60bf1938aa3074a352a5cc9044107edf11a6fedd3a1db172c141619b81" ], - "version": "==0.9" + "version": "==1.4.3" }, - "importlib-resources": { + "importlib-metadata": { "hashes": [ - "sha256:6e2783b2538bd5a14678284a3962b0660c715e5a0f10243fd5e00a4b5974f50b", - "sha256:d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078" + "sha256:a9f185022cfa69e9ca5f7eabfd5a58b689894cb78a11e3c8c89398a8ccbb8e7f", + "sha256:df1403cd3aebeb2b1dcd3515ca062eecb5bd3ea7611f18cba81130c68707e879" ], - "markers": "python_version < '3.7'", - "version": "==1.0.2" + "version": "==0.17" }, "livereload": { "hashes": [ @@ -453,20 +420,12 @@ ], "version": "==1.3.3" }, - "pathlib2": { - "hashes": [ - "sha256:25199318e8cc3c25dcb45cbe084cc061051336d5a9ea2a12448d3d8cb748f742", - "sha256:5887121d7f7df3603bca2f710e7219f3eca0eb69e0b7cc6e0a022e155ac931a7" - ], - "markers": "python_version < '3.6'", - "version": "==2.3.3" - }, "pluggy": { "hashes": [ - "sha256:19ecf9ce9db2fce065a7a0586e07cfb4ac8614fe96edf628a264b1c70116cf8f", - "sha256:84d306a647cc805219916e62aab89caa97a33a1dd8c342e87a37f91073cd4746" + "sha256:0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc", + "sha256:b9817417e95936bf75d85d3f8767f7df6cdde751fc40aed3bb3074cbcb77757c" ], - "version": "==0.9.0" + "version": "==0.12.0" }, "pre-commit": { "hashes": [ @@ -501,19 +460,19 @@ }, "pyyaml": { "hashes": [ - "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", - "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95", - "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2", - "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4", - "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad", - "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba", - "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1", - "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e", - "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673", - "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13", - "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19" + "sha256:57acc1d8533cbe51f6662a55434f0dbecfa2b9eaf115bede8f6fd00115a0c0d3", + "sha256:588c94b3d16b76cfed8e0be54932e5729cc185caffaa5a451e7ad2f7ed8b4043", + "sha256:68c8dd247f29f9a0d09375c9c6b8fdc64b60810ebf07ba4cdd64ceee3a58c7b7", + "sha256:70d9818f1c9cd5c48bb87804f2efc8692f1023dac7f1a1a5c61d454043c1d265", + "sha256:86a93cccd50f8c125286e637328ff4eef108400dd7089b46a7be3445eecfa391", + "sha256:a0f329125a926876f647c9fa0ef32801587a12328b4a3c741270464e3e4fa778", + "sha256:a3c252ab0fa1bb0d5a3f6449a4826732f3eb6c0270925548cac342bc9b22c225", + "sha256:b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955", + "sha256:cd0618c5ba5bda5f4039b9398bb7fb6a317bb8298218c3de25c47c4740e4b95e", + "sha256:ceacb9e5f8474dcf45b940578591c7f3d960e82f926c707788a570b51ba59190", + "sha256:fe6a88094b64132c4bb3b631412e90032e8cfe9745a58370462240b8cb7553cd" ], - "version": "==5.1" + "version": "==5.1.1" }, "six": { "hashes": [ @@ -551,17 +510,17 @@ }, "virtualenv": { "hashes": [ - "sha256:15ee248d13e4001a691d9583948ad3947bcb8a289775102e4c4aa98a8b7a6d73", - "sha256:bfc98bb9b42a3029ee41b96dc00a34c2f254cbf7716bec824477b2c82741a5c4" + "sha256:99acaf1e35c7ccf9763db9ba2accbca2f4254d61d1912c5ee364f9cc4a8942a0", + "sha256:fe51cdbf04e5d8152af06c075404745a7419de27495a83f0d72518ad50be3ce8" ], - "version": "==16.5.0" + "version": "==16.6.0" }, "zipp": { "hashes": [ - "sha256:55ca87266c38af6658b84db8cfb7343cdb0bf275f93c7afaea0d8e7a209c7478", - "sha256:682b3e1c62b7026afe24eadf6be579fb45fec54c07ea218bded8092af07a68c4" + "sha256:8c1019c6aad13642199fbe458275ad6a84907634cc9f0989877ccc4a2840139d", + "sha256:ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3" ], - "version": "==0.3.3" + "version": "==0.5.1" } } } diff --git a/requirements-dev.txt b/requirements-dev.txt index 9dc56c2d..e3ff6dc7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,23 +1,24 @@ -i https://pypi.python.org/simple -aspy.yaml==1.1.2 +aspy.yaml==1.2.0 atomicwrites==1.3.0 -attrs==18.2.0 -cfgv==1.4.0 +attrs==19.1.0 +cfgv==1.6.0 +colorama==0.4.1 ; sys_platform == 'win32' filelock==3.0.10 -identify==1.2.2 -importlib-metadata==0.8 +identify==1.4.1 +importlib-metadata==0.9 livereload==2.6.0 -more-itertools==6.0.0 ; python_version > '2.7' +more-itertools==7.0.0 ; python_version > '2.7' nodeenv==1.3.3 -pluggy==0.8.1 +pluggy==0.9.0 pre-commit==1.14.4 -py==1.7.0 +py==1.8.0 pytest-django==3.4.7 pytest==4.3.0 -pyyaml==3.13 +pyyaml==5.1 six==1.12.0 toml==0.10.0 -tornado==5.1.1 +tornado==6.0.2 tox==3.7.0 -virtualenv==16.4.0 +virtualenv==16.5.0 zipp==0.3.3 diff --git a/requirements.txt b/requirements.txt index 9439fcd9..345b4d7d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,32 @@ -i https://pypi.python.org/simple +asn1crypto==0.24.0 +bcrypt==3.1.6 +certifi==2019.3.9 +cffi==1.12.3 +chardet==3.0.4 +cryptography==2.6.1 +defusedxml==0.6.0 ; python_version >= '3.0' django-markdownx==2.0.27 -django==2.1.7 +django==2.1.8 +fabric==2.4.0 gunicorn==19.9.0 -markdown==3.0.1 +idna==2.8 +invoke==1.2.0 +markdown==3.1 mysqlclient==1.3.14 +oauthlib==3.0.1 +paramiko==2.4.2 pillow==5.3.0 -pytz==2018.9 +pyasn1==0.4.5 +pycparser==2.19 +pyjwt==1.7.1 +pynacl==1.3.0 +python3-openid==3.1.0 ; python_version >= '3.0' +pytz==2019.1 +requests-oauthlib==1.2.0 +requests==2.21.0 +six==1.12.0 +social-auth-app-django==3.1.0 +social-auth-core==3.1.0 +urllib3==1.24.2 whitenoise==4.1.1