From a5a0e2c7268805121fd83a6d93616845e9320524 Mon Sep 17 00:00:00 2001 From: Mudassir Chapra Date: Fri, 9 Aug 2024 18:34:19 +0500 Subject: [PATCH] Remove all redundant `music_box_` from file names and updated references [Issue #177] --- src/acom_music_box/__init__.py | 20 +++++++++---------- ...{music_box_conditions.py => conditions.py} | 6 +++--- ...g_conditions.py => evolving_conditions.py} | 6 +++--- .../{music_box_main.py => main.py} | 0 ..._box_model_options.py => model_options.py} | 0 src/acom_music_box/music_box.py | 12 +++++------ .../{music_box_product.py => product.py} | 0 .../{music_box_reactant.py => reactant.py} | 0 .../{music_box_reaction.py => reaction.py} | 0 ..._box_reaction_list.py => reaction_list.py} | 6 +++--- ..._box_reaction_rate.py => reaction_rate.py} | 0 .../{music_box_species.py => species.py} | 0 ...centration.py => species_concentration.py} | 0 ...ic_box_species_list.py => species_list.py} | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) rename src/acom_music_box/{music_box_conditions.py => conditions.py} (98%) rename src/acom_music_box/{music_box_evolving_conditions.py => evolving_conditions.py} (98%) rename src/acom_music_box/{music_box_main.py => main.py} (100%) rename src/acom_music_box/{music_box_model_options.py => model_options.py} (100%) rename src/acom_music_box/{music_box_product.py => product.py} (100%) rename src/acom_music_box/{music_box_reactant.py => reactant.py} (100%) rename src/acom_music_box/{music_box_reaction.py => reaction.py} (100%) rename src/acom_music_box/{music_box_reaction_list.py => reaction_list.py} (98%) rename src/acom_music_box/{music_box_reaction_rate.py => reaction_rate.py} (100%) rename src/acom_music_box/{music_box_species.py => species.py} (100%) rename src/acom_music_box/{music_box_species_concentration.py => species_concentration.py} (100%) rename src/acom_music_box/{music_box_species_list.py => species_list.py} (99%) diff --git a/src/acom_music_box/__init__.py b/src/acom_music_box/__init__.py index 17fdbe40..dbd9ac28 100644 --- a/src/acom_music_box/__init__.py +++ b/src/acom_music_box/__init__.py @@ -7,16 +7,16 @@ __version__ = "2.1.1" from .utils import convert_time, convert_pressure, convert_temperature, convert_concentration -from .music_box_species import Species -from .music_box_product import Product -from .music_box_reactant import Reactant -from .music_box_reaction import Reaction, Branched, Arrhenius, Tunneling, Troe_Ternary -from .music_box_species_list import SpeciesList -from .music_box_model_options import BoxModelOptions -from .music_box_species_concentration import SpeciesConcentration -from .music_box_reaction_rate import ReactionRate -from .music_box_conditions import Conditions +from species import Species +from product import Product +from reactant import Reactant +from reaction import Reaction, Branched, Arrhenius, Tunneling, Troe_Ternary +from species_list import SpeciesList +from model_options import BoxModelOptions +from species_concentration import SpeciesConcentration +from reaction_rate import ReactionRate +from conditions import Conditions -from .music_box_evolving_conditions import EvolvingConditions +from evolving_conditions import EvolvingConditions from .music_box import MusicBox diff --git a/src/acom_music_box/music_box_conditions.py b/src/acom_music_box/conditions.py similarity index 98% rename from src/acom_music_box/music_box_conditions.py rename to src/acom_music_box/conditions.py index 73c8ba0f..12377c71 100644 --- a/src/acom_music_box/music_box_conditions.py +++ b/src/acom_music_box/conditions.py @@ -1,9 +1,9 @@ import csv import os from typing import List -from .music_box_reaction_rate import ReactionRate -from .music_box_species import Species -from .music_box_species_concentration import SpeciesConcentration +from reaction_rate import ReactionRate +from species import Species +from species_concentration import SpeciesConcentration from .utils import convert_time, convert_pressure, convert_temperature, convert_concentration diff --git a/src/acom_music_box/music_box_evolving_conditions.py b/src/acom_music_box/evolving_conditions.py similarity index 98% rename from src/acom_music_box/music_box_evolving_conditions.py rename to src/acom_music_box/evolving_conditions.py index a6a90777..8a8a0196 100644 --- a/src/acom_music_box/music_box_evolving_conditions.py +++ b/src/acom_music_box/evolving_conditions.py @@ -1,9 +1,9 @@ import csv import os from typing import List -from .music_box_conditions import Conditions -from .music_box_species_concentration import SpeciesConcentration -from .music_box_reaction_rate import ReactionRate +from conditions import Conditions +from species_concentration import SpeciesConcentration +from reaction_rate import ReactionRate class EvolvingConditions: diff --git a/src/acom_music_box/music_box_main.py b/src/acom_music_box/main.py similarity index 100% rename from src/acom_music_box/music_box_main.py rename to src/acom_music_box/main.py diff --git a/src/acom_music_box/music_box_model_options.py b/src/acom_music_box/model_options.py similarity index 100% rename from src/acom_music_box/music_box_model_options.py rename to src/acom_music_box/model_options.py diff --git a/src/acom_music_box/music_box.py b/src/acom_music_box/music_box.py index e1378ed8..39025427 100644 --- a/src/acom_music_box/music_box.py +++ b/src/acom_music_box/music_box.py @@ -4,12 +4,12 @@ import logging logger = logging.getLogger(__name__) -from .music_box_evolving_conditions import EvolvingConditions -from .music_box_reaction_list import ReactionList -from .music_box_reaction import Reaction, Branched, Arrhenius, Tunneling, Troe_Ternary -from .music_box_species_list import SpeciesList -from .music_box_model_options import BoxModelOptions -from .music_box_conditions import Conditions +from evolving_conditions import EvolvingConditions +from reaction_list import ReactionList +from reaction import Reaction, Branched, Arrhenius, Tunneling, Troe_Ternary +from species_list import SpeciesList +from model_options import BoxModelOptions +from conditions import Conditions import csv import musica diff --git a/src/acom_music_box/music_box_product.py b/src/acom_music_box/product.py similarity index 100% rename from src/acom_music_box/music_box_product.py rename to src/acom_music_box/product.py diff --git a/src/acom_music_box/music_box_reactant.py b/src/acom_music_box/reactant.py similarity index 100% rename from src/acom_music_box/music_box_reactant.py rename to src/acom_music_box/reactant.py diff --git a/src/acom_music_box/music_box_reaction.py b/src/acom_music_box/reaction.py similarity index 100% rename from src/acom_music_box/music_box_reaction.py rename to src/acom_music_box/reaction.py diff --git a/src/acom_music_box/music_box_reaction_list.py b/src/acom_music_box/reaction_list.py similarity index 98% rename from src/acom_music_box/music_box_reaction_list.py rename to src/acom_music_box/reaction_list.py index 512ed5ba..eee595bb 100644 --- a/src/acom_music_box/music_box_reaction_list.py +++ b/src/acom_music_box/reaction_list.py @@ -1,9 +1,9 @@ import os import json from typing import List -from .music_box_reaction import Reaction, Branched, Arrhenius, Tunneling, Troe_Ternary -from .music_box_reactant import Reactant -from .music_box_product import Product +from reaction import Reaction, Branched, Arrhenius, Tunneling, Troe_Ternary +from reactant import Reactant +from product import Product class ReactionList: """ diff --git a/src/acom_music_box/music_box_reaction_rate.py b/src/acom_music_box/reaction_rate.py similarity index 100% rename from src/acom_music_box/music_box_reaction_rate.py rename to src/acom_music_box/reaction_rate.py diff --git a/src/acom_music_box/music_box_species.py b/src/acom_music_box/species.py similarity index 100% rename from src/acom_music_box/music_box_species.py rename to src/acom_music_box/species.py diff --git a/src/acom_music_box/music_box_species_concentration.py b/src/acom_music_box/species_concentration.py similarity index 100% rename from src/acom_music_box/music_box_species_concentration.py rename to src/acom_music_box/species_concentration.py diff --git a/src/acom_music_box/music_box_species_list.py b/src/acom_music_box/species_list.py similarity index 99% rename from src/acom_music_box/music_box_species_list.py rename to src/acom_music_box/species_list.py index 02d40f8b..3de570d8 100644 --- a/src/acom_music_box/music_box_species_list.py +++ b/src/acom_music_box/species_list.py @@ -1,7 +1,7 @@ import json import os from typing import List -from .music_box_species import Species +from species import Species class SpeciesList: """