From 1aeb95396b3ebdfef03518144b27beac81fb09ca Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Wed, 25 May 2022 08:48:23 -0700 Subject: [PATCH] Updates scikit-learn and fixes the warning this normally generates in the unit tests --- Pipfile | 3 +- Pipfile.lock | 266 ++++++++++++------------- requirements.txt | 56 +++--- src/documents/tests/test_classifier.py | 5 + 4 files changed, 161 insertions(+), 169 deletions(-) diff --git a/Pipfile b/Pipfile index 87198e721..1eaa165d0 100644 --- a/Pipfile +++ b/Pipfile @@ -30,8 +30,7 @@ python-dateutil = "*" python-magic = "*" psycopg2 = "*" redis = "*" -# Pinned because aarch64 wheels and updates cause warnings when loading the classifier model. -scikit-learn="==1.1.1" +scikit-learn="~=1.1" whitenoise = "~=6.2.0" watchdog = "~=2.1.9" whoosh="~=2.7.4" diff --git a/Pipfile.lock b/Pipfile.lock index b88df2601..fee2d7e2e 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "d1db425cae617d0bd34afa7e759ba79b4440cb731ad7a744d89ec0dde2a01daf" + "sha256": "534811f5ee688864c2abc3bd671e4350493c3d8ab98a26ed7cef53b092389727" }, "pipfile-spec": 6, "requires": {}, @@ -189,11 +189,11 @@ }, "channels": { "hashes": [ - "sha256:0ff0422b4224d10efac76e451575517f155fe7c97d369b5973b116f22eeaf86c", - "sha256:fdd9a94987a23d8d7ebd97498ed8b8cc83163f37e53fc6c85098aba7a3bb8b75" + "sha256:3813b8025bf85509769793aca720e6c3b1c5bde1cb253a961252bf0242b60a26", + "sha256:a3dc3339cc033e7c2afe083fb3dedf74fc5009815967e317e080e7bfdc92ea26" ], "index": "pypi", - "version": "==3.0.4" + "version": "==3.0.5" }, "channels-redis": { "hashes": [ @@ -294,13 +294,20 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.2.13" }, + "deprecation": { + "hashes": [ + "sha256:72b3bde64e5d778694b0cf68178aed03d15e15477116add3fb773e581f9518ff", + "sha256:a10811591210e1fb0e768a8c25517cabeabcba6f0bf96564f8ff45189f90b14a" + ], + "version": "==2.1.0" + }, "django": { "hashes": [ - "sha256:502ae42b6ab1b612c933fb50d5ff850facf858a4c212f76946ecd8ea5b3bf2d9", - "sha256:f7431a5de7277966f3785557c3928433347d998c1e6459324501378a291e5aab" + "sha256:a67a793ff6827fd373555537dca0da293a63a316fe34cb7f367f898ccca3c3ae", + "sha256:ca54ebedfcbc60d191391efbf02ba68fb52165b8bf6ccd6fe71f098cac1fe59e" ], "index": "pypi", - "version": "==4.0.5" + "version": "==4.0.6" }, "django-cors-headers": { "hashes": [ @@ -493,11 +500,11 @@ }, "imap-tools": { "hashes": [ - "sha256:81e0069d81483aecc3ca46e57f5c41ffc39f1ba0041e416591d829f99f682623", - "sha256:d32f3e165af9e56542c1a5beb2866537265ef4832c8bd2eb25982ee8ac70ea4f" + "sha256:4fe4c07c4cc4aab83492d126e221c39118ff530268149b721296fc0fb87de3c2", + "sha256:56942853be2125d509365b84eacf0f3a87ae58ea8f82bca7a6943634a60cfb60" ], "index": "pypi", - "version": "==0.55.0" + "version": "==0.56.0" }, "img2pdf": { "hashes": [ @@ -507,11 +514,11 @@ }, "importlib-resources": { "hashes": [ - "sha256:b6062987dfc51f0fcb809187cffbd60f35df7acb4589091f154214af6d0d49d3", - "sha256:e447dc01619b1e951286f3929be820029d48c75eb25d265c28b92a16548212b8" + "sha256:568c9f16cb204f9decc8d6d24a572eeea27dacbb4cee9e6b03a8025736769751", + "sha256:7952325ffd516c05a8ad0858c74dff2c3343f136fe66a6002b2623dd1d43f223" ], "markers": "python_version < '3.9'", - "version": "==5.7.1" + "version": "==5.8.0" }, "incremental": { "hashes": [ @@ -524,7 +531,7 @@ "hashes": [ "sha256:8440ffe49c4ae81a8df57c1ae1eb4b6bfa7acb830099bfb3e305b383005cc128" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1'", "version": "==1.3.5" }, "inotifyrecursive": { @@ -715,11 +722,11 @@ }, "ocrmypdf": { "hashes": [ - "sha256:7bf9a20bcc8d0c01712d8413a0a7275c32a95accc2de75e7bc6f6e69af468e3f", - "sha256:8a0a2fa07cf0aac4dea11990d27a15b552afa7ff2dfffdb322bfd8bd0b77751d" + "sha256:4c3d9ead76d2cbf248fa764bf6950acacc5586a153895e136332d3df0af4f4f5", + "sha256:ed2ad72ef796770c38edf5eb43392c6d166eb8959ad14a19ea0350c510b9c121" ], "index": "pypi", - "version": "==13.4.7" + "version": "==13.6.0" }, "packaging": { "hashes": [ @@ -755,37 +762,41 @@ }, "pikepdf": { "hashes": [ - "sha256:00e66dcb803cc4f5348ae117287b85bd940744be38c111a88503843b0787ddfe", - "sha256:0e392c32e1f82f8cb4e891cadaf137c8cbdb1e88b4714eeb3dcd2cc6ee227575", - "sha256:143eef60457c828874000e11a34bc79c348544c7453f89e09ad9697b7102a108", - "sha256:18907145f6d2772fc77b1ea8d4eb3971dbd8e2594698764a64c22c1c43645eee", - "sha256:210cea8dc30bc9e668de1a380c83a31ec1b0edf8a2f91334ac99b23ec74b01e1", - "sha256:270b4805e00f4599108231c4342701574de47b1c7df3573c2d80aed176dd6843", - "sha256:35e0a82fd01e3fd57de473b65a56231e99cf17aaa632de0bafc02df5d25fd443", - "sha256:397dc297ec4390a67f920466b868cfd100b9be6bc12ab4134f455226c3d1ddef", - "sha256:44c909f2e16fe4646a3175273fad60e102750383c448a01ca8073b05cc086ffa", - "sha256:4f4dcc07d9222faa976b9ea6e21a30f6669cd8152cd2fa5e7a898d325da059c2", - "sha256:524785518325fac3cda133b339ff4cd56687cefc4a43b14aef102f06fabc0ffa", - "sha256:7a2aaaa6968b7268c97dc6beffc5be5148470f9675fcb940681a30ca68f00f6d", - "sha256:84915fcff1c28bfba4caa9df0a72a53264e1218b17f0870744aad43a477a13c0", - "sha256:85965ff4f42542998db1daa641f33b9b7a6a03a0e7531a76c06a185d8bf6653b", - "sha256:85ce51ac8354c1d6912edcb3b018e39fc9678cf1946087ef526d990eedf49756", - "sha256:8ce07b03affe29628f7babf25a54010f765f89d887a02e12393f365a8dc37d65", - "sha256:a074af7054206d91a70513269254b932e7ad244fed6cfb37c590cf7b665dcd53", - "sha256:aadb3e93b10299c8d3a6c5366e507ccdded727fc22e5b7ebae61bcd6883774dc", - "sha256:afcd1d4a1c4b9c99226b6ce1ceb5132fa219b420e562984564a431bed7160949", - "sha256:b43c57f37cd6278dcb52d3bda7f482b1961c2eb8a5fc1127cabe941914a858a9", - "sha256:c34e4239661d2ddf23caa1c4256f636c866ce8069a5052a2bf8ee06e3cae22f3", - "sha256:d3015baf32d9a559c50aa5ff15ac7bf5d2733efa4d1996eb846fb289e3f5a0e4", - "sha256:d37aee5705ee23f28513f480749773495f88d72a9177de6c5af32b20a2ad1592", - "sha256:e1b7edde3d3599a23a283341f15a41943a5894308df623cf6e04ff58304bd4b3", - "sha256:e552419963bdc4adab4f5a912994de96ba2dfc313ce935d8b727a9e40d6ccd67", - "sha256:e5941c4c6e61895114cf0caff871e7b17ce9145822c5068b6c6f16114dd1267b", - "sha256:f808eadb454adc6f4fb72b651eaa41a2926812e2b0306e2c320e5e3181440e49", - "sha256:ffa2b7d68fe45202895e74ba660619172e8528950905bee0ec862529760c4246" + "sha256:08d1d2f6a5ff20c731d26ad36e3b953cac20aa280176cec9104c47d02d6093c9", + "sha256:27044a4edf090322acbeb0ad6c81a1c9b176904b716763ac1e5d2c5ee6dcb2a9", + "sha256:2ca8ed3c30ec9b9f6b182e8c23c4ebed79f163c93f71d00d30ea17e8c11c92b8", + "sha256:2d975e6223d2031f7d1e7ae62e0d5bc1580ac46369e999f75d1b42c7031f5182", + "sha256:344aeca249e27cda8dd3e54dea020e4ded832e78b5857bd7733e36832dd1345f", + "sha256:3b02c79c0e8ae272dd7a3a2990399ef1e13d792d04410b2dd829cb330565b2cc", + "sha256:416c3e970246ac92bb16e0195765a4e9bac6e75c7f7503aeb03512ea32295e89", + "sha256:4a12f13980930ced290d031d609dfd8864f8c35e50b337f3fd24948b2ad2df3a", + "sha256:4df138dfa12e1cc794ffc175c7d730d955f83a621bbddd11ac350751fc4a87aa", + "sha256:51ee68402ae3eff583b073daf53eb76430d492b5b92330967c85c27fd52b0e4b", + "sha256:55f5a0d1f4c1426d9a7de83545d862671e87529350aa2a80207210f1734c1af6", + "sha256:5777e2cada6e56e31d1687ba8c5f6997dfb82a426cc6f27fad3230d2fd31d286", + "sha256:5a9f7af80a79a6215f6fd2f51ea386115a1998970085c2954c18e0dee3eb8bbd", + "sha256:5be148fb87f6e6e65417ac1dca2b83e362eea857cc977fbe0f47f2fa663153fd", + "sha256:5ceb12918b5226c187b6312250316993eb3618fdc664bf741d00139db57c2039", + "sha256:5d010a52e918171dfafe9e30298e1454d25256a91a64a19ba243d2975a6eb81b", + "sha256:6febf90b44c02f1bb23617644bcac95a21c580b0592503bf1b23e0b6aac7a65a", + "sha256:768696cafe007136706e520531bb74601f85170b658ed2429b6ef3e616c6cccc", + "sha256:8246b582884e23a13ebe61cbac41628c68146c0a4dc4d1bc79e4cf590cc5a5f8", + "sha256:84853450b07a8c9b659fb597ac937809e17220e3b557a07c6483ce306adbb3a9", + "sha256:a23b595a81a4c983ccf24cf6c42649923165f7fe0f4255f5b08a2707e7ca6755", + "sha256:a75689358523b7d00a38ef5ea065b256e600e8aaae781f56041a3076de248130", + "sha256:acfcf9f7f57ccb9e9d70d8099a10d1a2e5733bde12af1a9721c68e14321ebc2e", + "sha256:b8a506cb0aa91b5e92142e5f991536d2ae96724efdb8e2fc94d44b4577bb19c2", + "sha256:bac3a36d93a3cb6ccdba6774c15d5cf78627b761d3c8cd558513488c28991686", + "sha256:c5fbb2c162e5653ec47e4789d71bbfd97fce5be115e562a4840c6dcbb601009a", + "sha256:cdb2cf3edda391218e8ca3595fece81ed2d5b6cc73d7014cc774715f39feaabd", + "sha256:dcb90cd2220d337063a3b589514e78d24c8e7b87e54149ad98895ba76448fffd", + "sha256:e7f39b6322f31e3942a1d5dcadabf03732812b8fb34924afc334ab8f3e5c8148", + "sha256:eb7054d7813ad7095b7a6dbeb24dba4eadf617180c8124fd5198232718d02dc7", + "sha256:f23530f9412098755b40a7fb5aeced5de8a7793a7d7b58521b881c9d9e9583a8", + "sha256:f8c513ac480c9929561447b3a02f9d36b81cd9c8e249f1c9e7a1ef25d300f67b" ], "index": "pypi", - "version": "==5.1.3" + "version": "==5.3.0" }, "pillow": { "hashes": [ @@ -1044,11 +1055,11 @@ }, "redis": { "hashes": [ - "sha256:2f7a57cf4af15cd543c4394bcbe2b9148db2606a37edba755368836e3a1d053e", - "sha256:f57f8df5d238a8ecf92f499b6b21467bfee6c13d89953c27edf1e2bc673622e7" + "sha256:a52d5694c9eb4292770084fa8c863f79367ca19884b329ab574d5cb2036b3e54", + "sha256:ddf27071df4adf3821c4f2ca59d67525c3a82e5f268bed97b813cb4fabf87880" ], "index": "pypi", - "version": "==4.3.3" + "version": "==4.3.4" }, "regex": { "hashes": [ @@ -1242,18 +1253,18 @@ }, "setuptools": { "hashes": [ - "sha256:990a4f7861b31532871ab72331e755b5f14efbe52d336ea7f6118144dd478741", - "sha256:c1848f654aea2e3526d17fc3ce6aeaa5e7e24e66e645b5be2171f3f6b4e5a178" + "sha256:16923d366ced322712c71ccb97164d07472abeecd13f3a6c283f6d5d26722793", + "sha256:db3b8e2f922b2a910a29804776c643ea609badb6a32c4bcc226fd4fd902cce65" ], "markers": "python_version >= '3.7'", - "version": "==62.6.0" + "version": "==63.1.0" }, "six": { "hashes": [ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==1.16.0" }, "sniffio": { @@ -1351,11 +1362,11 @@ "standard" ], "hashes": [ - "sha256:19e2a0e96c9ac5581c01eb1a79a7d2f72bb479691acd2b8921fce48ed5b961a6", - "sha256:5180f9d059611747d841a4a4c4ab675edf54c8489e97f96d0583ee90ac3bfc23" + "sha256:c19a057deb1c5bb060946e2e5c262fc01590c6529c0af2c3d9ce941e89bc30e0", + "sha256:cade07c403c397f9fe275492a48c1b869efd175d5d8a692df649e6e7e2ed8f4e" ], "index": "pypi", - "version": "==0.17.6" + "version": "==0.18.2" }, "uvloop": { "hashes": [ @@ -1409,12 +1420,22 @@ "index": "pypi", "version": "==2.1.9" }, - "watchgod": { + "watchfiles": { "hashes": [ - "sha256:2f3e8137d98f493ff58af54ea00f4d1433a6afe2ed08ab331a657df468c6bfce", - "sha256:cb11ff66657befba94d828e3b622d5fb76f22fbda1376f355f3e6e51e97d9450" + "sha256:56abed43e645d1f2d6def83e35999cc5758b051aff54ca1065cbfcaea15b3389", + "sha256:65ca99a94fcab29d00aa406526eb29cf198c0661854d59a315596064fed02141", + "sha256:67d4c66e46a564059df4aeedab78f09cba0b697bf36cc77566b0a7015dfb7f5d", + "sha256:6e0e8829d32b05151e6009570449f44f891e05f518e495d25f960e0d0b2d0064", + "sha256:715733c2ac9da67b2790788657ff6f8b3797eb31565bfc592289b523ae907ca2", + "sha256:7b81c6e404b2aa62482a719eb778e4a16d01728302dce1f1512c1e5354a73fda", + "sha256:82238d08d8a49f1a1ba254278cd4329a154f6100b028393059722ebeddd2ff3d", + "sha256:955e8f840e1996a8a41be57de4c03af7b1515a685b7fb6abe222f859e413a907", + "sha256:cab62510f990d195986302aa6a48ed636d685b099927049120d520c96069fa49", + "sha256:d1f9de6b776b3aff17898a4cf5ac5a2d0a16212ea7aad2bbe0ef6aa3e79a96af", + "sha256:d4f45acd1143db6d3ee77a4ff12d3239bc8083108133e6174e9dcce59c1f9902", + "sha256:f7f71012e096e11256fae3b37617a9777980f281e18deb2e789e85cd5b113935" ], - "version": "==0.8.2" + "version": "==0.15.0" }, "wcwidth": { "hashes": [ @@ -1655,32 +1676,32 @@ }, "black": { "hashes": [ - "sha256:06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b", - "sha256:10dbe6e6d2988049b4655b2b739f98785a884d4d6b85bc35133a8fb9a2233176", - "sha256:2497f9c2386572e28921fa8bec7be3e51de6801f7459dffd6e62492531c47e09", - "sha256:30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a", - "sha256:328efc0cc70ccb23429d6be184a15ce613f676bdfc85e5fe8ea2a9354b4e9015", - "sha256:35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79", - "sha256:5795a0375eb87bfe902e80e0c8cfaedf8af4d49694d69161e5bd3206c18618bb", - "sha256:5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20", - "sha256:637a4014c63fbf42a692d22b55d8ad6968a946b4a6ebc385c5505d9625b6a464", - "sha256:67c8301ec94e3bcc8906740fe071391bce40a862b7be0b86fb5382beefecd968", - "sha256:6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82", - "sha256:6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21", - "sha256:863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0", - "sha256:9b542ced1ec0ceeff5b37d69838106a6348e60db7b8fdd245294dc1d26136265", - "sha256:a6342964b43a99dbc72f72812bf88cad8f0217ae9acb47c0d4f141a6416d2d7b", - "sha256:ad4efa5fad66b903b4a5f96d91461d90b9507a812b3c5de657d544215bb7877a", - "sha256:bc58025940a896d7e5356952228b68f793cf5fcb342be703c3a2669a1488cb72", - "sha256:cc1e1de68c8e5444e8f94c3670bb48a2beef0e91dddfd4fcc29595ebd90bb9ce", - "sha256:cee3e11161dde1b2a33a904b850b0899e0424cc331b7295f2a9698e79f9a69a0", - "sha256:e3556168e2e5c49629f7b0f377070240bd5511e45e25a4497bb0073d9dda776a", - "sha256:e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163", - "sha256:ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad", - "sha256:fd57160949179ec517d32ac2ac898b5f20d68ed1a9c977346efbac9c2f1e779d" + "sha256:074458dc2f6e0d3dab7928d4417bb6957bb834434516f21514138437accdbe90", + "sha256:187d96c5e713f441a5829e77120c269b6514418f4513a390b0499b0987f2ff1c", + "sha256:2ea29072e954a4d55a2ff58971b83365eba5d3d357352a07a7a4df0d95f51c78", + "sha256:4af5bc0e1f96be5ae9bd7aaec219c901a94d6caa2484c21983d043371c733fc4", + "sha256:560558527e52ce8afba936fcce93a7411ab40c7d5fe8c2463e279e843c0328ee", + "sha256:568ac3c465b1c8b34b61cd7a4e349e93f91abf0f9371eda1cf87194663ab684e", + "sha256:6797f58943fceb1c461fb572edbe828d811e719c24e03375fd25170ada53825e", + "sha256:6c1734ab264b8f7929cef8ae5f900b85d579e6cbfde09d7387da8f04771b51c6", + "sha256:6c6d39e28aed379aec40da1c65434c77d75e65bb59a1e1c283de545fb4e7c6c9", + "sha256:7ba9be198ecca5031cd78745780d65a3f75a34b2ff9be5837045dce55db83d1c", + "sha256:94783f636bca89f11eb5d50437e8e17fbc6a929a628d82304c80fa9cd945f256", + "sha256:a218d7e5856f91d20f04e931b6f16d15356db1c846ee55f01bac297a705ca24f", + "sha256:a3db5b6409b96d9bd543323b23ef32a1a2b06416d525d27e0f67e74f1446c8f2", + "sha256:ac609cf8ef5e7115ddd07d85d988d074ed00e10fbc3445aee393e70164a2219c", + "sha256:b154e6bbde1e79ea3260c4b40c0b7b3109ffcdf7bc4ebf8859169a6af72cd70b", + "sha256:b270a168d69edb8b7ed32c193ef10fd27844e5c60852039599f9184460ce0807", + "sha256:b9fd45787ba8aa3f5e0a0a98920c1012c884622c6c920dbe98dbd05bc7c70fbf", + "sha256:c85928b9d5f83b23cee7d0efcb310172412fbf7cb9d9ce963bd67fd141781def", + "sha256:c9a3ac16efe9ec7d7381ddebcc022119794872abce99475345c5a61aa18c45ad", + "sha256:cfaf3895a9634e882bf9d2363fed5af8888802d670f58b279b0bece00e9a872d", + "sha256:e439798f819d49ba1c0bd9664427a05aab79bfba777a6db94fd4e56fae0cb849", + "sha256:f586c26118bc6e714ec58c09df0157fe2d9ee195c764f630eb0d8e7ccce72e69", + "sha256:f6fe02afde060bbeef044af7996f335fbe90b039ccf3f5eb8f16df8b20f77666" ], "index": "pypi", - "version": "==22.3.0" + "version": "==22.6.0" }, "certifi": { "hashes": [ @@ -1723,9 +1744,6 @@ "version": "==0.4.5" }, "coverage": { - "extras": [ - - ], "hashes": [ "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749", "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982", @@ -2159,18 +2177,18 @@ }, "setuptools": { "hashes": [ - "sha256:990a4f7861b31532871ab72331e755b5f14efbe52d336ea7f6118144dd478741", - "sha256:c1848f654aea2e3526d17fc3ce6aeaa5e7e24e66e645b5be2171f3f6b4e5a178" + "sha256:16923d366ced322712c71ccb97164d07472abeecd13f3a6c283f6d5d26722793", + "sha256:db3b8e2f922b2a910a29804776c643ea609badb6a32c4bcc226fd4fd902cce65" ], "markers": "python_version >= '3.7'", - "version": "==62.6.0" + "version": "==63.1.0" }, "six": { "hashes": [ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==1.16.0" }, "snowballstemmer": { @@ -2263,7 +2281,7 @@ "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'", "version": "==0.10.2" }, "tomli": { @@ -2271,63 +2289,33 @@ "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" ], - "markers": "python_version >= '3.7'", + "markers": "python_full_version < '3.11.0a7'", "version": "==2.0.1" }, "tornado": { "hashes": [ - "sha256:0a00ff4561e2929a2c37ce706cb8233b7907e0cdc22eab98888aca5dd3775feb", - "sha256:0d321a39c36e5f2c4ff12b4ed58d41390460f798422c4504e09eb5678e09998c", - "sha256:1e8225a1070cd8eec59a996c43229fe8f95689cb16e552d130b9793cb570a288", - "sha256:20241b3cb4f425e971cb0a8e4ffc9b0a861530ae3c52f2b0434e6c1b57e9fd95", - "sha256:25ad220258349a12ae87ede08a7b04aca51237721f63b1808d39bdb4b2164558", - "sha256:33892118b165401f291070100d6d09359ca74addda679b60390b09f8ef325ffe", - "sha256:33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791", - "sha256:3447475585bae2e77ecb832fc0300c3695516a47d46cefa0528181a34c5b9d3d", - "sha256:34ca2dac9e4d7afb0bed4677512e36a52f09caa6fded70b4e3e1c89dbd92c326", - "sha256:3e63498f680547ed24d2c71e6497f24bca791aca2fe116dbc2bd0ac7f191691b", - "sha256:548430be2740e327b3fe0201abe471f314741efcb0067ec4f2d7dcfb4825f3e4", - "sha256:6196a5c39286cc37c024cd78834fb9345e464525d8991c21e908cc046d1cc02c", - "sha256:61b32d06ae8a036a6607805e6720ef00a3c98207038444ba7fd3d169cd998910", - "sha256:6286efab1ed6e74b7028327365cf7346b1d777d63ab30e21a0f4d5b275fc17d5", - "sha256:65d98939f1a2e74b58839f8c4dab3b6b3c1ce84972ae712be02845e65391ac7c", - "sha256:66324e4e1beede9ac79e60f88de548da58b1f8ab4b2f1354d8375774f997e6c0", - "sha256:6c77c9937962577a6a76917845d06af6ab9197702a42e1346d8ae2e76b5e3675", - "sha256:70dec29e8ac485dbf57481baee40781c63e381bebea080991893cd297742b8fd", - "sha256:7250a3fa399f08ec9cb3f7b1b987955d17e044f1ade821b32e5f435130250d7f", - "sha256:748290bf9112b581c525e6e6d3820621ff020ed95af6f17fedef416b27ed564c", - "sha256:7da13da6f985aab7f6f28debab00c67ff9cbacd588e8477034c0652ac141feea", - "sha256:8f959b26f2634a091bb42241c3ed8d3cedb506e7c27b8dd5c7b9f745318ddbb6", - "sha256:9de9e5188a782be6b1ce866e8a51bc76a0fbaa0e16613823fc38e4fc2556ad05", - "sha256:a48900ecea1cbb71b8c71c620dee15b62f85f7c14189bdeee54966fbd9a0c5bd", - "sha256:b87936fd2c317b6ee08a5741ea06b9d11a6074ef4cc42e031bc6403f82a32575", - "sha256:c77da1263aa361938476f04c4b6c8916001b90b2c2fdd92d8d535e1af48fba5a", - "sha256:cb5ec8eead331e3bb4ce8066cf06d2dfef1bfb1b2a73082dfe8a161301b76e37", - "sha256:cc0ee35043162abbf717b7df924597ade8e5395e7b66d18270116f8745ceb795", - "sha256:d14d30e7f46a0476efb0deb5b61343b1526f73ebb5ed84f23dc794bdb88f9d9f", - "sha256:d371e811d6b156d82aa5f9a4e08b58debf97c302a35714f6f45e35139c332e32", - "sha256:d3d20ea5782ba63ed13bc2b8c291a053c8d807a8fa927d941bd718468f7b950c", - "sha256:d3f7594930c423fd9f5d1a76bee85a2c36fd8b4b16921cae7e965f22575e9c01", - "sha256:dcef026f608f678c118779cd6591c8af6e9b4155c44e0d1bc0c87c036fb8c8c4", - "sha256:e0791ac58d91ac58f694d8d2957884df8e4e2f6687cdf367ef7eb7497f79eaa2", - "sha256:e385b637ac3acaae8022e7e47dfa7b83d3620e432e3ecb9a3f7f58f150e50921", - "sha256:e519d64089b0876c7b467274468709dadf11e41d65f63bba207e04217f47c085", - "sha256:e7229e60ac41a1202444497ddde70a48d33909e484f96eb0da9baf8dc68541df", - "sha256:ed3ad863b1b40cd1d4bd21e7498329ccaece75db5a5bf58cd3c9f130843e7102", - "sha256:f0ba29bafd8e7e22920567ce0d232c26d4d47c8b5cf4ed7b562b5db39fa199c5", - "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68", - "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5" + "sha256:1d54d13ab8414ed44de07efecb97d4ef7c39f7438cf5e976ccd356bebb1b5fca", + "sha256:20f638fd8cc85f3cbae3c732326e96addff0a15e22d80f049e00121651e82e72", + "sha256:5c87076709343557ef8032934ce5f637dbb552efa7b21d08e89ae7619ed0eb23", + "sha256:5f8c52d219d4995388119af7ccaa0bcec289535747620116a58d830e7c25d8a8", + "sha256:6fdfabffd8dfcb6cf887428849d30cf19a3ea34c2c248461e1f7d718ad30b66b", + "sha256:87dcafae3e884462f90c90ecc200defe5e580a7fbbb4365eda7c7c1eb809ebc9", + "sha256:9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13", + "sha256:b8150f721c101abdef99073bf66d3903e292d851bee51910839831caba341a75", + "sha256:ba09ef14ca9893954244fd872798b4ccb2367c165946ce2dd7376aebdde8e3ac", + "sha256:d3a2f5999215a3a06a4fc218026cd84c61b8b2b40ac5296a6db1f1451ef04c1e", + "sha256:e5f923aa6a47e133d1cf87d60700889d7eae68988704e20c75fb2d65677a8e4b" ], - "markers": "python_version >= '3.5'", - "version": "==6.1" + "markers": "python_version >= '3.7'", + "version": "==6.2" }, "tox": { "hashes": [ - "sha256:0805727eb4d6b049de304977dfc9ce315a1938e6619c3ab9f38682bb04662a5a", - "sha256:37888f3092aa4e9f835fc8cc6dadbaaa0782651c41ef359e3a5743fcb0308160" + "sha256:c138327815f53bc6da4fe56baec5f25f00622ae69ef3fe4e1e385720e22486f9", + "sha256:c38e15f4733683a9cc0129fba078633e07eb0961f550a010ada879e95fb32632" ], "index": "pypi", - "version": "==3.25.0" + "version": "==3.25.1" }, "typing-extensions": { "hashes": [ diff --git a/requirements.txt b/requirements.txt index d74534365..b897abaaf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ -i https://pypi.python.org/simple --extra-index-url https://www.piwheels.org/simple --e git+https://github.com/paperless-ngx/django-q.git@71abc78fdaec029cf71e9849a3b0fa084a1678f7#egg=django-q +-e git+https://github.com/paperless-ngx/django-q.git@bf20d57f859a7d872d5979cd8879fac9c9df981c#egg=django-q aioredis==1.3.1 anyio==3.6.1; python_full_version >= '3.6.2' arrow==1.2.2; python_version >= '3.6' @@ -18,11 +18,11 @@ autobahn==22.5.1; python_version >= '3.7' automat==20.2.0 backports.zoneinfo==0.2.1; python_version < '3.9' blessed==1.19.1; python_version >= '2.7' -certifi==2022.5.18.1; python_version >= '3.6' -cffi==1.15.0 +certifi==2022.6.15; python_version >= '3.6' +cffi==1.15.1 channels-redis==3.4.0 -channels==3.0.4 -charset-normalizer==2.0.12; python_version >= '3.5' +channels==3.0.5 +charset-normalizer==2.1.0; python_version >= '3.6' click==8.1.3; python_version >= '3.7' coloredlogs==15.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' concurrent-log-handler==0.9.20 @@ -31,11 +31,12 @@ cryptography==37.0.2; python_version >= '3.6' daphne==3.0.2; python_version >= '3.6' dateparser==1.1.1 deprecated==1.2.13; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +deprecation==2.1.0 django-cors-headers==3.13.0 django-extensions==3.1.5 -django-filter==21.1 -django-picklefield==3.0.1; python_version >= '3' -django==4.0.5 +django-filter==22.1 +django-picklefield==3.1; python_version >= '3' +django==4.0.6 djangorestframework==3.13.1 filelock==3.7.1 fuzzywuzzy[speedup]==0.18.0 @@ -45,25 +46,25 @@ hiredis==2.0.0; python_version >= '3.6' httptools==0.4.0 humanfriendly==10.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' hyperlink==21.0.0 -idna==3.3; python_version >= '3' -imap-tools==0.55.0 +idna==3.3; python_version >= '3.5' +imap-tools==0.56.0 img2pdf==0.4.4 -importlib-resources==5.7.1; python_version < '3.9' +importlib-resources==5.8.0; python_version < '3.9' incremental==21.3.0 -inotify-simple==1.3.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +inotify-simple==1.3.5; python_version >= '2.7' and python_version not in '3.0, 3.1' inotifyrecursive==0.3.5 joblib==1.1.0; python_version >= '3.6' langdetect==1.0.9 -lxml==4.9.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +lxml==4.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' msgpack==1.0.4 -numpy==1.22.4; python_version >= '3.8' -ocrmypdf==13.4.7 +numpy==1.23.0; python_version >= '3.8' +ocrmypdf==13.6.0 packaging==21.3; python_version >= '3.6' pathvalidate==2.5.0 pdf2image==1.16.0 pdfminer.six==20220524 -pikepdf==5.1.3 -pillow==9.1.1 +pikepdf==5.3.0 +pillow==9.2.0 pluggy==1.0.0; python_version >= '3.6' portalocker==2.4.0; python_version >= '3' psycopg2==2.9.3 @@ -81,16 +82,15 @@ pytz-deprecation-shim==0.1.0.post0; python_version >= '2.7' and python_version n pytz==2022.1 pyyaml==6.0 pyzbar==0.1.9 -redis==4.3.3 +redis==4.3.4 regex==2022.3.2; python_version >= '3.6' -# Manual downgrade until piwheel is working with this package again -reportlab==3.6.9; python_version >= '3.7' and python_version < '4' -requests==2.27.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' -scikit-learn==1.0.2 +reportlab==3.6.10; python_version >= '3.7' and python_version < '4' +requests==2.28.1; python_version >= '3.7' and python_version < '4' +scikit-learn==1.1.1 scipy==1.8.1; python_version < '3.11' and python_version >= '3.8' service-identity==21.1.0 -setuptools==62.6.0; python_version >= '3.7' -six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +setuptools==63.1.0; python_version >= '3.7' +six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2' sniffio==1.2.0; python_version >= '3.5' sqlparse==0.4.2; python_version >= '3.5' threadpoolctl==3.1.0; python_version >= '3.6' @@ -98,14 +98,14 @@ tika==1.24 tqdm==4.64.0 twisted[tls]==22.4.0; python_full_version >= '3.6.7' txaio==22.2.1; python_version >= '3.6' -typing-extensions==4.2.0; python_version >= '3.7' +typing-extensions==4.3.0; python_version >= '3.7' tzdata==2022.1; python_version >= '3.6' tzlocal==4.2; python_version >= '3.6' urllib3==1.26.9; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4' -uvicorn[standard]==0.17.6 +uvicorn[standard]==0.18.2 uvloop==0.16.0 -watchdog==2.1.8 -watchgod==0.8.2 +watchdog==2.1.9 +watchfiles==0.15.0 wcwidth==0.2.5 websockets==10.3 whitenoise==6.2.0 diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.py index 052c27849..dcc503f97 100644 --- a/src/documents/tests/test_classifier.py +++ b/src/documents/tests/test_classifier.py @@ -204,7 +204,12 @@ class TestClassifier(DirectoriesMixin, TestCase): MODEL_FILE=os.path.join(os.path.dirname(__file__), "data", "model.pickle"), ) def test_load_and_classify(self): + # Generate test data, train and save to the model file + # This ensures the model file sklearn version matches + # and eliminates a warning self.generate_test_data() + self.classifier.train() + self.classifier.save() new_classifier = DocumentClassifier() new_classifier.load()