Moving all py files in emod-api to down_case.py style from DownCase.py (Fix #33) (#38)

ckirkman-IDM · web-flow · commit 4f42f63e9321 · 2025-11-03T09:15:34.000-08:00
diff --git a/emod_api/.dtk_tools/demographics/DemographicsGeneratorConcern.py b/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:
diff --git a/emod_api/.dtk_tools/demographics/DemographicsHelperFunctions.py b/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
diff --git a/emod_api/demographics/age_distribution.py b/emod_api/demographics/age_distribution.py
@@ -2,7 +2,7 @@
 
 import emod_api.demographics.demographic_exceptions as demog_ex
 
-from emod_api.demographics.Updateable import Updateable
+from emod_api.demographics.updateable import Updateable
 from emod_api.utils import check_dimensionality
 
 
diff --git a/emod_api/demographics/age_distribution_old.py b/emod_api/demographics/age_distribution_old.py
@@ -1,6 +1,6 @@
 from typing import List
 
-from emod_api.demographics.Updateable import Updateable
+from emod_api.demographics.updateable import Updateable
 
 
 class AgeDistributionOld(Updateable):
diff --git a/emod_api/demographics/base_input_file.py b/emod_api/demographics/base_input_file.py
diff --git a/emod_api/demographics/demographics.py b/emod_api/demographics/demographics.py
@@ -11,9 +11,9 @@
 
 from typing import List, Dict
 
-from emod_api.demographics import DemographicsTemplates as DT
-from emod_api.demographics.Node import Node
-from emod_api.demographics.PropertiesAndAttributes import NodeAttributes
+from emod_api.demographics import demographics_templates as DT
+from emod_api.demographics.node import Node
+from emod_api.demographics.properties_and_attributes import NodeAttributes
 from emod_api.demographics.demographics_base import DemographicsBase
 from emod_api.demographics.service import service
 
diff --git a/emod_api/demographics/demographics_base.py b/emod_api/demographics/demographics_base.py
@@ -14,10 +14,10 @@
 from sklearn.pipeline import make_pipeline
 from sklearn.preprocessing import StandardScaler
 
-from emod_api.demographics import DemographicsTemplates as DT
-from emod_api.demographics.BaseInputFile import BaseInputFile
-from emod_api.demographics.DemographicsTemplates import CrudeRate, YearlyRate
-from emod_api.demographics.Node import Node
+from emod_api.demographics import demographics_templates as DT
+from emod_api.demographics.base_input_file import BaseInputFile
+from emod_api.demographics.demographics_templates import CrudeRate, YearlyRate
+from emod_api.demographics.node import Node
 from emod_api.demographics.age_distribution_old import AgeDistributionOld as AgeDistribution
 from emod_api.demographics.demographic_exceptions import InvalidNodeIdException
 from emod_api.demographics.mortality_distribution_old import MortalityDistributionOld as MortalityDistribution
diff --git a/emod_api/demographics/demographics_generator.py b/emod_api/demographics/demographics_generator.py
@@ -9,8 +9,8 @@
     DemographicsGeneratorConcern,
     DemographicsGeneratorConcernChain,
 )
-from emod_api.demographics.Node import Node, nodeid_from_lat_lon
-from emod_api.demographics.Demographics import Demographics
+from emod_api.demographics.node import Node, nodeid_from_lat_lon
+from emod_api.demographics.demographics import Demographics
 from emod_api.dtk_tools.support.General import init_logging
 
 logger = init_logging("DemographicsGenerator")
diff --git a/emod_api/demographics/demographics_templates.py b/emod_api/demographics/demographics_templates.py
diff --git a/emod_api/demographics/fertility_distribution.py b/emod_api/demographics/fertility_distribution.py
@@ -2,7 +2,7 @@
 
 import emod_api.demographics.demographic_exceptions as demog_ex
 
-from emod_api.demographics.Updateable import Updateable
+from emod_api.demographics.updateable import Updateable
 from emod_api.utils import check_dimensionality
 
 
diff --git a/emod_api/demographics/fertility_distribution_old.py b/emod_api/demographics/fertility_distribution_old.py
@@ -1,6 +1,6 @@
 from typing import List, Any
 
-from emod_api.demographics.Updateable import Updateable
+from emod_api.demographics.updateable import Updateable
 
 
 class FertilityDistributionOld(Updateable):
diff --git a/emod_api/demographics/mortality_distribution.py b/emod_api/demographics/mortality_distribution.py
@@ -1,7 +1,7 @@
 from typing import List, Dict, Union
 
 import emod_api.demographics.demographic_exceptions as demog_ex
-from emod_api.demographics.Updateable import Updateable
+from emod_api.demographics.updateable import Updateable
 from emod_api.utils import check_dimensionality
 
 
diff --git a/emod_api/demographics/mortality_distribution_old.py b/emod_api/demographics/mortality_distribution_old.py
@@ -1,6 +1,6 @@
 from typing import List, Any
 
-from emod_api.demographics.Updateable import Updateable
+from emod_api.demographics.updateable import Updateable
 
 
 class MortalityDistributionOld(Updateable):
