Skip to content

Commit

Permalink
fix import errors
Browse files Browse the repository at this point in the history
  • Loading branch information
zacharyburnett committed Apr 7, 2021
1 parent 4421748 commit 009add4
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from adcircpy.forcing.base import Forcing
from nemspy.model import ModelEntry

from coupledmodeldriver.configure.forcings.base import ForcingJSON
from .base import ConfigurationJSON, NEMSCapJSON
from .forcings.base import ForcingJSON


class RunConfiguration(ABC):
Expand Down
3 changes: 1 addition & 2 deletions coupledmodeldriver/configure/forcings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
from adcircpy.forcing.winds.owi import OwiForcing
from nemspy.model import AtmosphericMeshEntry, WaveMeshEntry

from coupledmodeldriver.configure.base import ConfigurationJSON, \
NEMSCapJSON
from ..base import ConfigurationJSON, NEMSCapJSON


class ForcingJSON(ConfigurationJSON, ABC):
Expand Down
2 changes: 1 addition & 1 deletion coupledmodeldriver/configure/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from adcircpy.server import SlurmConfig
from nemspy.model import ADCIRCEntry

from coupledmodeldriver.configure.forcings.base import ForcingJSON
from .base import ConfigurationJSON, NEMSCapJSON, SlurmJSON
from .forcings.base import ForcingJSON
from ..utilities import LOGGER


Expand Down
13 changes: 6 additions & 7 deletions coupledmodeldriver/generate/adcirc/configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@
from adcircpy.forcing.winds.atmesh import AtmosphericMeshForcing
from nemspy import ModelingSystem

from coupledmodeldriver.configure import NEMSJSON
from coupledmodeldriver.configure.base import ModelDriverJSON, SlurmJSON
from coupledmodeldriver.configure.forcings import (
from ...configure.base import ModelDriverJSON, NEMSJSON, SlurmJSON
from ...configure.configure import RunConfiguration
from ...configure.forcings.base import (
ATMESHForcingJSON,
ForcingJSON,
TidalForcingJSON,
WW3DATAForcingJSON,
)
from coupledmodeldriver.configure.forcings.base import ForcingJSON
from coupledmodeldriver.configure.models import ADCIRCJSON
from coupledmodeldriver.configure.run import RunConfiguration
from coupledmodeldriver.platforms import Platform
from ...configure.models import ADCIRCJSON
from ...platforms import Platform


class ADCIRCRunConfiguration(RunConfiguration):
Expand Down
12 changes: 4 additions & 8 deletions coupledmodeldriver/generate/adcirc/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@

from nemspy import ModelingSystem

from coupledmodeldriver.script import (
EnsembleCleanupScript,
EnsembleRunScript,
)
from coupledmodeldriver.utilities import LOGGER, create_symlink, \
get_logger
from .configure import ADCIRCRunConfiguration
from .configure import ADCIRCRunConfiguration, \
NEMSADCIRCRunConfiguration
from .script import AdcircMeshPartitionJob, AdcircRunJob
from .. import NEMSADCIRCRunConfiguration
from ...script import EnsembleCleanupScript, EnsembleRunScript
from ...utilities import LOGGER, create_symlink, get_logger


def generate_adcirc_configuration(
Expand Down
4 changes: 2 additions & 2 deletions coupledmodeldriver/generate/adcirc/script.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from os import PathLike
from pathlib import Path

from coupledmodeldriver.platforms import Platform
from coupledmodeldriver.script import JobScript, Script
from ...platforms import Platform
from ...script import JobScript, Script


class AdcircJob(JobScript):
Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,8 @@
python_requires='>=3.6',
setup_requires=['dunamai', 'setuptools>=41.2'],
install_requires=['adcircpy>=1.0.28', 'nemspy>=0.6.13', 'numpy', 'requests'],
extras_require={'testing': ['flake8', 'pytest', 'pytest-cov', 'wget'], 'development': ['oitnb']},
extras_require={
'testing': ['flake8', 'pytest', 'pytest-cov', 'wget'],
'development': ['oitnb'],
},
)

0 comments on commit 009add4

Please sign in to comment.