From 367a8bf5ebcc27e1257095bb0fcbb71c4ef92011 Mon Sep 17 00:00:00 2001 From: Marco Rubin <20150305+Rubo3@users.noreply.github.com> Date: Mon, 4 Sep 2023 19:26:02 +0000 Subject: [PATCH 1/6] Create pyproject.toml --- pyproject.toml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..207071e42 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,42 @@ +[project] +name = "easyocr" +version = "1.7.1" +description = "End-to-End Multi-Lingual Optical Character Recognition (OCR) Solution" +authors = [ + {name="Rakpong Kittinaradorn", email="r.kittinaradorn@gmail.com"}, +] +license = {text = "Apache-2.0"} +readme = "README.md" +classifiers = [ + "Development Status :: 5 - Production/Stable" +] +keywords = ["ocr", "optical character recognition", "deep learning", "neural network"] +dependencies = [ + "torch", + "torchvision >= 0.5", + "opencv-python-headless", + "scipy", + "numpy", + "Pillow", + "scikit-image", + "python-bidi", + "PyYAML", + "Shapely", + "pyclipper", + "ninja", +] +scripts = {easyocr="easyocr.cli:main"} + +[project.urls] +Homepage = "https://github.com/JaidedAI/EasyOCR" +Documentation = "https://www.jaided.ai/easyocr/documentation/" +Repository = "https://github.com/JaidedAI/EasyOCR.git" +Changelog = "https://github.com/JaidedAI/EasyOCR/blob/master/releasenotes.md" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[tool.setuptools.packages.find] +exclude = ["trainer*"] +namespaces = false From 14aa7404793f6dfd4c247c5184a9ed9e039f2d35 Mon Sep 17 00:00:00 2001 From: Marco Rubin <20150305+Rubo3@users.noreply.github.com> Date: Mon, 4 Sep 2023 19:26:36 +0000 Subject: [PATCH 2/6] Delete setup.py --- setup.py | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index c7d7c4bf6..000000000 --- a/setup.py +++ /dev/null @@ -1,35 +0,0 @@ -""" -End-to-End Multi-Lingual Optical Character Recognition (OCR) Solution -""" -from io import open -from setuptools import setup - -with open('requirements.txt', encoding="utf-8-sig") as f: - requirements = f.readlines() - -def readme(): - with open('README.md', encoding="utf-8-sig") as f: - README = f.read() - return README - -setup( - name='easyocr', - packages=['easyocr'], - include_package_data=True, - version='1.7.1', - install_requires=requirements, - entry_points={"console_scripts": ["easyocr= easyocr.cli:main"]}, - license='Apache License 2.0', - description='End-to-End Multi-Lingual Optical Character Recognition (OCR) Solution', - long_description=readme(), - long_description_content_type="text/markdown", - author='Rakpong Kittinaradorn', - author_email='r.kittinaradorn@gmail.com', - url='https://github.com/jaidedai/easyocr', - download_url='https://github.com/jaidedai/easyocr.git', - keywords=['ocr optical character recognition deep learning neural network'], - classifiers=[ - 'Development Status :: 5 - Production/Stable' - ], - -) From 0be355c212b1c287c71b345b4d1673e11b392596 Mon Sep 17 00:00:00 2001 From: Marco Rubin <20150305+Rubo3@users.noreply.github.com> Date: Mon, 4 Sep 2023 19:26:44 +0000 Subject: [PATCH 3/6] Delete setup.cfg --- setup.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 08aedd7e6..000000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[metadata] -description_file = README.md From cff05816350a9f8a693b19b6efd0869279558e5a Mon Sep 17 00:00:00 2001 From: Marco Rubin <20150305+Rubo3@users.noreply.github.com> Date: Mon, 4 Sep 2023 19:26:51 +0000 Subject: [PATCH 4/6] Delete requirements.txt --- requirements.txt | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 9d0fb7b71..000000000 --- a/requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -torch -torchvision>=0.5 -opencv-python-headless -scipy -numpy -Pillow -scikit-image -python-bidi -PyYAML -Shapely -pyclipper -ninja From 7e1441d26eeb2e80439780bb712dee53fc158e28 Mon Sep 17 00:00:00 2001 From: Marco Rubin <20150305+Rubo3@users.noreply.github.com> Date: Mon, 4 Sep 2023 20:01:37 +0000 Subject: [PATCH 5/6] Remove warnings about packages not specified --- pyproject.toml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 207071e42..222675c77 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,28 +2,24 @@ name = "easyocr" version = "1.7.1" description = "End-to-End Multi-Lingual Optical Character Recognition (OCR) Solution" -authors = [ - {name="Rakpong Kittinaradorn", email="r.kittinaradorn@gmail.com"}, -] +authors = [{name="Rakpong Kittinaradorn", email="r.kittinaradorn@gmail.com"}] license = {text = "Apache-2.0"} readme = "README.md" -classifiers = [ - "Development Status :: 5 - Production/Stable" -] +classifiers = ["Development Status :: 5 - Production/Stable"] keywords = ["ocr", "optical character recognition", "deep learning", "neural network"] dependencies = [ - "torch", - "torchvision >= 0.5", - "opencv-python-headless", - "scipy", + "ninja", "numpy", + "opencv-python-headless", "Pillow", - "scikit-image", - "python-bidi", + "pyclipper", "PyYAML", + "python-bidi", + "scikit-image", + "scipy", "Shapely", - "pyclipper", - "ninja", + "torch", + "torchvision >= 0.5", ] scripts = {easyocr="easyocr.cli:main"} @@ -38,5 +34,4 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [tool.setuptools.packages.find] -exclude = ["trainer*"] -namespaces = false +exclude = ["build*", "trainer*", "unit_test*"] From 7d7890748f479898dacbb5c2b8c579e7ab1c054b Mon Sep 17 00:00:00 2001 From: Marco Rubin <20150305+Rubo3@users.noreply.github.com> Date: Mon, 4 Sep 2023 20:02:19 +0000 Subject: [PATCH 6/6] sort dependencies --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 222675c77..4b67eb34d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,8 +13,8 @@ dependencies = [ "opencv-python-headless", "Pillow", "pyclipper", - "PyYAML", "python-bidi", + "PyYAML", "scikit-image", "scipy", "Shapely",