diff --git a/emod_api/demographics/node.py b/emod_api/demographics/node.py
@@ -1,7 +1,7 @@
 import json
 import math
-from emod_api.demographics.Updateable import Updateable
-from emod_api.demographics.PropertiesAndAttributes import IndividualAttributes, IndividualProperty, IndividualProperties, NodeAttributes
+from emod_api.demographics.updateable import Updateable
+from emod_api.demographics.properties_and_attributes import IndividualAttributes, IndividualProperty, IndividualProperties, NodeAttributes
 from emod_api.demographics.age_distribution_old import AgeDistributionOld as AgeDistribution
 from emod_api.demographics.fertility_distribution_old import FertilityDistributionOld as FertilityDistribution
 from emod_api.demographics.mortality_distribution_old import MortalityDistributionOld as MortalityDistribution
diff --git a/emod_api/demographics/pre_defined_distributions.py b/emod_api/demographics/pre_defined_distributions.py
diff --git a/emod_api/demographics/properties_and_attributes.py b/emod_api/demographics/properties_and_attributes.py
@@ -6,7 +6,7 @@
 from emod_api.demographics.mortality_distribution_old import MortalityDistributionOld
 from emod_api.demographics.susceptibility_distribution import SusceptibilityDistribution
 from emod_api.demographics.susceptibility_distribution_old import SusceptibilityDistributionOld
-from emod_api.demographics.Updateable import Updateable
+from emod_api.demographics.updateable import Updateable
 
 from typing import List, Union
 
diff --git a/emod_api/demographics/susceptibility_distribution.py b/emod_api/demographics/susceptibility_distribution.py
@@ -2,7 +2,7 @@
 
 import emod_api.demographics.demographic_exceptions as demog_ex
 
-from emod_api.demographics.Updateable import Updateable
+from emod_api.demographics.updateable import Updateable
 from emod_api.utils import check_dimensionality
 
 
diff --git a/emod_api/demographics/susceptibility_distribution_old.py b/emod_api/demographics/susceptibility_distribution_old.py
@@ -1,6 +1,6 @@
 from typing import List, Dict
 
-from emod_api.demographics.Updateable import Updateable
+from emod_api.demographics.updateable import Updateable
 
 
 class SusceptibilityDistributionOld(Updateable):
diff --git a/emod_api/demographics/updateable.py b/emod_api/demographics/updateable.py
diff --git a/emod_api/migration/migration.py b/emod_api/migration/migration.py
@@ -13,7 +13,7 @@
 
 # for from_params()
 import scipy.spatial.distance as spspd
-from emod_api.demographics import Demographics as Demog
+from emod_api.demographics import demographics as Demog
 
 # for from_demog_and_param_gravity()
 from geographiclib.geodesic import Geodesic
diff --git a/emod_api/serialization/census_and_mod_pop.py b/emod_api/serialization/census_and_mod_pop.py
@@ -1,4 +1,4 @@
-import emod_api.serialization.SerializedPopulation as sp
+import emod_api.serialization.serialized_population as sp
 
 
 def change_ser_pop(input_serpop_path, mod_fn=None, save_file_path=None):
