Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions examples/invalid_yamls/bad_type.yaml

This file was deleted.

67 changes: 0 additions & 67 deletions examples/invalid_yamls/invalid_batch_config.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions examples/invalid_yamls/missing_name.yaml

This file was deleted.

10 changes: 5 additions & 5 deletions model_ensembler/batcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import logging
import os

from datetime import datetime
from datetime import datetime, timezone
from pprint import pformat

import model_ensembler
Expand Down Expand Up @@ -53,7 +53,7 @@ async def run_batch_item(run):
run_ctx.set(run)
cluster = cluster_ctx.get()

logging.info("Start run {} at {}".format(run.id, datetime.utcnow()))
logging.info("Start run {} at {}".format(run.id, datetime.now(timezone.utc)))
logging.debug(pformat(run))

args = Arguments()
Expand Down Expand Up @@ -141,7 +141,7 @@ async def run_batch_item(run):
logging.error("Run failure caught, abandoning {} but not the "
"batch".format(run.id))

logging.info("End run {} at {}".format(run.id, datetime.utcnow()))
logging.info("End run {} at {}".format(run.id, datetime.now(timezone.utc)))
return job_id, run


Expand All @@ -160,7 +160,7 @@ def do_batch_execution(loop, batch, repeat=False):
ProcessingException: If there is pre or post_batch processing error.
"""

logging.info("Start batch: {}".format(datetime.utcnow()))
logging.info("Start batch: {}".format(datetime.now(timezone.utc)))
logging.debug(pformat(batch))

args = Arguments()
Expand Down Expand Up @@ -266,7 +266,7 @@ def do_batch_execution(loop, batch, repeat=False):

os.chdir(orig)
logging.info("Batch {} completed: {}".
format(batch.name, datetime.utcnow()))
format(batch.name, datetime.now(timezone.utc)))
# TODO: return batch windows/info
return "Success"

Expand Down
2 changes: 1 addition & 1 deletion model_ensembler/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def process_templates(run, template_list):
"""
for tmpl_file in template_list:
if tmpl_file[-3:] != ".j2":
raise TemplatingError("{} doe not appear to be a Jinja2 template "
raise TemplatingError("{} does not appear to be a Jinja2 template "
"(.j2)".format(tmpl_file))

try:
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ dependencies = [
[project.optional-dependencies]
tests = [
"pytest",
"pytest-cov"
"pytest-cov",
"pytest-asyncio",
]
lint = [
"flake8"
Expand Down Expand Up @@ -81,3 +82,4 @@ exclude = "docs/"

[tool.distutils.bdist_wheel]
universal = true

Loading