From 44b477c3ad923a3c598ca19b45e5a4b249703e62 Mon Sep 17 00:00:00 2001
From: rafelafrance <raphael.lafrance@gmail.com>
Date: Fri, 9 Feb 2024 09:02:51 -0500
Subject: [PATCH] Remove setup.py

---
 README.md                                     | 12 +++----
 finder/__finder_label_babel_reconcile.py      |  3 +-
 finder/__finder_rise_of_machines_build.py     |  3 +-
 finder/__finder_rise_of_machines_reconcile.py |  3 +-
 finder/yolo_inference_data.py                 |  3 +-
 finder/yolo_results_to_labels.py              |  3 +-
 finder/yolo_training_data.py                  |  3 +-
 pyproject.toml                                | 10 ++++--
 setup.py                                      | 34 -------------------
 tests/pylib/test_box_calc.py                  |  4 +--
 10 files changed, 26 insertions(+), 52 deletions(-)
 delete mode 100755 setup.py

diff --git a/README.md b/README.md
index caa0ab5..891caf1 100644
--- a/README.md
+++ b/README.md
@@ -12,16 +12,14 @@ We find labels with a custom trained YOLOv7 model (https://github.com/WongKinYiu
 - All other identified labels are outlined in teal.
 
 Local scripts:
-- `build_training_data.py`: This formats images of herbarium sheets to prepare them for training a YOLO model.
+- `fix-herbarium-sheet-names`: I had a problem where herbarium sheet file names were given as URLs and it confused the Pillow (PIL) module so I renamed the files to remove problem characters. You may not need this script.
+- `yolo-training`: If you are training your own YOLO7 model then you may want to use this script to prepare the images of herbarium sheets for training. The herbarim images may be in all sorts of sizes, and model training requires that they're all uniformly sized.
   - This script also requires a CSV file containing the paths to the herbarium sheets and the class and location of the labels on that sheet.
-- `build_inference_data.py`: This formats herbarium sheet images for YOLO inference.
-  - It requires a CSV file containing the paths to all of the herbarium sheets.
-- `results_to_labels.py`: This takes for output of the YOLO model and creates label images. The label name contains information about the YOLO results. The label name format:
+- `yolo-inference`: Prepare herbarium sheet image for inference; i.e. finding labels. The images must be in the same size the training data.
+- `yolo-results-to-labels`: This takes for output of the YOLO model and creates label images. The label name contains information about the YOLO results. The label name format:
   - `<sheet name>_<label class>_<left pixel>_<top pixel>_<right pixel>_<bottom pixel>.jpg`
   - For example: `my-herbarium-sheet_typewritten_2261_3580_3397_4611.jpg`
-- `filter_labels.py`: Move typewritten label images into a separate directory.
-- `fix_file_names.py`: I had a problem where herbarium sheet file names were given as URLs and it confused the Pillow (PIL) module so I renamed the files to remove problem characters. You probably won't need this.
-- `old_*.py`: These modules are for ingesting training data from Zooniverse "expeditions". They are old and need to be rewritten.
+- `filter_labels.py`: Move typewritten label images into a separate directory that are then available for further processing.
 
 You will notice that there are no scripts for running the YOLO models directly. You will need to download that repository separately and run its scripts. Example invocations of YOLO scripts are below:
 
diff --git a/finder/__finder_label_babel_reconcile.py b/finder/__finder_label_babel_reconcile.py
index 8cacb84..5b1b155 100755
--- a/finder/__finder_label_babel_reconcile.py
+++ b/finder/__finder_label_babel_reconcile.py
@@ -17,9 +17,10 @@
 import textwrap
 from pathlib import Path
 
-from pylib.rise_of_machines import reconcile_expedition
 from util.pylib import log
 
+from finder.pylib.rise_of_machines import reconcile_expedition
+
 
 def main():
     log.started()
diff --git a/finder/__finder_rise_of_machines_build.py b/finder/__finder_rise_of_machines_build.py
index 5edc5b1..4951d5b 100755
--- a/finder/__finder_rise_of_machines_build.py
+++ b/finder/__finder_rise_of_machines_build.py
@@ -4,9 +4,10 @@
 import textwrap
 from pathlib import Path
 
-from pylib.finder.rise_of_machines import build_expedition
 from traiter.pylib import log
 
+from finder.pylib.finder.rise_of_machines import build_expedition
+
 
 def main():
     log.started()
diff --git a/finder/__finder_rise_of_machines_reconcile.py b/finder/__finder_rise_of_machines_reconcile.py
index fa39d3f..b032132 100755
--- a/finder/__finder_rise_of_machines_reconcile.py
+++ b/finder/__finder_rise_of_machines_reconcile.py
@@ -3,9 +3,10 @@
 import textwrap
 from pathlib import Path
 
-from pylib.finder.rise_of_machines import reconcile_expedition
 from traiter.pylib import log
 
+from finder.pylib.finder.rise_of_machines import reconcile_expedition
+
 
 def main():
     args = parse_args()
diff --git a/finder/yolo_inference_data.py b/finder/yolo_inference_data.py
index cdd35de..efe0554 100755
--- a/finder/yolo_inference_data.py
+++ b/finder/yolo_inference_data.py
@@ -3,9 +3,10 @@
 import textwrap
 from pathlib import Path
 
-from pylib.yolo import inference_data
 from util.pylib import log
 
+from finder.pylib.yolo import inference_data
+
 
 def main():
     log.started()
diff --git a/finder/yolo_results_to_labels.py b/finder/yolo_results_to_labels.py
index 03bb345..b3a0f0b 100755
--- a/finder/yolo_results_to_labels.py
+++ b/finder/yolo_results_to_labels.py
@@ -3,9 +3,10 @@
 import textwrap
 from pathlib import Path
 
-from pylib.yolo import yolo_to_labels
 from util.pylib import log
 
+from finder.pylib.yolo import yolo_to_labels
+
 
 def main():
     log.started()
diff --git a/finder/yolo_training_data.py b/finder/yolo_training_data.py
index 0deb9a8..fd01f82 100755
--- a/finder/yolo_training_data.py
+++ b/finder/yolo_training_data.py
@@ -3,9 +3,10 @@
 import textwrap
 from pathlib import Path
 
-from pylib.yolo import training_data
 from util.pylib import log
 
+from finder.pylib.yolo import training_data
+
 
 def main():
     log.started()
diff --git a/pyproject.toml b/pyproject.toml
index d0fa66c..dc5355c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,7 +28,6 @@ optional-dependencies.dev = [
     "build",
     "pre-commit",
     "pre-commit-hooks",
-    "python-lsp-server[all]",
     "ruff",
     "ruff-lsp",
 ]
@@ -36,13 +35,18 @@ optional-dependencies.dev = [
 [project.scripts]
 fix-herbarium-sheet-names = "finder.fix_herbarium_sheet_names:main"
 get-typewritten-labels = "finder.get_typewritten_labels:main"
-yolo-training = "finder.yolo_training:main"
-yolo-inference = "finder.yolo_inference:main"
+yolo-training = "finder.yolo_training_data:main"
+yolo-inference = "finder.yolo_inference_data:main"
 yolo-results-to-labels = "finder.yolo_results_to_labels:main"
 
 [tool.setuptools]
 py-modules = []
 
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["finder"]
+namespaces = false
+
 [tool.ruff]
 target-version = "py311"
 
diff --git a/setup.py b/setup.py
deleted file mode 100755
index 8bc6cd1..0000000
--- a/setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-import tomllib
-from distutils.core import setup
-from pathlib import Path
-
-from setuptools import find_packages
-
-
-def read_pyproject():
-    with Path("pyproject.toml").open("rb") as in_file:
-        settings = tomllib.load(in_file)
-    return settings
-
-
-SETTINGS = read_pyproject()
-
-
-def license_():
-    with Path("LICENSE").open() as in_file:
-        return in_file.read()
-
-
-setup(
-    name=SETTINGS["project"]["name"],
-    version=SETTINGS["project"]["version"],
-    packages=find_packages(),
-    install_requires=SETTINGS["project"]["dependencies"],
-    include_package_data=True,
-    description=SETTINGS["project"]["description"],
-    long_description=SETTINGS["project"]["readme"],
-    license=license_(),
-    url="https://github.com/rafelafrance/label_finder",
-    python_requires=">=3.11",
-)
diff --git a/tests/pylib/test_box_calc.py b/tests/pylib/test_box_calc.py
index 2788a09..487efd4 100644
--- a/tests/pylib/test_box_calc.py
+++ b/tests/pylib/test_box_calc.py
@@ -5,7 +5,7 @@
 import numpy.testing as npt
 import torch
 
-import finder.pylib.old_box_calc as calc
+from finder.pylib import old_box_calc as calc
 
 
 class TestBoxCalc(unittest.TestCase):
@@ -22,7 +22,7 @@ def test_iou_02(self):
         self.assertEqual(calc.iou(box1, box2), 0.0)
 
     def test_iou_03(self):
-        """It handles one box inside of another box."""
+        """It handles one box inside another box."""
         box1 = [0, 0, 10, 10]
         box2 = [0, 0, 5, 5]
         ii1 = 10.0 * 10.0