Merge branch 'main' of github.com:jatkinson1000/archeryutils

.github/workflows/coverage.yaml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/setup-python@v4
       with:
         python-version: "3.11"
-    - run: pip install pytest coverage
+    - run: pip install pytest pytest-mock coverage
            pip install .
 
     # annotate each step with `if: always` to run all regardless

.github/workflows/testing.yaml

@@ -28,10 +28,10 @@ jobs:
         include:
         - os: ubuntu-latest
           python-version: "3.9"
-        - os: ubuntu-latest
-          python-version: "3.8"
-        - os: ubuntu-latest
-          python-version: "3.7"
+        # - os: ubuntu-latest
+        #   python-version: "3.8"
+        # - os: ubuntu-latest
+        #   python-version: "3.7"
 
     steps:
     - uses: actions/checkout@v3

README.md

@@ -1,7 +1,7 @@
 # archeryutils
 
 ![GitHub](https://img.shields.io/github/license/jatkinson1000/archeryutils)
-[![Python 3.7+](https://img.shields.io/badge/python-3.7+-blue.svg)](https://www.python.org/downloads/)
+[![Python 3.9+](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/)
 ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/jatkinson1000/archeryutils/testing.yaml)
 [![codecov](https://codecov.io/gh/jatkinson1000/archeryutils/branch/main/graph/badge.svg?token=AZU7G6H8T0)](https://codecov.io/gh/jatkinson1000/archeryutils)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

archeryutils/__init__.py

@@ -1,7 +1,7 @@
 """Package providing code for various archery utilities."""
 from archeryutils import load_rounds, rounds, targets
 from archeryutils.handicaps import handicap_equations, handicap_functions
-from archeryutils.classifications import classifications
+from archeryutils import classifications
 
 __all__ = [
     "rounds",

archeryutils/classifications/AGB_bowstyles.json

@@ -1,26 +1,45 @@
 [
   {"bowstyle" : "Compound",
-   "datum" : 15,
-   "classStep" : 6,
-   "genderStep" : 4,
-   "ageStep" : 6
+   "datum_out" : 15,
+   "classStep_out" : 6,
+   "genderStep_out" : 4,
+   "ageStep_out" : 6,
+   "datum_in" : 11,
+   "classStep_in" : 8,
+   "genderStep_in" : 4,
+   "ageStep_in" : 6
   },
   {"bowstyle" : "Recurve",
-   "datum" : 30,
-   "classStep" : 7,
-   "genderStep" : 5,
-   "ageStep" : 6.5
+   "datum_out" : 30,
+   "classStep_out" : 7,
+   "genderStep_out" : 5,
+   "ageStep_out" : 6.5,
+   "datum_in" : 28,
+   "classStep_in" : 7.5,
+   "genderStep_in" : 5,
+   "ageStep_in" : 6.5
+
   },
   {"bowstyle" : "Barebow",
-   "datum" : 47,
-   "classStep" : 5.5,
-   "genderStep" : 5.5,
-   "ageStep" : 5.5
+   "datum_out" : 47,
+   "classStep_out" : 5.5,
+   "genderStep_out" : 5.5,
+   "ageStep_out" : 5.5,
+   "datum_in" : 42,
+   "classStep_in" : 6.0,
+   "genderStep_in" : 5.5,
+   "ageStep_in" : 5.5
+
   },
   {"bowstyle" : "Longbow",
-   "datum" : 65,
-   "classStep" : 6,
-   "genderStep" : 7,
-   "ageStep" : 6
+   "datum_out" : 65,
+   "classStep_out" : 6,
+   "genderStep_out" : 7,
+   "ageStep_out" : 6,
+   "datum_in" : 61,
+   "classStep_in" : 6.5,
+   "genderStep_in" : 7,
+   "ageStep_in" : 6
+
   }
 ]

archeryutils/classifications/AGB_classes_in.json

@@ -0,0 +1,13 @@
+{
+  "location": "indoor",
+  "classes" : ["I-GMB", "I-MB", "I-B1", "I-B2", "I-B3", "I-A1", "I-A2", "I-A3"],
+  "classes_long" : ["Indoor Grand Master Bowman",
+                    "Indoor Master Bowman",
+                    "Indoor Bowman 1",
+                    "Indoor Bowman 2",
+                    "Indoor Bowman 3",
+                    "Indoor Archer 1",
+                    "Indoor Archer 2",
+                    "Indoor Archer 3"
+  ]
+}

archeryutils/classifications/AGB_classes.json → archeryutils/classifications/AGB_classes_out.json

@@ -1,4 +1,5 @@
 {
+  "location": "outdoor",
   "classes" : ["EMB", "GMB", "MB", "B1", "B2", "B3", "A1", "A2", "A3"],
   "classes_long" : ["Elite Master Bowman",
                     "Grand Master Bowman",

archeryutils/classifications/__init__.py

@@ -1 +1,28 @@
 """Module providing various classification functionalities."""
+from .agb_outdoor_classifications import (
+    calculate_agb_outdoor_classification,
+    agb_outdoor_classification_scores,
+)
+from .agb_indoor_classifications import (
+    calculate_agb_indoor_classification,
+    agb_indoor_classification_scores,
+)
+from .agb_old_indoor_classifications import (
+    calculate_agb_old_indoor_classification,
+    agb_old_indoor_classification_scores,
+)
+from .agb_field_classifications import (
+    calculate_agb_field_classification,
+    agb_field_classification_scores,
+)
+
+__all__ = [
+    "calculate_agb_outdoor_classification",
+    "agb_outdoor_classification_scores",
+    "calculate_agb_indoor_classification",
+    "agb_indoor_classification_scores",
+    "calculate_agb_old_indoor_classification",
+    "agb_old_indoor_classification_scores",
+    "calculate_agb_field_classification",
+    "agb_field_classification_scores",
+]