Mercury to main (#73)

Co-authored-by: ckirkman-IDM <ckirkman@idmod.org>
Co-authored-by: Clark Kirkman IV <clark.kirkman@gatesfoundation.org>

Author: kfrey-idm

.github/workflows/tests_all.yml

@@ -19,7 +19,7 @@ jobs:
       max-parallel: 8
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v6
@@ -34,12 +34,12 @@ jobs:
         shell: bash
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install .[test]
-      - name: Run unit tests
+          python3 -m pip install --upgrade pip
+          python3 -m pip install .[test]
+      - name: Run tests
         run: |
           cd tests
-          python -m pytest --dist loadfile -v --junitxml="test_results.xml"
+          python3 -m pytest --dist loadfile -v --junitxml="test_results.xml"
       - name: Upload emodpy test results
         uses: actions/upload-artifact@v6
         if: failure()

emod_api/.dtk_tools/demographics/DemographicsGeneratorConcern.py

@@ -10,7 +10,7 @@
 # from dtk.generic.demographics import distribution_types
 # from dtk.tools.demographics.Node import Node
 from emod_api.demographics.demographics import distribution_types
-from emod_api.demographics.Node import Node
+from emod_api.demographics.node import Node
 
 
 class DemographicsGeneratorConcern:

emod_api/.dtk_tools/demographics/DemographicsHelperFunctions.py

@@ -7,7 +7,7 @@
 import json
 from copy import deepcopy
 
-from emod_api.demographics.Node import Node
+from emod_api.demographics.node import Node
 from emod_api.demographics.DemographicsFile import DemographicsFile
 
 ##Most everything in here needs to be updated or refactored for future purposes

emod_api/__init__.py

@@ -1,13 +1 @@
-"""
-To generate a config.json from a param_overrides.json (or params-of-interest.json):
-    python -m emod_api.config.from_overrides </path/to/po.json>
-
-To generate a default config.json based on the schema for a given Eradication binary:
-    python -m emod_api.config.from_schema -e </path/to/Eradication.[exe]> ...
-
-To generate a schema.json:
-    python -m emod_api.schema.get_schema </path/to/Eradication[.exe]>
-
-For rest of emod-api documentation, please go to https://github.com/InstituteforDiseaseModeling/emod-api
-"""
-__version__ = "2.0.44"
+__version__ = "3.0.0"