Skip to content

Commit

Permalink
Remove all redundant music_box_ from file names and updated referen…
Browse files Browse the repository at this point in the history
…ces [Issue #177] (#180)

* Remove all redundant `music_box_` from file names and updated references [Issue #177]

* correcting relative imports

* correcting more imports

* renaming executable

---------

Co-authored-by: Kyle Shores <[email protected]>
  • Loading branch information
muddi900 and K20shores committed Aug 15, 2024
1 parent d457bbd commit 06571f0
Show file tree
Hide file tree
Showing 15 changed files with 43 additions and 27 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ dependencies = [
Home = "https://github.com/NCAR/music-box"

[project.scripts]
music_box = "acom_music_box.music_box_main:main"
music_box = "acom_music_box.main:main"
20 changes: 10 additions & 10 deletions src/acom_music_box/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
__version__ = "2.1.5"

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
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
from .utils import convert_time, convert_pressure, convert_temperature, convert_concentration
from .music_box_species_concentration import SpeciesConcentration
from .music_box_species import Species
from .music_box_reaction_rate import ReactionRate
from .species_concentration import SpeciesConcentration
from .species import Species
from .reaction_rate import ReactionRate
from typing import List
import csv
import os
from typing import List
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

import logging
logger = logging.getLogger(__name__)
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
File renamed without changes.
File renamed without changes.
23 changes: 17 additions & 6 deletions src/acom_music_box/music_box.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
import musica
import csv
from .music_box_conditions import Conditions
from .music_box_model_options import BoxModelOptions
from .music_box_species_list import SpeciesList
from .music_box_reaction import Reaction, Branched, Arrhenius, Tunneling, Troe_Ternary
from .music_box_reaction_list import ReactionList
from .music_box_evolving_conditions import EvolvingConditions
from .conditions import Conditions
from .model_options import BoxModelOptions
from .species_list import SpeciesList
from .reaction import Reaction, Branched, Arrhenius, Tunneling, Troe_Ternary
from .reaction_list import ReactionList
from .evolving_conditions import EvolvingConditions
import json
import os

import logging
logger = logging.getLogger(__name__)

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



class MusicBox:
"""
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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

import logging
logger = logging.getLogger(__name__)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import json
import os
from typing import List
from .music_box_species import Species
from .species import Species


class SpeciesList:
Expand Down

0 comments on commit 06571f0

Please sign in to comment.