From 2947e3a7e8cce38c5700eb0befe59349f8036df2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 07:44:43 +0000 Subject: [PATCH 01/19] Bump pipenv from 2020.11.15 to 2021.5.29 --- requirements-install.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-install.txt b/requirements-install.txt index b15694c7..fdc795dd 100644 --- a/requirements-install.txt +++ b/requirements-install.txt @@ -1 +1 @@ -pipenv==2020.11.15 +pipenv==2021.5.29 From c392be99b9af2f73ad94c073238f972fdaee29ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Jun 2021 05:41:17 +0000 Subject: [PATCH 02/19] Bump urllib3 from 1.26.4 to 1.26.5 --- Pipfile.lock | 99 ++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 57 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index be04b96d..eec32c70 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f1d6e682f99e8d5bdc661cf9cbbc2cc200122628b883ea87a97e6ef2683d31d8" + "sha256": "5a27685e4be60cb3ffc373426df459e85decc6e3225a6cc59afe4bfca5b7aa61" }, "pipfile-spec": 6, "requires": { @@ -21,22 +21,20 @@ "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1", "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==21.2.0" }, "certifi": { "hashes": [ - "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c", - "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830" + "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee", + "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8" ], - "version": "==2020.12.5" + "version": "==2021.5.30" }, "chardet": { "hashes": [ "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==4.0.0" }, "cycler": { @@ -66,7 +64,6 @@ "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.10" }, "imageio": { @@ -84,7 +81,9 @@ "version": "==3.2.0" }, "jsonschema-gentypes": { - "hashes": ["sha256:a76b2a011157474f341e4eb391ae9801ef251ef2b9b2bb68002007cb7607db16"], + "hashes": [ + "sha256:a76b2a011157474f341e4eb391ae9801ef251ef2b9b2bb68002007cb7607db16" + ], "index": "pypi", "version": "==0.9.0" }, @@ -123,7 +122,6 @@ "sha256:f8d6f8db88049a699817fd9178782867bf22283e3813064302ac59f61d95be05", "sha256:fd34fbbfbc40628200730bc1febe30631347103fc8d3d4fa012c21ab9c11eca9" ], - "markers": "python_version >= '3.6'", "version": "==1.3.1" }, "matplotlib": { @@ -148,7 +146,6 @@ "sha256:d8d994cefdff9aaba45166eb3de4f5211adb4accac85cbf97137e98f26ea0219", "sha256:df815378a754a7edd4559f8c51fc7064f779a74013644a7f5ac7a0c31f875866" ], - "markers": "python_version >= '3.7'", "version": "==3.4.2" }, "networkx": { @@ -156,7 +153,6 @@ "sha256:0635858ed7e989f4c574c2328380b452df892ae85084144c73d8cd819f0c4e06", "sha256:109cd585cac41297f71103c3c42ac6ef7379f29788eb54cb751be5a663bb235a" ], - "markers": "python_version >= '3.6'", "version": "==2.5.1" }, "numpy": { @@ -231,6 +227,7 @@ "sha256:63728564c1410d99e6d1ae8e3b810fe012bc440952168af0a2877e8ff5ab96b9", "sha256:66cc56579fd91f517290ab02c51e3a80f581aba45fd924fcdee01fa06e635812", "sha256:6c32cc3145928c4305d142ebec682419a6c0a8ce9e33db900027ddca1ec39178", + "sha256:8b56553c0345ad6dcb2e9b433ae47d67f95fc23fe28a0bde15a120f25257e291", "sha256:8bb1e155a74e1bfbacd84555ea62fa21c58e0b4e7e6b20e4447b8d07990ac78b", "sha256:95d5ef984eff897850f3a83883363da64aae1000e79cb3c321915468e8c6add5", "sha256:a013cbe25d20c2e0c4e85a9daf438f85121a4d0344ddc76e33fd7e3965d9af4b", @@ -247,7 +244,6 @@ "sha256:e98eca29a05913e82177b3ba3d198b1728e164869c613d76d0de4bde6768a50e", "sha256:f217c3954ce5fd88303fc0c317af55d5e0204106d86dea17eb8205700d47dec2" ], - "markers": "python_version >= '3.6'", "version": "==8.2.0" }, "pyparsing": { @@ -255,12 +251,12 @@ "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.4.7" }, "pyrsistent": { - "hashes": ["sha256:2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"], - "markers": "python_version >= '3.5'", + "hashes": [ + "sha256:2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e" + ], "version": "==0.17.3" }, "python-dateutil": { @@ -268,7 +264,6 @@ "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.8.1" }, "pywavelets": { @@ -304,7 +299,6 @@ "sha256:d510aef84d9852653d079c84f2f81a82d5d09815e625f35c95714e7364570ad4", "sha256:e02a0558e0c2ac8b8bbe6a6ac18c136767ec56b96a321e0dfde2173adfa5a504" ], - "markers": "python_version >= '3.5'", "version": "==1.1.1" }, "pyyaml": { @@ -339,7 +333,6 @@ "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" ], - "index": "pypi", "version": "==5.4.1" }, "requests": { @@ -347,7 +340,6 @@ "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==2.25.1" }, "ruamel.yaml": { @@ -392,7 +384,7 @@ "sha256:e9f7d1d8c26a6a12c23421061f9022bb62704e38211fe375c645485f38df34a2", "sha256:f6061a31880c1ed6b6ce341215336e2f3d0c1deccd84957b6fa8ca474b41e89f" ], - "markers": "python_version < '3.10' and platform_python_implementation == 'CPython'", + "markers": "platform_python_implementation == 'CPython' and python_version < '3.10'", "version": "==0.2.2" }, "scikit-image": { @@ -447,7 +439,6 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "tifffile": { @@ -455,7 +446,6 @@ "sha256:1cfc55f5b728e200142580a7bf108b72775c4097d007b4111876559fa1fb7432", "sha256:55aa8baad38e1567c9fe450fff52160e4a21294a612f241c5e414da80f87209b" ], - "markers": "python_version >= '3.7'", "version": "==2021.4.8" }, "unidecode": { @@ -467,11 +457,11 @@ }, "urllib3": { "hashes": [ - "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df", - "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937" + "sha256:753a0374df26658f99d826cfe40394a686d05985786d946fbe4165b5148f5a7c", + "sha256:a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", - "version": "==1.26.4" + "index": "pypi", + "version": "==1.26.5" } }, "develop": { @@ -488,7 +478,6 @@ "sha256:4c17cea3e592c21b6e222f673868961bad77e1f985cb1694ed077475a89229c1", "sha256:d8506842a3faf734b81599c8b98dcc423de863adcc1999248480b18bd31a0f38" ], - "markers": "python_version >= '3.5'", "version": "==2.4.1" }, "attrs": { @@ -496,7 +485,6 @@ "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1", "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==21.2.0" }, "bandit": { @@ -569,7 +557,6 @@ "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125", "sha256:cf316c8370a737a022b72b56874f6602acf974a37a9fba42ec2876387549fc61" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==0.17.1" }, "dodgy": { @@ -599,7 +586,6 @@ "sha256:6c4cc71933456991da20917998acbe6cf4fb41eeaab7d6d67fbc05ecd4c865b0", "sha256:96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005" ], - "markers": "python_version >= '3.4'", "version": "==4.0.7" }, "gitpython": { @@ -607,11 +593,12 @@ "sha256:29fe82050709760081f588dd50ce83504feddbebdc4da6956d02351552b1c135", "sha256:ee24bdc93dce357630764db659edaf6b8d664d4ff5447ccfeedd2dc5c253f41e" ], - "markers": "python_version >= '3.5'", "version": "==3.1.17" }, "gprof2dot": { - "hashes": ["sha256:1223189383b53dcc8ecfd45787ac48c0ed7b4dbc16ee8b88695d053eea1acabf"], + "hashes": [ + "sha256:1223189383b53dcc8ecfd45787ac48c0ed7b4dbc16ee8b88695d053eea1acabf" + ], "version": "==2021.2.21" }, "iniconfig": { @@ -626,7 +613,6 @@ "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1", "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==4.3.21" }, "lazy-object-proxy": { @@ -653,7 +639,6 @@ "sha256:efa1909120ce98bbb3777e8b6f92237f5d5c8ea6758efea36a473e1d38f7d3e4", "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.4.3" }, "mccabe": { @@ -702,7 +687,6 @@ "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5", "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==20.9" }, "pbr": { @@ -710,7 +694,6 @@ "sha256:42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd", "sha256:c68c661ac5cc81058ac94247278eeda6d2e6aecb3e227b0387c30d277e7ef8d4" ], - "markers": "python_version >= '2.6'", "version": "==5.6.0" }, "pep8-naming": { @@ -725,12 +708,17 @@ "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0", "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.13.1" }, "prospector": { - "extras": ["with_bandit", "with_mypy", "with_pyroma"], - "hashes": ["sha256:700d7918d93d73035a2a58fb18c6be0b609a0481fc6e0908843fa856b89e52c6"], + "extras": [ + "with_bandit", + "with_mypy", + "with_pyroma" + ], + "hashes": [ + "sha256:700d7918d93d73035a2a58fb18c6be0b609a0481fc6e0908843fa856b89e52c6" + ], "index": "pypi", "version": "==1.3.1" }, @@ -739,7 +727,6 @@ "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3", "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.10.0" }, "pycodestyle": { @@ -747,7 +734,6 @@ "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367", "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.6.0" }, "pydocstyle": { @@ -762,7 +748,6 @@ "sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92", "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.2.0" }, "pygments": { @@ -770,7 +755,6 @@ "sha256:a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f", "sha256:d66e804411278594d764fc69ec36ec13d9ae9147193a1740cd34d272ca383b8e" ], - "markers": "python_version >= '3.5'", "version": "==2.9.0" }, "pylint": { @@ -778,11 +762,12 @@ "sha256:7dd78437f2d8d019717dbf287772d0b2dbdfd13fc016aa7faa08d67bccc46adc", "sha256:d0ece7d223fe422088b0e8f13fa0a1e8eb745ebffcb8ed53d3e95394b6101a1c" ], - "markers": "python_version >= '3.5'", "version": "==2.5.3" }, "pylint-celery": { - "hashes": ["sha256:41e32094e7408d15c044178ea828dd524beedbdbe6f83f712c5e35bde1de4beb"], + "hashes": [ + "sha256:41e32094e7408d15c044178ea828dd524beedbdbe6f83f712c5e35bde1de4beb" + ], "version": "==0.3" }, "pylint-django": { @@ -793,7 +778,9 @@ "version": "==2.1.0" }, "pylint-flask": { - "hashes": ["sha256:f4d97de2216bf7bfce07c9c08b166e978fe9f2725de2a50a9845a97de7e31517"], + "hashes": [ + "sha256:f4d97de2216bf7bfce07c9c08b166e978fe9f2725de2a50a9845a97de7e31517" + ], "version": "==0.6" }, "pylint-plugin-utils": { @@ -808,7 +795,6 @@ "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.4.7" }, "pyroma": { @@ -828,8 +814,6 @@ }, "pytest-profiling": { "hashes": [ - "sha256:3b255f9db36cb2dd7536a8e7e294c612c0be7f7850a7d30754878e4315d56600", - "sha256:6bce4e2edc04409d2f3158c16750fab8074f62d404cc38eeb075dff7fcbb996c", "sha256:93938f147662225d2b8bd5af89587b979652426a8a6ffd7e73ec4a23e24b7f29", "sha256:999cc9ac94f2e528e3f5d43465da277429984a1c237ae9818f8cfd0b06acb019" ], @@ -868,15 +852,18 @@ "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" ], - "index": "pypi", "version": "==5.4.1" }, "requirements-detector": { - "hashes": ["sha256:0d1e13e61ed243f9c3c86e6cbb19980bcb3a0e0619cde2ec1f3af70fdbee6f7b"], + "hashes": [ + "sha256:0d1e13e61ed243f9c3c86e6cbb19980bcb3a0e0619cde2ec1f3af70fdbee6f7b" + ], "version": "==0.7" }, "setoptconf": { - "hashes": ["sha256:5b0b5d8e0077713f5d5152d4f63be6f048d9a1bb66be15d089a11c898c3cf49c"], + "hashes": [ + "sha256:5b0b5d8e0077713f5d5152d4f63be6f048d9a1bb66be15d089a11c898c3cf49c" + ], "version": "==0.2.0" }, "six": { @@ -884,7 +871,6 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "smmap": { @@ -892,7 +878,6 @@ "sha256:7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182", "sha256:a9a7479e4c572e2e775c404dcd3080c8dc49f39918c2cf74913d30c4c478e3c2" ], - "markers": "python_version >= '3.5'", "version": "==4.0.0" }, "snowballstemmer": { @@ -907,7 +892,6 @@ "sha256:3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee", "sha256:50d7b78fbaf0d04cd62411188fa7eedcb03eb7f4c4b37005615ceebe582aa82a" ], - "markers": "python_version >= '3.6'", "version": "==3.3.0" }, "toml": { @@ -915,7 +899,6 @@ "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.10.2" }, "typed-ast": { @@ -962,7 +945,9 @@ "version": "==3.10.0.0" }, "wrapt": { - "hashes": ["sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"], + "hashes": [ + "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" + ], "version": "==1.12.1" } } From d05b23db0c38e0b849391107c036d0935bb86e98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:15:49 +0000 Subject: [PATCH 03/19] Bump jsonschema-gentypes from 0.9.0 to 0.9.2 Bumps [jsonschema-gentypes](https://github.com/camptocamp/jsonschema-gentypes) from 0.9.0 to 0.9.2. - [Release notes](https://github.com/camptocamp/jsonschema-gentypes/releases) - [Commits](https://github.com/camptocamp/jsonschema-gentypes/compare/0.9.0...0.9.2) --- updated-dependencies: - dependency-name: jsonschema-gentypes dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Pipfile | 2 +- Pipfile.lock | 41 +++-------------------------------------- 2 files changed, 4 insertions(+), 39 deletions(-) diff --git a/Pipfile b/Pipfile index 7c8ceb0a..dbcc0ad9 100644 --- a/Pipfile +++ b/Pipfile @@ -9,7 +9,7 @@ scipy = "==1.6.3" scikit-image = "==0.18.1" opencv-python-headless = "==4.5.2.52" deskew = "==0.10.29" -jsonschema-gentypes = "==0.9.0" +jsonschema-gentypes = "==0.9.2" "ruamel.yaml" = "==0.17.4" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index eec32c70..4000b196 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "5a27685e4be60cb3ffc373426df459e85decc6e3225a6cc59afe4bfca5b7aa61" + "sha256": "3c41b7fbb68d25f8b2536859b1c1807f9ba6dffac3f80a5ddef2a2fc861bf546" }, "pipfile-spec": 6, "requires": { @@ -82,10 +82,10 @@ }, "jsonschema-gentypes": { "hashes": [ - "sha256:a76b2a011157474f341e4eb391ae9801ef251ef2b9b2bb68002007cb7607db16" + "sha256:c6487bd15f2cc29312305d941c5e07f71fc51226241996f60b31622ddf441186" ], "index": "pypi", - "version": "==0.9.0" + "version": "==0.9.2" }, "kiwisolver": { "hashes": [ @@ -301,40 +301,6 @@ ], "version": "==1.1.1" }, - "pyyaml": { - "hashes": [ - "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf", - "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696", - "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393", - "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77", - "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922", - "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5", - "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8", - "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10", - "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc", - "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", - "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", - "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", - "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347", - "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", - "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541", - "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", - "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", - "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc", - "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", - "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa", - "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", - "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122", - "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", - "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", - "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", - "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc", - "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247", - "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", - "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" - ], - "version": "==5.4.1" - }, "requests": { "hashes": [ "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", @@ -460,7 +426,6 @@ "sha256:753a0374df26658f99d826cfe40394a686d05985786d946fbe4165b5148f5a7c", "sha256:a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098" ], - "index": "pypi", "version": "==1.26.5" } }, From 48e65794b4eb3617470abd1d3fc6873361bd7f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 3 Jun 2021 09:59:29 +0200 Subject: [PATCH 04/19] Regenerate the schema --- scan_to_paperless/config.py | 6 +++++- scan_to_paperless/process_schema.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scan_to_paperless/config.py b/scan_to_paperless/config.py index 1bda3818..8f0e65ae 100644 --- a/scan_to_paperless/config.py +++ b/scan_to_paperless/config.py @@ -71,9 +71,13 @@ # # default: scanimage "scanimage": str, + # default: + # - --format=png + # - --mode=color + # - --resolution=300 "scanimage_arguments": List[str], # WARNING: The required are not correctly taken in account, - # See: https://www.python.org/dev/peps/pep-0655/ + # See: https://github.com/camptocamp/jsonschema-gentypes/issues/6 # # required "default_args": "Arguments", diff --git a/scan_to_paperless/process_schema.py b/scan_to_paperless/process_schema.py index df154db1..fa83f179 100644 --- a/scan_to_paperless/process_schema.py +++ b/scan_to_paperless/process_schema.py @@ -103,7 +103,7 @@ # required "destination": str, # WARNING: The required are not correctly taken in account, - # See: https://www.python.org/dev/peps/pep-0655/ + # See: https://github.com/camptocamp/jsonschema-gentypes/issues/6 # # required "args": "Arguments", From 149dfd8aeb0ea212d2af53b9a599f8305a19a6fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Jun 2021 07:19:38 +0000 Subject: [PATCH 05/19] Bump c2cciutils from 1.1.dev20210511092229 to 1.1.dev20210604063451 --- ci/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements.txt b/ci/requirements.txt index 59cf520c..669649ed 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,2 +1,2 @@ -c2cciutils==1.1.dev20210511092229 +c2cciutils==1.1.dev20210604063451 jsonschema2md==0.2.0.post1 From 7fee841e1df87a0363410463054a43866b734d14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 07:55:10 +0000 Subject: [PATCH 06/19] Bump jsonschema-gentypes from 0.9.2 to 0.9.3 --- Pipfile | 2 +- Pipfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Pipfile b/Pipfile index dbcc0ad9..ed8ea03b 100644 --- a/Pipfile +++ b/Pipfile @@ -9,7 +9,7 @@ scipy = "==1.6.3" scikit-image = "==0.18.1" opencv-python-headless = "==4.5.2.52" deskew = "==0.10.29" -jsonschema-gentypes = "==0.9.2" +jsonschema-gentypes = "==0.9.3" "ruamel.yaml" = "==0.17.4" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 4000b196..93931f73 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "3c41b7fbb68d25f8b2536859b1c1807f9ba6dffac3f80a5ddef2a2fc861bf546" + "sha256": "ed05d243e33051851e438d515cd5d59c4aceffbb924a0c3c25dd819d86ef2905" }, "pipfile-spec": 6, "requires": { @@ -82,10 +82,10 @@ }, "jsonschema-gentypes": { "hashes": [ - "sha256:c6487bd15f2cc29312305d941c5e07f71fc51226241996f60b31622ddf441186" + "sha256:6a4ae561dc9eb6d2ce641c319c2b8f585d2e58e7df8735bf155622d2715ed89e" ], "index": "pypi", - "version": "==0.9.2" + "version": "==0.9.3" }, "kiwisolver": { "hashes": [ @@ -409,10 +409,10 @@ }, "tifffile": { "hashes": [ - "sha256:1cfc55f5b728e200142580a7bf108b72775c4097d007b4111876559fa1fb7432", - "sha256:55aa8baad38e1567c9fe450fff52160e4a21294a612f241c5e414da80f87209b" + "sha256:73a750277e89f1d9cb88bba03e2e31aeda1aa714d91a20c477abf3cb85fa112f", + "sha256:aa6c2afb75378432856e2ecfba8cba347b6615b541bb71f1f83a9860ebe8fa70" ], - "version": "==2021.4.8" + "version": "==2021.6.6" }, "unidecode": { "hashes": [ From 5e75bf2396f1970323ff9f77d897108e4bb00cdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Jun 2021 06:52:06 +0000 Subject: [PATCH 07/19] Bump opencv-python-headless from 4.5.2.52 to 4.5.2.54 --- Pipfile | 2 +- Pipfile.lock | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Pipfile b/Pipfile index ed8ea03b..8b5c6082 100644 --- a/Pipfile +++ b/Pipfile @@ -7,7 +7,7 @@ name = "pypi" numpy = "==1.20.3" scipy = "==1.6.3" scikit-image = "==0.18.1" -opencv-python-headless = "==4.5.2.52" +opencv-python-headless = "==4.5.2.54" deskew = "==0.10.29" jsonschema-gentypes = "==0.9.3" "ruamel.yaml" = "==0.17.4" diff --git a/Pipfile.lock b/Pipfile.lock index 93931f73..31c3fefa 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ed05d243e33051851e438d515cd5d59c4aceffbb924a0c3c25dd819d86ef2905" + "sha256": "aa26cffe3384777e49f7d7e3b0909e1f26f1461811b25aaa12f0f3d6c1b8e062" }, "pipfile-spec": 6, "requires": { @@ -187,25 +187,25 @@ }, "opencv-python-headless": { "hashes": [ - "sha256:05791b18bf9992a103af83927a8a961f9e47b874adcfc4a091e97cef66d1c36e", - "sha256:2d0db1fcd34b467f53527fc954078dd8de732fd44e6df01017fab98bb62c313f", - "sha256:3a3d3a9091e566680def58eab88382bd070bd2fa65d53ec452aef0ecf2f6fbec", - "sha256:51320b83de486e5b9a2f0aaab84547fb3e5b82942cca3b9994e30e218b8f35cc", - "sha256:6063d758a8e7b1826d5f44d12bf8f9f103e46e3cef0d97a21e12a3eef3f26fdf", - "sha256:738a706589acb058a3dfdcbb0cdc267c90279a7f11268f070b6b8f1508890b7b", - "sha256:9da86f759b1c6c8d54d8640fc05f8f9d90078289a63e0051ea00be75842a6b1f", - "sha256:9ea17f8c2df64f92fb394c3f48002ead028e61e3ac102155bf98494e94a54e62", - "sha256:ac48bdc60b5997cf46c67a780e81872d44574adbfd7df81d06bb28947189d690", - "sha256:ae3eb4b75212e67eb2ad1e68335df289bb171d1c96bf4f23678111acf20ddc4c", - "sha256:afb5643347cb0a4f20ecae2117aac371a603fbe9ee076c93895912355b816f8d", - "sha256:c07a5156b6d8f67abb84609deef0fb0c224d60a57012ba769d05f70c0775146c", - "sha256:c8ecc0b71cafdc97f460f9b584d81c05232985dae2f7793a0b06b3ce9b7a4353", - "sha256:e9c73a996efd7a74a1f5b9c8493a3e6710448c6728101056ac291a12a9739c25", - "sha256:f554f9c1c917d79b190e053d808f5c1ea6ab5d0538773a8221651b134e16d012", - "sha256:facc5445b203b7b148cc16cf443033c6b0f78151784b0bdb61108fa6b93fdb5f" + "sha256:1f565b6dc87dcca1b3d78df7beae005781b684b1140128b0a71629fb7a3ec4e2", + "sha256:32303224c4ce8cd362164f90c32bf95bbf131262611d8fe7c061baf73d2d6f05", + "sha256:4735a717b770c5c08d267461bdfb8c5f4c9faa82b3fbb1a3ef01bfd0beaf943b", + "sha256:4940d3cd9a9382fb58d4cea3f29cf32638130b991aaa8462fee92ff1a3cf6e99", + "sha256:4f9c927040de5bce6508441f283b10b1edc285a7342d402f16c26eb81348cf5c", + "sha256:52783623386b7411dba772584d0d57fe60e5aee70cf36feeec8639b9e58dcf5a", + "sha256:5312bed3107e35030cfddc6e6e943985f22d165651558a0929a13925e3e154e8", + "sha256:64a89b30c9188c696f89bc800fa457c4c590de3732c36a5ce3c5fbde812a6f26", + "sha256:740cdf843598f4a26718a640915fac21504add6b315eeecd4ad2905b55e02093", + "sha256:742a8869415be521e20ab878a8a119e111ecd1da21bd828e41898c728555063f", + "sha256:7de97d8781c905ed105c019210920a1d374004d20b4134d9978903c0f72769bc", + "sha256:a8e2a8813fa00fd59d487761bebe1b27d3e75ad206b9a35765492fa79a42a25c", + "sha256:aa53aea49e1824a44a4033123a68502488ca980105f47d25ed6263b1fa545b71", + "sha256:c6d3baeb7c1e1bec8a5b6620219ce0f953154dad9b5dd10d7311bc98f5201e4b", + "sha256:e61aebc9f45c2cbc06d1ff4661f352d652bf12b0dacf6eea03e42988ed344e35", + "sha256:f3a670b13758a370c49c37632e8b85caeb9f6669b612b092d0b718382ee9bf98" ], "index": "pypi", - "version": "==4.5.2.52" + "version": "==4.5.2.54" }, "pillow": { "hashes": [ From 743f26a3917e54da5932d3657b2e9f37abf351bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 06:32:14 +0000 Subject: [PATCH 08/19] Bump jsonschema-gentypes from 0.9.3 to 0.9.4 --- Pipfile | 2 +- Pipfile.lock | 94 ++++++++++++++++++---------------------------------- 2 files changed, 33 insertions(+), 63 deletions(-) diff --git a/Pipfile b/Pipfile index 8b5c6082..78a13928 100644 --- a/Pipfile +++ b/Pipfile @@ -9,7 +9,7 @@ scipy = "==1.6.3" scikit-image = "==0.18.1" opencv-python-headless = "==4.5.2.54" deskew = "==0.10.29" -jsonschema-gentypes = "==0.9.3" +jsonschema-gentypes = "==0.9.4" "ruamel.yaml" = "==0.17.4" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 31c3fefa..a2e7f483 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "aa26cffe3384777e49f7d7e3b0909e1f26f1461811b25aaa12f0f3d6c1b8e062" + "sha256": "cdd2298c1cb4c14a237b08581208b16ef6ecb55ee1d805fd81dbc507cc4a2587" }, "pipfile-spec": 6, "requires": { @@ -82,10 +82,10 @@ }, "jsonschema-gentypes": { "hashes": [ - "sha256:6a4ae561dc9eb6d2ce641c319c2b8f585d2e58e7df8735bf155622d2715ed89e" + "sha256:0c550c05bf3b9c52a82ddf2b27be985997a4be9bd7c51781aeb5b1880aa210ee" ], "index": "pypi", - "version": "==0.9.3" + "version": "==0.9.4" }, "kiwisolver": { "hashes": [ @@ -189,17 +189,21 @@ "hashes": [ "sha256:1f565b6dc87dcca1b3d78df7beae005781b684b1140128b0a71629fb7a3ec4e2", "sha256:32303224c4ce8cd362164f90c32bf95bbf131262611d8fe7c061baf73d2d6f05", + "sha256:33b9fe7000dbc1d8e44c17645c93a740f8e166d5c394784f31c11a6471a602ef", "sha256:4735a717b770c5c08d267461bdfb8c5f4c9faa82b3fbb1a3ef01bfd0beaf943b", "sha256:4940d3cd9a9382fb58d4cea3f29cf32638130b991aaa8462fee92ff1a3cf6e99", "sha256:4f9c927040de5bce6508441f283b10b1edc285a7342d402f16c26eb81348cf5c", "sha256:52783623386b7411dba772584d0d57fe60e5aee70cf36feeec8639b9e58dcf5a", "sha256:5312bed3107e35030cfddc6e6e943985f22d165651558a0929a13925e3e154e8", "sha256:64a89b30c9188c696f89bc800fa457c4c590de3732c36a5ce3c5fbde812a6f26", + "sha256:6a2165d44d187f8e918aff555ae6a2ce300bfe02fff6c5577bd79144459657d6", "sha256:740cdf843598f4a26718a640915fac21504add6b315eeecd4ad2905b55e02093", "sha256:742a8869415be521e20ab878a8a119e111ecd1da21bd828e41898c728555063f", "sha256:7de97d8781c905ed105c019210920a1d374004d20b4134d9978903c0f72769bc", + "sha256:86da0d05fd7c19ba2ec7f5a4865d6b188e7e8e631a0890b83135ebb6837a7b9c", "sha256:a8e2a8813fa00fd59d487761bebe1b27d3e75ad206b9a35765492fa79a42a25c", "sha256:aa53aea49e1824a44a4033123a68502488ca980105f47d25ed6263b1fa545b71", + "sha256:b62b24fb2eef8b46e3272e21380a43f9e32573f4554e0b611d075082f52acf2e", "sha256:c6d3baeb7c1e1bec8a5b6620219ce0f953154dad9b5dd10d7311bc98f5201e4b", "sha256:e61aebc9f45c2cbc06d1ff4661f352d652bf12b0dacf6eea03e42988ed344e35", "sha256:f3a670b13758a370c49c37632e8b85caeb9f6669b612b092d0b718382ee9bf98" @@ -615,30 +619,31 @@ }, "mypy": { "hashes": [ - "sha256:0d0a87c0e7e3a9becdfbe936c981d32e5ee0ccda3e0f07e1ef2c3d1a817cf73e", - "sha256:25adde9b862f8f9aac9d2d11971f226bd4c8fbaa89fb76bdadb267ef22d10064", - "sha256:28fb5479c494b1bab244620685e2eb3c3f988d71fd5d64cc753195e8ed53df7c", - "sha256:2f9b3407c58347a452fc0736861593e105139b905cca7d097e413453a1d650b4", - "sha256:33f159443db0829d16f0a8d83d94df3109bb6dd801975fe86bacb9bf71628e97", - "sha256:3f2aca7f68580dc2508289c729bd49ee929a436208d2b2b6aab15745a70a57df", - "sha256:499c798053cdebcaa916eef8cd733e5584b5909f789de856b482cd7d069bdad8", - "sha256:4eec37370483331d13514c3f55f446fc5248d6373e7029a29ecb7b7494851e7a", - "sha256:552a815579aa1e995f39fd05dde6cd378e191b063f031f2acfe73ce9fb7f9e56", - "sha256:5873888fff1c7cf5b71efbe80e0e73153fe9212fafdf8e44adfe4c20ec9f82d7", - "sha256:61a3d5b97955422964be6b3baf05ff2ce7f26f52c85dd88db11d5e03e146a3a6", - "sha256:674e822aa665b9fd75130c6c5f5ed9564a38c6cea6a6432ce47eafb68ee578c5", - "sha256:7ce3175801d0ae5fdfa79b4f0cfed08807af4d075b402b7e294e6aa72af9aa2a", - "sha256:9743c91088d396c1a5a3c9978354b61b0382b4e3c440ce83cf77994a43e8c521", - "sha256:9f94aac67a2045ec719ffe6111df543bac7874cee01f41928f6969756e030564", - "sha256:a26f8ec704e5a7423c8824d425086705e381b4f1dfdef6e3a1edab7ba174ec49", - "sha256:abf7e0c3cf117c44d9285cc6128856106183938c68fd4944763003decdcfeb66", - "sha256:b09669bcda124e83708f34a94606e01b614fa71931d356c1f1a5297ba11f110a", - "sha256:cd07039aa5df222037005b08fbbfd69b3ab0b0bd7a07d7906de75ae52c4e3119", - "sha256:d23e0ea196702d918b60c8288561e722bf437d82cb7ef2edcd98cfa38905d506", - "sha256:d65cc1df038ef55a99e617431f0553cd77763869eebdf9042403e16089fe746c", - "sha256:d7da2e1d5f558c37d6e8c1246f1aec1e7349e4913d8fb3cb289a35de573fe2eb" - ], - "version": "==0.812" + "sha256:053b92ebae901fc7954677949049f70133f2f63e3e83dc100225c26d6a46fe95", + "sha256:08cf1f31029612e1008a9432337ca4b1fbac989ff7c8200e2c9ec42705cd4c7b", + "sha256:18753a8bb9bcf031ff10009852bd48d781798ecbccf45be5449892e6af4e3f9f", + "sha256:1cd241966a35036f936d4739bd71a1c64e15f02bf7d12bb2815cccfb2993a9de", + "sha256:307a6c047596d768c3d689734307e47a91596eb9dbb67cfdf7d1fd9117b27f13", + "sha256:4a622faa3be76114cdce009f8ec173401494cf9e8f22713e7ae75fee9d906ab3", + "sha256:4b54518e399c3f4dc53380d4252c83276b2e60623cfc5274076eb8aae57572ac", + "sha256:5ddd8f4096d5fc2e7d7bb3924ac22758862163ad2c1cdc902c4b85568160e90a", + "sha256:61b10ba18a01d05fc46adbf4f18b0e92178f6b5fd0f45926ffc2a408b5419728", + "sha256:7845ad3a31407bfbd64c76d032c16ab546d282930f747023bf07c17b054bebc5", + "sha256:79beb6741df15395908ecc706b3a593a98804c1d5b5b6bd0c5b03b67c7ac03a0", + "sha256:8183561bfd950e93eeab8379ae5ec65873c856f5b58498d23aa8691f74c86030", + "sha256:91211acf1485a1db0b1261bc5f9ed450cba3c0dfd8da0a6680e94827591e34d7", + "sha256:97be0e8ed116f7f79472a49cf06dd45dd806771142401f684d4f13ee652a63c0", + "sha256:9941b685807b60c58020bb67b3217c9df47820dcd00425f55cdf71f31d3c42d9", + "sha256:a85c6759dcc6a9884131fa06a037bd34352aa3947e7f5d9d5a35652cc3a44bcd", + "sha256:bc61153eb4df769538bb4a6e1045f59c2e6119339690ec719feeacbfc3809e89", + "sha256:bf347c327c48d963bdef5bf365215d3e98b5fddbe5069fc796cec330e8235a20", + "sha256:c86e3f015bfe7958646825d41c0691c6e5a5cd4015e3409b5c29c18a3c712534", + "sha256:c8bc628961cca4335ac7d1f2ed59b7125d9252fe4c78c3d66d30b50162359c99", + "sha256:da914faaa80c25f463913da6db12adba703822a768f452f29f75b40bb4357139", + "sha256:e8577d30daf1b7b6582020f539f76e78ee1ed64a0323b28c8e0333c45db9369f", + "sha256:f208cc967e566698c4e30a1f65843fc88d8da05a8693bac8b975417e0aee9ced" + ], + "version": "==0.901" }, "mypy-extensions": { "hashes": [ @@ -866,41 +871,6 @@ ], "version": "==0.10.2" }, - "typed-ast": { - "hashes": [ - "sha256:01ae5f73431d21eead5015997ab41afa53aa1fbe252f9da060be5dad2c730ace", - "sha256:067a74454df670dcaa4e59349a2e5c81e567d8d65458d480a5b3dfecec08c5ff", - "sha256:0fb71b8c643187d7492c1f8352f2c15b4c4af3f6338f21681d3681b3dc31a266", - "sha256:1b3ead4a96c9101bef08f9f7d1217c096f31667617b58de957f690c92378b528", - "sha256:2068531575a125b87a41802130fa7e29f26c09a2833fea68d9a40cf33902eba6", - "sha256:209596a4ec71d990d71d5e0d312ac935d86930e6eecff6ccc7007fe54d703808", - "sha256:2c726c276d09fc5c414693a2de063f521052d9ea7c240ce553316f70656c84d4", - "sha256:398e44cd480f4d2b7ee8d98385ca104e35c81525dd98c519acff1b79bdaac363", - "sha256:52b1eb8c83f178ab787f3a4283f68258525f8d70f778a2f6dd54d3b5e5fb4341", - "sha256:5feca99c17af94057417d744607b82dd0a664fd5e4ca98061480fd8b14b18d04", - "sha256:7538e495704e2ccda9b234b82423a4038f324f3a10c43bc088a1636180f11a41", - "sha256:760ad187b1041a154f0e4d0f6aae3e40fdb51d6de16e5c99aedadd9246450e9e", - "sha256:777a26c84bea6cd934422ac2e3b78863a37017618b6e5c08f92ef69853e765d3", - "sha256:95431a26309a21874005845c21118c83991c63ea800dd44843e42a916aec5899", - "sha256:9ad2c92ec681e02baf81fdfa056fe0d818645efa9af1f1cd5fd6f1bd2bdfd805", - "sha256:9c6d1a54552b5330bc657b7ef0eae25d00ba7ffe85d9ea8ae6540d2197a3788c", - "sha256:aee0c1256be6c07bd3e1263ff920c325b59849dc95392a05f258bb9b259cf39c", - "sha256:af3d4a73793725138d6b334d9d247ce7e5f084d96284ed23f22ee626a7b88e39", - "sha256:b36b4f3920103a25e1d5d024d155c504080959582b928e91cb608a65c3a49e1a", - "sha256:b9574c6f03f685070d859e75c7f9eeca02d6933273b5e69572e5ff9d5e3931c3", - "sha256:bff6ad71c81b3bba8fa35f0f1921fb24ff4476235a6e94a26ada2e54370e6da7", - "sha256:c190f0899e9f9f8b6b7863debfb739abcb21a5c054f911ca3596d12b8a4c4c7f", - "sha256:c907f561b1e83e93fad565bac5ba9c22d96a54e7ea0267c708bffe863cbe4075", - "sha256:cae53c389825d3b46fb37538441f75d6aecc4174f615d048321b716df2757fb0", - "sha256:dd4a21253f42b8d2b48410cb31fe501d32f8b9fbeb1f55063ad102fe9c425e40", - "sha256:dde816ca9dac1d9c01dd504ea5967821606f02e510438120091b84e852367428", - "sha256:f2362f3cb0f3172c42938946dbc5b7843c2a28aec307c49100c8b38764eb6927", - "sha256:f328adcfebed9f11301eaedfa48e15bdece9b519fb27e6a8c01aa52a17ec31b3", - "sha256:f8afcf15cc511ada719a88e013cec87c11aff7b91f019295eb4530f96fe5ef2f", - "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65" - ], - "version": "==1.4.3" - }, "typing-extensions": { "hashes": [ "sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497", From 6632f8be977a7e7e346a9ab6cbdff08282c47a9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Jun 2021 06:28:46 +0000 Subject: [PATCH 09/19] Bump c2cciutils from 1.1.dev20210604063451 to 1.1.dev20210615102932 Bumps [c2cciutils](https://github.com/camptocamp/c2cciutils) from 1.1.dev20210604063451 to 1.1.dev20210615102932. - [Release notes](https://github.com/camptocamp/c2cciutils/releases) - [Commits](https://github.com/camptocamp/c2cciutils/commits) --- updated-dependencies: - dependency-name: c2cciutils dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- ci/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements.txt b/ci/requirements.txt index 669649ed..a359fd06 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,2 +1,2 @@ -c2cciutils==1.1.dev20210604063451 +c2cciutils==1.1.dev20210615102932 jsonschema2md==0.2.0.post1 From 09bb178b970fc666b964c570437c75d9a282d09a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 16 Jun 2021 12:11:00 +0200 Subject: [PATCH 10/19] Fix classifiers --- scan_to_paperless/py.typed | 0 setup.py | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 scan_to_paperless/py.typed diff --git a/scan_to_paperless/py.typed b/scan_to_paperless/py.typed new file mode 100644 index 00000000..e69de29b diff --git a/setup.py b/setup.py index b9dc5301..3a45decf 100644 --- a/setup.py +++ b/setup.py @@ -20,11 +20,14 @@ long_description_content_type="text/markdown", keywords=["scan", "paperless"], classifiers=[ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "License :: OSI Approved :: BSD License", + "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.8", - "Development Status :: 5 - Production/Stable", - "License :: OSI Approved :: BSD License", + "Typing :: Typed", ], author="Stéphane Brunner", author_email="stephane.brunner@gmail.com", @@ -38,5 +41,5 @@ "scan-process = scan_to_paperless.process:main", ], }, - data={"scan_to_paperless": ["*.json"]}, + data={"scan_to_paperless": ["*.json", "py.typed"]}, ) From f751c14b9ed2b3b936be1394ce3e0850118ae56a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 14:16:21 +0000 Subject: [PATCH 11/19] Bump c2cciutils from 1.1.dev20210615102932 to 1.1.dev20210617081616 --- ci/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements.txt b/ci/requirements.txt index a359fd06..e75b1093 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,2 +1,2 @@ -c2cciutils==1.1.dev20210615102932 +c2cciutils==1.1.dev20210617081616 jsonschema2md==0.2.0.post1 From 7e300ad7827777be44e87a5ceed2d1245794990b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 14:32:16 +0000 Subject: [PATCH 12/19] Bump deskew from 0.10.29 to 0.10.30 --- Pipfile | 2 +- Pipfile.lock | 111 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 76 insertions(+), 37 deletions(-) diff --git a/Pipfile b/Pipfile index 78a13928..355b5d9b 100644 --- a/Pipfile +++ b/Pipfile @@ -8,7 +8,7 @@ numpy = "==1.20.3" scipy = "==1.6.3" scikit-image = "==0.18.1" opencv-python-headless = "==4.5.2.54" -deskew = "==0.10.29" +deskew = "==0.10.30" jsonschema-gentypes = "==0.9.4" "ruamel.yaml" = "==0.17.4" diff --git a/Pipfile.lock b/Pipfile.lock index a2e7f483..1a4c1b4a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "cdd2298c1cb4c14a237b08581208b16ef6ecb55ee1d805fd81dbc507cc4a2587" + "sha256": "ff070635c3d30810c406baf58c35f64c8fad2e6b26401149a0be94e54bbdc14b" }, "pipfile-spec": 6, "requires": { @@ -21,6 +21,7 @@ "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1", "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==21.2.0" }, "certifi": { @@ -35,6 +36,7 @@ "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==4.0.0" }, "cycler": { @@ -53,17 +55,18 @@ }, "deskew": { "hashes": [ - "sha256:f98dad2cd76f5c4473bef60e826d5f47fcc40a8adc3f4a527e8d26fbebcccbb1", - "sha256:fa947c30530dd4de1ef481da509f1bf97d25facf0a5d5865a7071442eae354f9" + "sha256:489308b2d0324c628968c8ac38e0a2a617144c9265b7d9795c94223caf2e42d6", + "sha256:cbcbae450961d8cfbf29aa0c10a9a0fde98ceb0cd1d64b82a164378c56e15d67" ], "index": "pypi", - "version": "==0.10.29" + "version": "==0.10.30" }, "idna": { "hashes": [ "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.10" }, "imageio": { @@ -122,6 +125,7 @@ "sha256:f8d6f8db88049a699817fd9178782867bf22283e3813064302ac59f61d95be05", "sha256:fd34fbbfbc40628200730bc1febe30631347103fc8d3d4fa012c21ab9c11eca9" ], + "markers": "python_version >= '3.6'", "version": "==1.3.1" }, "matplotlib": { @@ -146,6 +150,7 @@ "sha256:d8d994cefdff9aaba45166eb3de4f5211adb4accac85cbf97137e98f26ea0219", "sha256:df815378a754a7edd4559f8c51fc7064f779a74013644a7f5ac7a0c31f875866" ], + "markers": "python_version >= '3.7'", "version": "==3.4.2" }, "networkx": { @@ -153,6 +158,7 @@ "sha256:0635858ed7e989f4c574c2328380b452df892ae85084144c73d8cd819f0c4e06", "sha256:109cd585cac41297f71103c3c42ac6ef7379f29788eb54cb751be5a663bb235a" ], + "markers": "python_version >= '3.6'", "version": "==2.5.1" }, "numpy": { @@ -248,6 +254,7 @@ "sha256:e98eca29a05913e82177b3ba3d198b1728e164869c613d76d0de4bde6768a50e", "sha256:f217c3954ce5fd88303fc0c317af55d5e0204106d86dea17eb8205700d47dec2" ], + "markers": "python_version >= '3.6'", "version": "==8.2.0" }, "pyparsing": { @@ -255,12 +262,14 @@ "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.4.7" }, "pyrsistent": { "hashes": [ "sha256:2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e" ], + "markers": "python_version >= '3.5'", "version": "==0.17.3" }, "python-dateutil": { @@ -268,6 +277,7 @@ "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.8.1" }, "pywavelets": { @@ -303,6 +313,7 @@ "sha256:d510aef84d9852653d079c84f2f81a82d5d09815e625f35c95714e7364570ad4", "sha256:e02a0558e0c2ac8b8bbe6a6ac18c136767ec56b96a321e0dfde2173adfa5a504" ], + "markers": "python_version >= '3.5'", "version": "==1.1.1" }, "requests": { @@ -310,6 +321,7 @@ "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==2.25.1" }, "ruamel.yaml": { @@ -354,7 +366,7 @@ "sha256:e9f7d1d8c26a6a12c23421061f9022bb62704e38211fe375c645485f38df34a2", "sha256:f6061a31880c1ed6b6ce341215336e2f3d0c1deccd84957b6fa8ca474b41e89f" ], - "markers": "platform_python_implementation == 'CPython' and python_version < '3.10'", + "markers": "python_version < '3.10' and platform_python_implementation == 'CPython'", "version": "==0.2.2" }, "scikit-image": { @@ -409,14 +421,16 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "tifffile": { "hashes": [ - "sha256:73a750277e89f1d9cb88bba03e2e31aeda1aa714d91a20c477abf3cb85fa112f", - "sha256:aa6c2afb75378432856e2ecfba8cba347b6615b541bb71f1f83a9860ebe8fa70" + "sha256:3201f5ba297b94328954724bd48dbf1b36ec14c4ee4cd5a2ec1aa3f83c486200", + "sha256:a2f83d82800a8d83cbd04340f9d65a6873a970874947a6b823b1b1238e84cba6" ], - "version": "==2021.6.6" + "markers": "python_version >= '3.7'", + "version": "==2021.6.14" }, "unidecode": { "hashes": [ @@ -430,6 +444,7 @@ "sha256:753a0374df26658f99d826cfe40394a686d05985786d946fbe4165b5148f5a7c", "sha256:a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==1.26.5" } }, @@ -447,6 +462,7 @@ "sha256:4c17cea3e592c21b6e222f673868961bad77e1f985cb1694ed077475a89229c1", "sha256:d8506842a3faf734b81599c8b98dcc423de863adcc1999248480b18bd31a0f38" ], + "markers": "python_version >= '3.5'", "version": "==2.4.1" }, "attrs": { @@ -454,6 +470,7 @@ "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1", "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==21.2.0" }, "bandit": { @@ -526,6 +543,7 @@ "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125", "sha256:cf316c8370a737a022b72b56874f6602acf974a37a9fba42ec2876387549fc61" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==0.17.1" }, "dodgy": { @@ -555,14 +573,16 @@ "sha256:6c4cc71933456991da20917998acbe6cf4fb41eeaab7d6d67fbc05ecd4c865b0", "sha256:96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005" ], + "markers": "python_version >= '3.4'", "version": "==4.0.7" }, "gitpython": { "hashes": [ - "sha256:29fe82050709760081f588dd50ce83504feddbebdc4da6956d02351552b1c135", - "sha256:ee24bdc93dce357630764db659edaf6b8d664d4ff5447ccfeedd2dc5c253f41e" + "sha256:3283ae2fba31c913d857e12e5ba5f9a7772bbc064ae2bb09efafa71b0dd4939b", + "sha256:be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61" ], - "version": "==3.1.17" + "markers": "python_version >= '3.4'", + "version": "==3.1.14" }, "gprof2dot": { "hashes": [ @@ -582,6 +602,7 @@ "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1", "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==4.3.21" }, "lazy-object-proxy": { @@ -608,6 +629,7 @@ "sha256:efa1909120ce98bbb3777e8b6f92237f5d5c8ea6758efea36a473e1d38f7d3e4", "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.4.3" }, "mccabe": { @@ -619,31 +641,31 @@ }, "mypy": { "hashes": [ - "sha256:053b92ebae901fc7954677949049f70133f2f63e3e83dc100225c26d6a46fe95", - "sha256:08cf1f31029612e1008a9432337ca4b1fbac989ff7c8200e2c9ec42705cd4c7b", - "sha256:18753a8bb9bcf031ff10009852bd48d781798ecbccf45be5449892e6af4e3f9f", - "sha256:1cd241966a35036f936d4739bd71a1c64e15f02bf7d12bb2815cccfb2993a9de", - "sha256:307a6c047596d768c3d689734307e47a91596eb9dbb67cfdf7d1fd9117b27f13", - "sha256:4a622faa3be76114cdce009f8ec173401494cf9e8f22713e7ae75fee9d906ab3", - "sha256:4b54518e399c3f4dc53380d4252c83276b2e60623cfc5274076eb8aae57572ac", - "sha256:5ddd8f4096d5fc2e7d7bb3924ac22758862163ad2c1cdc902c4b85568160e90a", - "sha256:61b10ba18a01d05fc46adbf4f18b0e92178f6b5fd0f45926ffc2a408b5419728", - "sha256:7845ad3a31407bfbd64c76d032c16ab546d282930f747023bf07c17b054bebc5", - "sha256:79beb6741df15395908ecc706b3a593a98804c1d5b5b6bd0c5b03b67c7ac03a0", - "sha256:8183561bfd950e93eeab8379ae5ec65873c856f5b58498d23aa8691f74c86030", - "sha256:91211acf1485a1db0b1261bc5f9ed450cba3c0dfd8da0a6680e94827591e34d7", - "sha256:97be0e8ed116f7f79472a49cf06dd45dd806771142401f684d4f13ee652a63c0", - "sha256:9941b685807b60c58020bb67b3217c9df47820dcd00425f55cdf71f31d3c42d9", - "sha256:a85c6759dcc6a9884131fa06a037bd34352aa3947e7f5d9d5a35652cc3a44bcd", - "sha256:bc61153eb4df769538bb4a6e1045f59c2e6119339690ec719feeacbfc3809e89", - "sha256:bf347c327c48d963bdef5bf365215d3e98b5fddbe5069fc796cec330e8235a20", - "sha256:c86e3f015bfe7958646825d41c0691c6e5a5cd4015e3409b5c29c18a3c712534", - "sha256:c8bc628961cca4335ac7d1f2ed59b7125d9252fe4c78c3d66d30b50162359c99", - "sha256:da914faaa80c25f463913da6db12adba703822a768f452f29f75b40bb4357139", - "sha256:e8577d30daf1b7b6582020f539f76e78ee1ed64a0323b28c8e0333c45db9369f", - "sha256:f208cc967e566698c4e30a1f65843fc88d8da05a8693bac8b975417e0aee9ced" - ], - "version": "==0.901" + "sha256:0190fb77e93ce971954c9e54ea61de2802065174e5e990c9d4c1d0f54fbeeca2", + "sha256:0756529da2dd4d53d26096b7969ce0a47997123261a5432b48cc6848a2cb0bd4", + "sha256:2f9fedc1f186697fda191e634ac1d02f03d4c260212ccb018fabbb6d4b03eee8", + "sha256:353aac2ce41ddeaf7599f1c73fed2b75750bef3b44b6ad12985a991bc002a0da", + "sha256:3f12705eabdd274b98f676e3e5a89f247ea86dc1af48a2d5a2b080abac4e1243", + "sha256:4efc67b9b3e2fddbe395700f91d5b8deb5980bfaaccb77b306310bd0b9e002eb", + "sha256:517e7528d1be7e187a5db7f0a3e479747307c1b897d9706b1c662014faba3116", + "sha256:68a098c104ae2b75e946b107ef69dd8398d54cb52ad57580dfb9fc78f7f997f0", + "sha256:746e0b0101b8efec34902810047f26a8c80e1efbb4fc554956d848c05ef85d76", + "sha256:8be7bbd091886bde9fcafed8dd089a766fa76eb223135fe5c9e9798f78023a20", + "sha256:9236c21194fde5df1b4d8ebc2ef2c1f2a5dc7f18bcbea54274937cae2e20a01c", + "sha256:9ef5355eaaf7a23ab157c21a44c614365238a7bdb3552ec3b80c393697d974e1", + "sha256:9f1d74eeb3f58c7bd3f3f92b8f63cb1678466a55e2c4612bf36909105d0724ab", + "sha256:a26d0e53e90815c765f91966442775cf03b8a7514a4e960de7b5320208b07269", + "sha256:ae94c31bb556ddb2310e4f913b706696ccbd43c62d3331cd3511caef466871d2", + "sha256:b5ba1f0d5f9087e03bf5958c28d421a03a4c1ad260bf81556195dffeccd979c4", + "sha256:b5dfcd22c6bab08dfeded8d5b44bdcb68c6f1ab261861e35c470b89074f78a70", + "sha256:cd01c599cf9f897b6b6c6b5d8b182557fb7d99326bcdf5d449a0fbbb4ccee4b9", + "sha256:e89880168c67cf4fde4506b80ee42f1537ad66ad366c101d388b3fd7d7ce2afd", + "sha256:ebe2bc9cb638475f5d39068d2dbe8ae1d605bb8d8d3ff281c695df1670ab3987", + "sha256:f89bfda7f0f66b789792ab64ce0978e4a991a0e4dd6197349d0767b0f1095b21", + "sha256:fc4d63da57ef0e8cd4ab45131f3fe5c286ce7dd7f032650d0fbc239c6190e167", + "sha256:fd634bc17b1e2d6ce716f0e43446d0d61cdadb1efcad5c56ca211c22b246ebc8" + ], + "version": "==0.902" }, "mypy-extensions": { "hashes": [ @@ -657,6 +679,7 @@ "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5", "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==20.9" }, "pbr": { @@ -664,6 +687,7 @@ "sha256:42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd", "sha256:c68c661ac5cc81058ac94247278eeda6d2e6aecb3e227b0387c30d277e7ef8d4" ], + "markers": "python_version >= '2.6'", "version": "==5.6.0" }, "pep8-naming": { @@ -678,6 +702,7 @@ "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0", "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.13.1" }, "prospector": { @@ -697,6 +722,7 @@ "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3", "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.10.0" }, "pycodestyle": { @@ -704,6 +730,7 @@ "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367", "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.6.0" }, "pydocstyle": { @@ -711,6 +738,7 @@ "sha256:1d41b7c459ba0ee6c345f2eb9ae827cab14a7533a88c5c6f7e94923f72df92dc", "sha256:6987826d6775056839940041beef5c08cc7e3d71d63149b48e36727f70144dc4" ], + "markers": "python_version >= '3.6'", "version": "==6.1.1" }, "pyflakes": { @@ -718,6 +746,7 @@ "sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92", "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.2.0" }, "pygments": { @@ -725,6 +754,7 @@ "sha256:a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f", "sha256:d66e804411278594d764fc69ec36ec13d9ae9147193a1740cd34d272ca383b8e" ], + "markers": "python_version >= '3.5'", "version": "==2.9.0" }, "pylint": { @@ -732,6 +762,7 @@ "sha256:7dd78437f2d8d019717dbf287772d0b2dbdfd13fc016aa7faa08d67bccc46adc", "sha256:d0ece7d223fe422088b0e8f13fa0a1e8eb745ebffcb8ed53d3e95394b6101a1c" ], + "markers": "python_version >= '3.5'", "version": "==2.5.3" }, "pylint-celery": { @@ -765,6 +796,7 @@ "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.4.7" }, "pyroma": { @@ -784,6 +816,8 @@ }, "pytest-profiling": { "hashes": [ + "sha256:3b255f9db36cb2dd7536a8e7e294c612c0be7f7850a7d30754878e4315d56600", + "sha256:6bce4e2edc04409d2f3158c16750fab8074f62d404cc38eeb075dff7fcbb996c", "sha256:93938f147662225d2b8bd5af89587b979652426a8a6ffd7e73ec4a23e24b7f29", "sha256:999cc9ac94f2e528e3f5d43465da277429984a1c237ae9818f8cfd0b06acb019" ], @@ -822,6 +856,7 @@ "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", "version": "==5.4.1" }, "requirements-detector": { @@ -841,6 +876,7 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "smmap": { @@ -848,6 +884,7 @@ "sha256:7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182", "sha256:a9a7479e4c572e2e775c404dcd3080c8dc49f39918c2cf74913d30c4c478e3c2" ], + "markers": "python_version >= '3.5'", "version": "==4.0.0" }, "snowballstemmer": { @@ -862,6 +899,7 @@ "sha256:3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee", "sha256:50d7b78fbaf0d04cd62411188fa7eedcb03eb7f4c4b37005615ceebe582aa82a" ], + "markers": "python_version >= '3.6'", "version": "==3.3.0" }, "toml": { @@ -869,6 +907,7 @@ "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.10.2" }, "typing-extensions": { From 01e4068189a3ebc3d58dd6f7b7b8b887a4291909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 17 Jun 2021 20:37:13 +0200 Subject: [PATCH 13/19] More coherent level, cleanup title and date --- scan_to_paperless/process.py | 17 ++++++++--------- scan_to_paperless/scan.py | 32 +------------------------------- 2 files changed, 9 insertions(+), 40 deletions(-) diff --git a/scan_to_paperless/process.py b/scan_to_paperless/process.py index 861cd5c8..7f2b6924 100755 --- a/scan_to_paperless/process.py +++ b/scan_to_paperless/process.py @@ -321,22 +321,21 @@ def crop(context: Context, margin_horizontal: int = 25, margin_vertical: int = 2 def level(context: Context) -> np.ndarray: img_yuv = cv2.cvtColor(context.image, cv2.COLOR_BGR2YUV) + if context.config["args"].get("auto_level"): + img_yuv[:, :, 0] = cv2.equalizeHist(img_yuv[:, :, 0]) + return cast(np.ndarray, cv2.cvtColor(img_yuv, cv2.COLOR_YUV2BGR)) level_ = context.config["args"].get("level") + min_p100 = 0.0 + max_p100 = 100.0 if level_ is True: min_p100 = 15.0 max_p100 = 85.0 - elif level_ is False: - min_p100 = 0.0 - max_p100 = 100.0 elif isinstance(level_, (float, int)): min_p100 = 0.0 + level_ max_p100 = 100.0 - level_ - elif context.config["args"].get("auto_level"): - img_yuv[:, :, 0] = cv2.equalizeHist(img_yuv[:, :, 0]) - return cast(np.ndarray, cv2.cvtColor(img_yuv, cv2.COLOR_YUV2BGR)) - else: - min_p100 = context.config["args"].get("min_level", 0.0) - max_p100 = context.config["args"].get("max_level", 100.0) + if level_ is not False: + min_p100 = context.config["args"].get("min_level", min_p100) + max_p100 = context.config["args"].get("max_level", max_p100) min_ = min_p100 / 100.0 * 255.0 max_ = max_p100 / 100.0 * 255.0 diff --git a/scan_to_paperless/scan.py b/scan_to_paperless/scan.py index f25607da..a594dd2d 100755 --- a/scan_to_paperless/scan.py +++ b/scan_to_paperless/scan.py @@ -2,7 +2,6 @@ import argparse -import datetime import os import random import re @@ -55,18 +54,6 @@ def add_argument(name: str, choices: Optional[List[str]] = None, **kwargs: Any) arg.completer = ChoicesCompleter(choices) # type: ignore add_argument("--no-adf", dest="adf", action="store_false", help="Don't use ADF") - add_argument( - "--no-level", - dest="level", - action="store_false", - help="Don't use level correction", - ) - add_argument("title", nargs="*", choices=["No title"], help="The document title") - add_argument( - "--date", - choices=[datetime.date.today().strftime("%Y%m%d")], - help="The document date", - ) add_argument( "--double-sided", action="store_true", @@ -107,27 +94,13 @@ def add_argument(name: str, choices: Optional[List[str]] = None, **kwargs: Any) ) sys.exit(1) - title = None - full_name = None rand_int = str(random.randint(0, 999999)) # nosec base_folder = os.path.join(os.path.expanduser(config["scan_folder"]), rand_int) while os.path.exists(base_folder): rand_int = str(random.randint(0, 999999)) # nosec base_folder = os.path.join(os.path.expanduser(config["scan_folder"]), rand_int) - if args.title: - title = " ".join(args.title) - full_name = title - if args.date is not None: - full_name = f"{args.date}Z - {full_name}" - if "/" in full_name: - print("The name can't contains some '/' in the title.") - sys.exit(1) - destination = f"/destination/{full_name}.pdf" - elif args.date is not None: - destination = f"/destination/{args.date}Z - {rand_int}.pdf" - else: - destination = f"/destination/{rand_int}.pdf" + destination = f"/destination/{rand_int}.pdf" root_folder = os.path.join(base_folder, "source") os.makedirs(root_folder) @@ -181,12 +154,9 @@ def image_match(image_name: str) -> int: del args_cmd["adf"] del args_cmd["double_sided"] del args_cmd["set_config"] - del args_cmd["title"] args_.update(cast(stp_config.Arguments, args_cmd)) process_config = { "images": images, - "title": title, - "full_name": full_name, "destination": destination, "args": args_, } From 1e64016c47442999064c1c664e630759429b16c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 17 Jun 2021 20:57:49 +0200 Subject: [PATCH 14/19] Better assert message --- tests/test_process.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_process.py b/tests/test_process.py index a1daca6c..bbc47b02 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -42,7 +42,9 @@ def check_image(root_folder, image, name, level=0.9): score, diff = process.image_diff(expected, image) if diff is not None: cv2.imwrite(os.path.join(root_folder, f"{name}.diff.png"), diff) - assert score > level, f"{expected} ({image}) != {expected_name} ({image})" + assert ( + score > level + ), f"{root_folder}/{name}.result.png != {expected_name} => {root_folder}/{name}.diff.png ({score} > {level})" def test_crop(): From 287dcfeb2f4071c0302cbcd626c87ef5822811f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 18 Jun 2021 08:44:10 +0200 Subject: [PATCH 15/19] Fix artifacts upload --- .github/workflows/main.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 94acee90..6d17e230 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -40,25 +40,16 @@ jobs: - run: docker build --target=base --tag=sbrunner/scan-to-paperless . - run: docker build --target=tests --tag=tests . - run: docker run --rm tests prospector --output=pylint - - name: Init Docker volumes - run: | - docker run --rm --detach --name volumes --volume=tests:/tests --volume=results:/results alpine tail -f /dev/null - docker cp tests/ volumes:/tests/ - name: pytest run: > docker run --rm --env=PYTHONPATH=/opt/ - --volume=results:/results --volume=tests:/tests + --volume=$(pwd)/results:/results --volume=$(pwd)/tests:/tests tests bash -c ' cd /tests && coverage run --source=scan_to_paperless --module pytest --durations=0 --verbose --color=yes --profile --profile-svg --junitxml=/results/test-reports/junit.xml . && coverage report && coverage html --directory=/results/coverage' - - name: Extract data from Docker volumes - run: | - docker cp volumes:/results/ ./ - mkdir -p results/ - docker cp volumes:/tests/prof/ results/ - uses: actions/upload-artifact@v2 with: name: results @@ -72,7 +63,6 @@ jobs: path: results/test-reports if-no-files-found: ignore retention-days: 5 - if: failure() - run: docker build --target=all --tag=sbrunner/scan-to-paperless:latest-all . - run: docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }} From dff93416eb86e4e8c3048e60daa70bf0e98f1b72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 14:24:48 +0000 Subject: [PATCH 16/19] Bump scipy from 1.6.3 to 1.7.0 --- Pipfile | 2 +- Pipfile.lock | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Pipfile b/Pipfile index 355b5d9b..5f9b5df2 100644 --- a/Pipfile +++ b/Pipfile @@ -5,7 +5,7 @@ name = "pypi" [packages] numpy = "==1.20.3" -scipy = "==1.6.3" +scipy = "==1.7.0" scikit-image = "==0.18.1" opencv-python-headless = "==4.5.2.54" deskew = "==0.10.30" diff --git a/Pipfile.lock b/Pipfile.lock index 1a4c1b4a..985332e2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ff070635c3d30810c406baf58c35f64c8fad2e6b26401149a0be94e54bbdc14b" + "sha256": "9648da5243632bbf456f50648b320427e230e8e4d7efb28402066399884c8961" }, "pipfile-spec": 6, "requires": { @@ -393,28 +393,28 @@ }, "scipy": { "hashes": [ - "sha256:01b38dec7e9f897d4db04f8de4e20f0f5be3feac98468188a0f47a991b796055", - "sha256:10dbcc7de03b8d635a1031cb18fd3eaa997969b64fdf78f99f19ac163a825445", - "sha256:19aeac1ad3e57338723f4657ac8520f41714804568f2e30bd547d684d72c392e", - "sha256:1b21c6e0dc97b1762590b70dee0daddb291271be0580384d39f02c480b78290a", - "sha256:1caade0ede6967cc675e235c41451f9fb89ae34319ddf4740194094ab736b88d", - "sha256:23995dfcf269ec3735e5a8c80cfceaf384369a47699df111a6246b83a55da582", - "sha256:2a799714bf1f791fb2650d73222b248d18d53fd40d6af2df2c898db048189606", - "sha256:3274ce145b5dc416c49c0cf8b6119f787f0965cd35e22058fe1932c09fe15d77", - "sha256:33d1677d46111cfa1c84b87472a0274dde9ef4a7ef2e1f155f012f5f1e995d8f", - "sha256:44d452850f77e65e25b1eb1ac01e25770323a782bfe3a1a3e43847ad4266d93d", - "sha256:9e3302149a369697c6aaea18b430b216e3c88f9a61b62869f6104881e5f9ef85", - "sha256:a75b014d3294fce26852a9d04ea27b5671d86736beb34acdfc05859246260707", - "sha256:ad7269254de06743fb4768f658753de47d8b54e4672c5ebe8612a007a088bd48", - "sha256:b30280fbc1fd8082ac822994a98632111810311a9ece71a0e48f739df3c555a2", - "sha256:b79104878003487e2b4639a20b9092b02e1bad07fc4cf924b495cf413748a777", - "sha256:d449d40e830366b4c612692ad19fbebb722b6b847f78a7b701b1e0d6cda3cc13", - "sha256:d647757373985207af3343301d89fe738d5a294435a4f2aafb04c13b4388c896", - "sha256:f68eb46b86b2c246af99fcaa6f6e37c7a7a413e1084a794990b877f2ff71f7b6", - "sha256:fdf606341cd798530b05705c87779606fcdfaf768a8129c348ea94441da15b04" + "sha256:0572256c10ddd058e3d315c555538671ddb2737f27eb56189bfbc3483391403f", + "sha256:2e685fdbfa5b989af4338b29c408b9157ea6addec15d661104c437980c292be5", + "sha256:3595c8b64970c9e5a3f137fa1a9eb64da417e78fb7991d0b098b18a00b776d88", + "sha256:3e7df79b42c3015058a5554bfeab6fd4c9906c46560c9ddebb5c652840f3e182", + "sha256:4ef3d4df8af40cb6f4d4eaf7b02780109ebabeec334cda26a7899ec9d8de9176", + "sha256:53116abd5060a5b4a58489cf689bee259b779e6b7ecd4ce366e7147aa7c9626e", + "sha256:5a983d3cebc27294897951a494cebd78af2eae37facf75d9e4ad4f1f62229860", + "sha256:5eb8f054eebb351af7490bbb57465ba9662c4e16e1786655c6c7ed530eb9a74e", + "sha256:6130e22bf6ee506f7cddde7e0515296d97eb6c6c94f7ef5103c2b77aec5833a7", + "sha256:7f4b89c223bd09460b52b669e2e642cab73c28855b540e6ed029692546a86f8d", + "sha256:80df8af7039bce92fb4cd1ceb056258631b11b3c627384e2d29bb48d44c0cae7", + "sha256:821e75f5c16cd7b0ab0ffe7eb9917e5af7b48c25306b4777287de8d792a5f7f3", + "sha256:97ca4552ace1c313707058e774609af59644321e278c3a539322fab2fb09b943", + "sha256:998c5e6ea649489302de2c0bc026ed34284f531df89d2bdc8df3a0d44d165739", + "sha256:aef6e922aea6f2e6bbb539b413c85210a9ee32757535b84204ebd22723e69704", + "sha256:b77ee5e3a9507622e7f98b16122242a3903397f98d1fe3bc269d904a9025e2bc", + "sha256:bd4399d4388ca0239a4825e312b3e61b60f743dd6daf49e5870837716502a92a", + "sha256:c5d012cb82cc1dcfa72609abaabb4a4ed8113e3e8ac43464508a418c146be57d", + "sha256:e7b733d4d98e604109715e11f2ab9340eb45d53f803634ed730039070fc3bc11" ], "index": "pypi", - "version": "==1.6.3" + "version": "==1.7.0" }, "six": { "hashes": [ @@ -578,11 +578,11 @@ }, "gitpython": { "hashes": [ - "sha256:3283ae2fba31c913d857e12e5ba5f9a7772bbc064ae2bb09efafa71b0dd4939b", - "sha256:be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61" + "sha256:b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b", + "sha256:fce760879cd2aebd2991b3542876dc5c4a909b30c9d69dfc488e504a8db37ee8" ], - "markers": "python_version >= '3.4'", - "version": "==3.1.14" + "markers": "python_version >= '3.6'", + "version": "==3.1.18" }, "gprof2dot": { "hashes": [ From 694669a25da63c9e2cd05a07c079a15f0f9422a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 14:15:30 +0000 Subject: [PATCH 17/19] Bump numpy from 1.20.3 to 1.21.0 Bumps [numpy](https://github.com/numpy/numpy) from 1.20.3 to 1.21.0. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt) - [Commits](https://github.com/numpy/numpy/compare/v1.20.3...v1.21.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Pipfile | 2 +- Pipfile.lock | 101 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 73 insertions(+), 30 deletions(-) diff --git a/Pipfile b/Pipfile index 5f9b5df2..b8b6d1bc 100644 --- a/Pipfile +++ b/Pipfile @@ -4,7 +4,7 @@ verify_ssl = true name = "pypi" [packages] -numpy = "==1.20.3" +numpy = "==1.21.0" scipy = "==1.7.0" scikit-image = "==0.18.1" opencv-python-headless = "==4.5.2.54" diff --git a/Pipfile.lock b/Pipfile.lock index 985332e2..3e21b6bf 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "9648da5243632bbf456f50648b320427e230e8e4d7efb28402066399884c8961" + "sha256": "5fca9146cb476b271bd2840bdc789e609aed43063b77201d3e747f78469ed9d1" }, "pipfile-spec": 6, "requires": { @@ -163,33 +163,37 @@ }, "numpy": { "hashes": [ - "sha256:1676b0a292dd3c99e49305a16d7a9f42a4ab60ec522eac0d3dd20cdf362ac010", - "sha256:16f221035e8bd19b9dc9a57159e38d2dd060b48e93e1d843c49cb370b0f415fd", - "sha256:43909c8bb289c382170e0282158a38cf306a8ad2ff6dfadc447e90f9961bef43", - "sha256:4e465afc3b96dbc80cf4a5273e5e2b1e3451286361b4af70ce1adb2984d392f9", - "sha256:55b745fca0a5ab738647d0e4db099bd0a23279c32b31a783ad2ccea729e632df", - "sha256:5d050e1e4bc9ddb8656d7b4f414557720ddcca23a5b88dd7cff65e847864c400", - "sha256:637d827248f447e63585ca3f4a7d2dfaa882e094df6cfa177cc9cf9cd6cdf6d2", - "sha256:6690080810f77485667bfbff4f69d717c3be25e5b11bb2073e76bb3f578d99b4", - "sha256:66fbc6fed94a13b9801fb70b96ff30605ab0a123e775a5e7a26938b717c5d71a", - "sha256:67d44acb72c31a97a3d5d33d103ab06d8ac20770e1c5ad81bdb3f0c086a56cf6", - "sha256:6ca2b85a5997dabc38301a22ee43c82adcb53ff660b89ee88dded6b33687e1d8", - "sha256:6e51534e78d14b4a009a062641f465cfaba4fdcb046c3ac0b1f61dd97c861b1b", - "sha256:70eb5808127284c4e5c9e836208e09d685a7978b6a216db85960b1a112eeace8", - "sha256:830b044f4e64a76ba71448fce6e604c0fc47a0e54d8f6467be23749ac2cbd2fb", - "sha256:8b7bb4b9280da3b2856cb1fc425932f46fba609819ee1c62256f61799e6a51d2", - "sha256:a9c65473ebc342715cb2d7926ff1e202c26376c0dcaaee85a1fd4b8d8c1d3b2f", - "sha256:c1c09247ccea742525bdb5f4b5ceeacb34f95731647fe55774aa36557dbb5fa4", - "sha256:c5bf0e132acf7557fc9bb8ded8b53bbbbea8892f3c9a1738205878ca9434206a", - "sha256:db250fd3e90117e0312b611574cd1b3f78bec046783195075cbd7ba9c3d73f16", - "sha256:e515c9a93aebe27166ec9593411c58494fa98e5fcc219e47260d9ab8a1cc7f9f", - "sha256:e55185e51b18d788e49fe8305fd73ef4470596b33fc2c1ceb304566b99c71a69", - "sha256:ea9cff01e75a956dbee133fa8e5b68f2f92175233de2f88de3a682dd94deda65", - "sha256:f1452578d0516283c87608a5a5548b0cdde15b99650efdfd85182102ef7a7c17", - "sha256:f39a995e47cb8649673cfa0579fbdd1cdd33ea497d1728a6cb194d6252268e48" + "sha256:1a784e8ff7ea2a32e393cc53eb0003eca1597c7ca628227e34ce34eb11645a0e", + "sha256:2ba579dde0563f47021dcd652253103d6fd66165b18011dce1a0609215b2791e", + "sha256:3537b967b350ad17633b35c2f4b1a1bbd258c018910b518c30b48c8e41272717", + "sha256:3c40e6b860220ed862e8097b8f81c9af6d7405b723f4a7af24a267b46f90e461", + "sha256:598fe100b2948465cf3ed64b1a326424b5e4be2670552066e17dfaa67246011d", + "sha256:620732f42259eb2c4642761bd324462a01cdd13dd111740ce3d344992dd8492f", + "sha256:709884863def34d72b183d074d8ba5cfe042bc3ff8898f1ffad0209161caaa99", + "sha256:75579acbadbf74e3afd1153da6177f846212ea2a0cc77de53523ae02c9256513", + "sha256:7c55407f739f0bfcec67d0df49103f9333edc870061358ac8a8c9e37ea02fcd2", + "sha256:a1f2fb2da242568af0271455b89aee0f71e4e032086ee2b4c5098945d0e11cf6", + "sha256:a290989cd671cd0605e9c91a70e6df660f73ae87484218e8285c6522d29f6e38", + "sha256:ac4fd578322842dbda8d968e3962e9f22e862b6ec6e3378e7415625915e2da4d", + "sha256:ad09f55cc95ed8d80d8ab2052f78cc21cb231764de73e229140d81ff49d8145e", + "sha256:b9205711e5440954f861ceeea8f1b415d7dd15214add2e878b4d1cf2bcb1a914", + "sha256:bba474a87496d96e61461f7306fba2ebba127bed7836212c360f144d1e72ac54", + "sha256:bebab3eaf0641bba26039fb0b2c5bf9b99407924b53b1ea86e03c32c64ef5aef", + "sha256:cc367c86eb87e5b7c9592935620f22d13b090c609f1b27e49600cd033b529f54", + "sha256:ccc6c650f8700ce1e3a77668bb7c43e45c20ac06ae00d22bdf6760b38958c883", + "sha256:cf680682ad0a3bef56dae200dbcbac2d57294a73e5b0f9864955e7dd7c2c2491", + "sha256:d2910d0a075caed95de1a605df00ee03b599de5419d0b95d55342e9a33ad1fb3", + "sha256:d5caa946a9f55511e76446e170bdad1d12d6b54e17a2afe7b189112ed4412bb8", + "sha256:d89b0dc7f005090e32bb4f9bf796e1dcca6b52243caf1803fdd2b748d8561f63", + "sha256:d95d16204cd51ff1a1c8d5f9958ce90ae190be81d348b514f9be39f878b8044a", + "sha256:e4d5a86a5257843a18fb1220c5f1c199532bc5d24e849ed4b0289fb59fbd4d8f", + "sha256:e58ddb53a7b4959932f5582ac455ff90dcb05fac3f8dcc8079498d43afbbde6c", + "sha256:e80fe25cba41c124d04c662f33f6364909b985f2eb5998aaa5ae4b9587242cce", + "sha256:eda2829af498946c59d8585a9fd74da3f810866e05f8df03a86f70079c7531dd", + "sha256:fd0a359c1c17f00cb37de2969984a74320970e0ceef4808c32e00773b06649d9" ], "index": "pypi", - "version": "==1.20.3" + "version": "==1.21.0" }, "opencv-python-headless": { "hashes": [ @@ -480,6 +484,21 @@ ], "version": "==1.7.0" }, + "certifi": { + "hashes": [ + "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee", + "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8" + ], + "version": "==2021.5.30" + }, + "chardet": { + "hashes": [ + "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", + "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==4.0.0" + }, "coverage": { "hashes": [ "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c", @@ -590,6 +609,14 @@ ], "version": "==2021.2.21" }, + "idna": { + "hashes": [ + "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", + "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.10" + }, "iniconfig": { "hashes": [ "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", @@ -801,10 +828,10 @@ }, "pyroma": { "hashes": [ - "sha256:45ad8201da9a813b5597bb85c80bbece93af9ec89170fc2be5ad85fa9463cef1", - "sha256:a97e116b6e9f4ca4b66bdd530c9a18c1db99d4400f6eead8d9297b9205640bef" + "sha256:0fba67322913026091590e68e0d9e0d4fbd6420fcf34d315b2ad6985ab104d65", + "sha256:f8c181e0d5d292f11791afc18f7d0218a83c85cf64d6f8fb1571ce9d29a24e4a" ], - "version": "==3.1" + "version": "==3.2" }, "pytest": { "hashes": [ @@ -859,6 +886,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", "version": "==5.4.1" }, + "requests": { + "hashes": [ + "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", + "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==2.25.1" + }, "requirements-detector": { "hashes": [ "sha256:0d1e13e61ed243f9c3c86e6cbb19980bcb3a0e0619cde2ec1f3af70fdbee6f7b" @@ -918,6 +953,14 @@ ], "version": "==3.10.0.0" }, + "urllib3": { + "hashes": [ + "sha256:753a0374df26658f99d826cfe40394a686d05985786d946fbe4165b5148f5a7c", + "sha256:a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "version": "==1.26.5" + }, "wrapt": { "hashes": [ "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" From eac910d7506f3f0221dfbcadfbb40a6ee9b63dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 22 Jun 2021 17:10:31 +0200 Subject: [PATCH 18/19] Fix types --- scan_to_paperless/process.py | 73 ++++++++++++++++++++---------------- scan_to_paperless/scan.py | 2 +- setup.cfg | 1 + 3 files changed, 42 insertions(+), 34 deletions(-) diff --git a/scan_to_paperless/process.py b/scan_to_paperless/process.py index 7f2b6924..24995011 100755 --- a/scan_to_paperless/process.py +++ b/scan_to_paperless/process.py @@ -25,37 +25,44 @@ import scan_to_paperless.process_schema +if TYPE_CHECKING: + np_ndarray_int = np.ndarray[None, np.dtype[np.uint8]] # pylint: disable=unsubscriptable-object +else: + np_ndarray_int = np.ndarray # pylint: disable=invalid-name + # dither, crop, append, repage CONVERT = ["gm", "convert"] -def rotate_image(image: np.ndarray, angle: float, background: Union[int, Tuple[int, int, int]]) -> np.ndarray: +def rotate_image( + image: np_ndarray_int, angle: float, background: Union[int, Tuple[int, int, int]] +) -> np_ndarray_int: old_width, old_height = image.shape[:2] angle_radian = math.radians(angle) width = abs(np.sin(angle_radian) * old_height) + abs(np.cos(angle_radian) * old_width) height = abs(np.sin(angle_radian) * old_width) + abs(np.cos(angle_radian) * old_height) - image_center = tuple(np.array(image.shape[1::-1]) / 2) + image_center: Tuple[Any, ...] = tuple(np.array(image.shape[1::-1]) / 2) rot_mat = cv2.getRotationMatrix2D(image_center, angle, 1.0) rot_mat[1, 2] += (width - old_width) / 2 rot_mat[0, 2] += (height - old_height) / 2 return cast( - np.ndarray, + np_ndarray_int, cv2.warpAffine(image, rot_mat, (int(round(height)), int(round(width))), borderValue=background), ) def crop_image( # pylint: disable=too-many-arguments - image: np.ndarray, + image: np_ndarray_int, x: int, y: int, width: int, height: int, background: Union[Tuple[int], Tuple[int, int, int]], -) -> np.ndarray: +) -> np_ndarray_int: matrice = np.array([[1.0, 0.0, -x], [0.0, 1.0, -y]]) return cast( - np.ndarray, + np_ndarray_int, cv2.warpAffine(image, matrice, (int(round(width)), int(round(height))), borderValue=background), ) @@ -74,9 +81,9 @@ def __init__( # pylint: disable=too-many-arguments self.config_file_name = config_file_name self.root_folder = root_folder self.image_name = image_name - self.image: Optional[np.ndarray] = None - self.mask: Optional[np.ndarray] = None - self.mask_ready: Optional[np.ndarray] = None + self.image: Optional[np_ndarray_int] = None + self.mask: Optional[np_ndarray_int] = None + self.mask_ready: Optional[np_ndarray_int] = None self.process_count = self.step.get("process_count", 0) def init_mask(self) -> None: @@ -94,7 +101,7 @@ def get_process_count(self) -> int: finally: self.process_count += 1 - def get_masked(self) -> np.ndarray: + def get_masked(self) -> np_ndarray_int: if self.image is None: raise Exception("The image is None") if self.mask_ready is None: @@ -163,7 +170,7 @@ def output(cmd: Union[str, List[str]], **kwargs: Any) -> str: return cast(bytes, subprocess.check_output(cmd, stderr=subprocess.PIPE, **kwargs)).decode() # nosec -def image_diff(image1: np.ndarray, image2: np.ndarray) -> Tuple[float, np.ndarray]: +def image_diff(image1: np_ndarray_int, image2: np_ndarray_int) -> Tuple[float, np_ndarray_int]: width = max(image1.shape[1], image2.shape[1]) height = max(image1.shape[0], image2.shape[0]) image1 = cv2.resize(image1, (width, height)) @@ -179,7 +186,7 @@ def image_diff(image1: np.ndarray, image2: np.ndarray) -> Tuple[float, np.ndarra from typing_extensions import Protocol class FunctionWithContextReturnsImage(Protocol): - def __call__(self, context: Context) -> Optional[np.ndarray]: + def __call__(self, context: Context) -> Optional[np_ndarray_int]: pass class FunctionWithContextReturnsNone(Protocol): @@ -274,12 +281,12 @@ def wrapper(context: Context) -> None: def external(func: ExternalFunction) -> FunctionWithContextReturnsImage: - def wrapper(context: Context) -> Optional[np.ndarray]: + def wrapper(context: Context) -> Optional[np_ndarray_int]: source = tempfile.NamedTemporaryFile(suffix=".png") cv2.imwrite(source.name, context.image) destination = tempfile.NamedTemporaryFile(suffix=".png") func(context, source.name, destination.name) - return cast(np.ndarray, cv2.imread(destination.name)) + return cast(np_ndarray_int, cv2.imread(destination.name)) return wrapper @@ -318,12 +325,12 @@ def crop(context: Context, margin_horizontal: int = 25, margin_vertical: int = 2 @Process("level") -def level(context: Context) -> np.ndarray: +def level(context: Context) -> np_ndarray_int: img_yuv = cv2.cvtColor(context.image, cv2.COLOR_BGR2YUV) if context.config["args"].get("auto_level"): img_yuv[:, :, 0] = cv2.equalizeHist(img_yuv[:, :, 0]) - return cast(np.ndarray, cv2.cvtColor(img_yuv, cv2.COLOR_YUV2BGR)) + return cast(np_ndarray_int, cv2.cvtColor(img_yuv, cv2.COLOR_YUV2BGR)) level_ = context.config["args"].get("level") min_p100 = 0.0 max_p100 = 100.0 @@ -342,14 +349,14 @@ def level(context: Context) -> np.ndarray: chanel_y = img_yuv[:, :, 0] mins = np.zeros(chanel_y.shape) - maxs = np.zeros(chanel_y.shape) + 255 + maxs: np_ndarray_int = np.zeros(chanel_y.shape) + 255 values = (chanel_y - min_) / (max_ - min_) * 255 img_yuv[:, :, 0] = np.minimum(maxs, np.maximum(mins, values)) - return cast(np.ndarray, cv2.cvtColor(img_yuv, cv2.COLOR_YUV2BGR)) + return cast(np_ndarray_int, cv2.cvtColor(img_yuv, cv2.COLOR_YUV2BGR)) -def draw_angle(image: np.ndarray, angle: float, color: Tuple[int, int, int]) -> None: +def draw_angle(image: np_ndarray_int, angle: float, color: Tuple[int, int, int]) -> None: angle = angle % 90 height, width = image.shape[:2] center = (int(width / 2), int(height / 2)) @@ -359,7 +366,7 @@ def draw_angle(image: np.ndarray, angle: float, color: Tuple[int, int, int]) -> sin_a = np.sin(angle_radian) * length cos_a = np.cos(angle_radian) * length for matrix in ([[0, -1], [-1, 0]], [[1, 0], [0, -1]], [[0, 1], [1, 0]], [[-1, 0], [0, 1]]): - diff = np.dot(matrix, [sin_a, cos_a]) + diff = np.dot(matrix, [sin_a, cos_a]) # type: ignore x = diff[0] + width / 2 y = diff[1] + height / 2 @@ -382,7 +389,7 @@ def deskew(context: Context) -> None: image_status = context.config["images_status"][context.image_name] image = context.get_masked() grayscale = rgb2gray(image) - image = cast(np.ndarray, context.image).copy() + image = cast(np_ndarray_int, context.image).copy() angle, angles, average_deviation, _ = determine_skew_dev(grayscale) if angle is not None: @@ -426,13 +433,13 @@ def docrop(context: Context) -> None: @Process("sharpen") -def sharpen(context: Context) -> Optional[np.ndarray]: +def sharpen(context: Context) -> Optional[np_ndarray_int]: if context.config["args"].get("sharpen", False) is False: return None if context.image is None: raise Exception("The image is required") image = cv2.GaussianBlur(context.image, (0, 0), 3) - return cast(np.ndarray, cv2.addWeighted(context.image, 1.5, image, -0.5, 0)) + return cast(np_ndarray_int, cv2.addWeighted(context.image, 1.5, image, -0.5, 0)) @Process("dither") @@ -453,7 +460,7 @@ def autorotate(context: Context) -> None: def draw_line( # pylint: disable=too-many-arguments - image: np.ndarray, vertical: bool, position: float, value: int, name: str, type_: str + image: np_ndarray_int, vertical: bool, position: float, value: int, name: str, type_: str ) -> scan_to_paperless.process_schema.Limit: img_len = image.shape[0 if vertical else 1] color = (255, 0, 0) if vertical else (0, 255, 0) @@ -466,7 +473,7 @@ def draw_line( # pylint: disable=too-many-arguments return {"name": name, "type": type_, "value": int(position), "vertical": vertical, "margin": 0} -def find_lines(image: np.ndarray, vertical: bool) -> Tuple[np.ndarray, Dict[str, np.ndarray]]: +def find_lines(image: np_ndarray_int, vertical: bool) -> Tuple[np_ndarray_int, Dict[str, np_ndarray_int]]: gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY) edges = cv2.Canny(gray, 50, 150, apertureSize=3) lines = cv2.HoughLinesP( @@ -495,16 +502,16 @@ def find_lines(image: np.ndarray, vertical: bool) -> Tuple[np.ndarray, Dict[str, return peaks, properties -def zero_ranges(values: np.ndarray) -> np.ndarray: +def zero_ranges(values: np_ndarray_int) -> np_ndarray_int: # Create an array that is 1 where a is 0, and pad each end with an extra 0. - iszero = np.concatenate(([0], np.equal(values, 0).view(np.int8), [0])) - absdiff = np.abs(np.diff(iszero)) + iszero = np.concatenate(([0], np.equal(values, 0).view(np.int8), [0])) # type: ignore + absdiff = np.abs(np.diff(iszero)) # type: ignore # Runs start and end where absdiff is 1. ranges = np.where(absdiff == 1)[0].reshape(-1, 2) - return cast(np.ndarray, ranges) + return cast(np_ndarray_int, ranges) -def find_limit_contour(image: np.ndarray, vertical: bool) -> List[int]: +def find_limit_contour(image: np_ndarray_int, vertical: bool) -> List[int]: contours = find_contours(image) image_size = image.shape[1 if vertical else 0] @@ -523,7 +530,7 @@ def find_limit_contour(image: np.ndarray, vertical: bool) -> List[int]: return result -def fill_limits(image: np.ndarray, vertical: bool) -> List[scan_to_paperless.process_schema.Limit]: +def fill_limits(image: np_ndarray_int, vertical: bool) -> List[scan_to_paperless.process_schema.Limit]: peaks, properties = find_lines(image, vertical) contours = find_limit_contour(image, vertical) third_image_size = int(image.shape[0 if vertical else 1] / 3) @@ -551,7 +558,7 @@ def fill_limits(image: np.ndarray, vertical: bool) -> List[scan_to_paperless.pro return limits -def find_contours(image: np.ndarray, min_size: int = 32) -> List[Tuple[int, int, int, int]]: +def find_contours(image: np_ndarray_int, min_size: int = 32) -> List[Tuple[int, int, int, int]]: gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY) # Clean the image using otsu method with the inversed binarized image @@ -676,7 +683,7 @@ def save(root_folder: str, img: str, folder: str, force: bool = False) -> str: def save_image( - image: np.ndarray, root_folder: str, folder: str, name: str, force: bool = False + image: np_ndarray_int, root_folder: str, folder: str, name: str, force: bool = False ) -> Optional[str]: if force or os.environ.get("PROGRESS") == "TRUE": dest_folder = os.path.join(root_folder, folder) diff --git a/scan_to_paperless/scan.py b/scan_to_paperless/scan.py index a594dd2d..fb727746 100755 --- a/scan_to_paperless/scan.py +++ b/scan_to_paperless/scan.py @@ -129,7 +129,7 @@ def add_argument(name: str, choices: Optional[List[str]] = None, **kwargs: Any) if img not in odd: path = os.path.join(root_folder, img) image = io.imread(path) - image = np.rot90(image, 2) + image = np.rot90(image, 2) # type: ignore io.imsave(path, image.astype(np.uint8)) else: call(scanimage) diff --git a/setup.cfg b/setup.cfg index 7df8b1b5..162712a6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,3 +14,4 @@ warn_redundant_casts = True warn_unused_ignores = True warn_return_any = True strict = True +plugins = numpy.typing.mypy_plugin From 577516a92b29befb6b370e658edbfad69245b8b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 14:16:43 +0000 Subject: [PATCH 19/19] Bump c2cciutils from 1.1.dev20210617081616 to 1.1.dev20210623154317 --- ci/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements.txt b/ci/requirements.txt index e75b1093..85945ab7 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,2 +1,2 @@ -c2cciutils==1.1.dev20210617081616 +c2cciutils==1.1.dev20210623154317 jsonschema2md==0.2.0.post1