diff --git a/emod_api/serialization/dtk_file_support.py b/emod_api/serialization/dtk_file_support.py
diff --git a/emod_api/serialization/dtk_file_tools.py b/emod_api/serialization/dtk_file_tools.py
@@ -9,7 +9,7 @@
 """
 
 import copy
-import emod_api.serialization.dtkFileSupport as support
+import emod_api.serialization.dtk_file_support as support
 import json
 import os
 import time
diff --git a/emod_api/serialization/dtk_file_utility.py b/emod_api/serialization/dtk_file_utility.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import argparse
-import emod_api.serialization.dtkFileTools as dft
+import emod_api.serialization.dtk_file_tools as dft
 import json
 import os
 import sys
diff --git a/emod_api/serialization/serialized_population.py b/emod_api/serialization/serialized_population.py
@@ -1,7 +1,7 @@
 """Class to load and manipulate a saved population."""
 import collections
 import difflib
-import emod_api.serialization.dtkFileTools as dft
+import emod_api.serialization.dtk_file_tools as dft
 
 from typing import Union
 
diff --git a/tests/test_config_demog.py b/tests/test_config_demog.py
@@ -1,6 +1,6 @@
 import unittest
-import emod_api.demographics.Demographics as Demographics
-import emod_api.demographics.PreDefinedDistributions as Distributions
+import emod_api.demographics.demographics as Demographics
+import emod_api.demographics.pre_defined_distributions as Distributions
 
 from emod_api.config import default_from_schema_no_validation as dfs
 from tests import manifest
diff --git a/tests/test_demog.py b/tests/test_demog.py
@@ -3,9 +3,9 @@
 import unittest
 import csv
 import struct
-import emod_api.demographics.Demographics as Demographics
-import emod_api.demographics.Node as Node
-import emod_api.demographics.DemographicsTemplates as DT
+import emod_api.demographics.demographics as Demographics
+import emod_api.demographics.node as Node
+import emod_api.demographics.demographics_templates as DT
 from emod_api.demographics.demographics_overlay import DemographicsOverlay
 from emod_api.demographics.age_distribution_old import AgeDistributionOld as AgeDistribution
 from emod_api.demographics.mortality_distribution_old import MortalityDistributionOld as MortalityDistribution
@@ -19,8 +19,8 @@
 import pandas as pd
 import numpy as np
 import pathlib
-from emod_api.demographics.PropertiesAndAttributes import IndividualAttributes, IndividualProperty, IndividualProperties, NodeAttributes
-import emod_api.demographics.PreDefinedDistributions as Distributions
+from emod_api.demographics.properties_and_attributes import IndividualAttributes, IndividualProperty, IndividualProperties, NodeAttributes
+import emod_api.demographics.pre_defined_distributions as Distributions
 import emod_api.demographics.demographic_exceptions as demog_ex
 import pprint
 
diff --git a/tests/test_demog_from_pop.py b/tests/test_demog_from_pop.py
@@ -1,4 +1,4 @@
-import emod_api.demographics.Demographics as Dem
+import emod_api.demographics.demographics as Dem
 import os
 import pandas as pd
 import json
diff --git a/tests/test_demog_send_over_pipes.py b/tests/test_demog_send_over_pipes.py
@@ -2,8 +2,8 @@
 import sys
 import json
 import unittest
-import emod_api.demographics.Demographics as Demog
-import emod_api.demographics.PreDefinedDistributions as Distributions
+import emod_api.demographics.demographics as Demog
+import emod_api.demographics.pre_defined_distributions as Distributions
 import tempfile
 import copy
 
diff --git a/tests/test_node.py b/tests/test_node.py
@@ -1,7 +1,7 @@
 import unittest
-import emod_api.demographics.Node as Node
-import emod_api.demographics.PreDefinedDistributions as Distributions
-from emod_api.demographics.PropertiesAndAttributes import IndividualAttributes, IndividualProperty, IndividualProperties, NodeAttributes
+import emod_api.demographics.node as Node
+import emod_api.demographics.pre_defined_distributions as Distributions
+from emod_api.demographics.properties_and_attributes import IndividualAttributes, IndividualProperty, IndividualProperties, NodeAttributes
 
 
 class NodeTest(unittest.TestCase):
diff --git a/tests/test_serialization.py b/tests/test_serialization.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 
 from __future__ import print_function
-import emod_api.serialization.dtkFileTools as dft
-import emod_api.serialization.dtkFileSupport as support
+import emod_api.serialization.dtk_file_tools as dft
+import emod_api.serialization.dtk_file_support as support
 import os
 import tempfile
 import unittest
@@ -1127,7 +1127,7 @@ def test_header5(self):
             'compressed': True,
             # 'date': None,  # date with seconds, might have changed at point of testing
             'engine': "LZ4",
-            'tool': "dtkFileTools.py",
+            'tool': "dtk_file_tools.py",
             'version': 5,
             'emod_info': {
                 'emod_sccs_date': "Mon Jan 1 00:00:00 1970",
diff --git a/tests/unittests/test_demographics_imports.py b/tests/unittests/test_demographics_imports.py
@@ -46,7 +46,7 @@ def test_demog_demog_import(self):
             'get_node_pops_from_params',
             '_node_id_from_lat_lon_res'
         ]
-        import emod_api.demographics.Demographics as eaddf
+        import emod_api.demographics.demographics as eaddf
         self.verify_expected_items_present(namespace=eaddf)
         pass
 
@@ -59,7 +59,7 @@ def test_demog_node_import(self):
             'nodes_for_DTK',
             'xpix_ypix_from_lat_lon'
         ]
-        import emod_api.demographics.Node as eadn
+        import emod_api.demographics.node as eadn
         self.verify_expected_items_present(namespace=eadn)
         pass
 
@@ -72,6 +72,6 @@ def test_demog_templates_import(self):
             '_set_age_complex', '_set_age_simple', '_set_init_prev', '_set_suscept_complex',
             '_set_suscept_simple'
         ]
-        import emod_api.demographics.DemographicsTemplates as eaddt
+        import emod_api.demographics.demographics_templates as eaddt
         self.verify_expected_items_present(namespace=eaddt)
         pass
diff --git a/tests/unittests/test_individual_properties.py b/tests/unittests/test_individual_properties.py
@@ -1,6 +1,6 @@
 import unittest
 
-from emod_api.demographics.PropertiesAndAttributes import IndividualProperties, IndividualProperty
+from emod_api.demographics.properties_and_attributes import IndividualProperties, IndividualProperty
 
 
 class IndividualPropertiesTest(unittest.TestCase):
diff --git a/tests/unittests/test_properties_and_attributes.py b/tests/unittests/test_properties_and_attributes.py
@@ -1,5 +1,5 @@
 import unittest
-from emod_api.demographics.PropertiesAndAttributes import IndividualAttributes, IndividualProperty
+from emod_api.demographics.properties_and_attributes import IndividualAttributes, IndividualProperty
 
 
 class IndividualPropertiesTest(unittest.TestCase):
