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
13 changes: 13 additions & 0 deletions tracksuite/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# flake8: noqa

import logging

LOGGER = logging.getLogger("tracksuite")

import warnings

warnings.formatwarning = (
lambda mess, category, filename, lineno, *args: f"\033[93m[{category.__name__}] {filename}:{lineno}\n{mess}\n\033[0m"
)
warn = warnings.warn

from .deploy import GitDeployment
from .init import setup_remote
from .replace import replace_on_server
Expand All @@ -12,3 +23,5 @@
except ImportError: # pragma: no cover
# Local copy or not installed with setuptools
__version__ = ""

LOGGER.debug("tracksuite version: %s", __version__)
13 changes: 7 additions & 6 deletions tracksuite/definition.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import logging as log
import os

from tracksuite import LOGGER, warn
from tracksuite.ecflow_client import EcflowClient, save_definition
from tracksuite.repos import GitRepositories

Expand All @@ -24,8 +24,9 @@ def update_definition_from_server(
- Push the changes to the target repository
"""

log.warning(
"The 'update_definition_from_server' function of tracksuite is experimental. Do not use it in production!"
warn(
"The 'update_definition_from_server' function of tracksuite is experimental. Do not use it in production!",
stacklevel=2,
)

# Create the GitSuiteDefinition object
Expand Down Expand Up @@ -56,9 +57,9 @@ def update_definition_from_server(
deployer.check_sync_remotes("target", "backup")

# Commit the changes to the local repository
log.info(" -> Git commit")
LOGGER.info(" -> Git commit")
if not deployer.commit(message="Update suite definition from server"):
log.info("Nothing to commit... aborting")
LOGGER.info("Nothing to commit... aborting")
return False

hash_check = deployer.get_hash_remote("target")
Expand All @@ -70,7 +71,7 @@ def update_definition_from_server(

deployer.push("target")
if deployer.backup_repo:
log.info(f" -> Git push to backup repository {deployer.backup_repo}")
LOGGER.info(f" -> Git push to backup repository {deployer.backup_repo}")
deployer.push("backup")


Expand Down
2 changes: 1 addition & 1 deletion tracksuite/deploy.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import argparse
import logging as log
import os
from filecmp import dircmp

from tracksuite import LOGGER as log
from tracksuite.repos import GitRepositories
from tracksuite.utils import run_cmd

Expand Down
4 changes: 2 additions & 2 deletions tracksuite/ecflow_client.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from __future__ import annotations # ← annotations are strings at run‑time

import logging as log
from typing import Any, cast

from tracksuite import LOGGER as log

try:
import ecflow
except ModuleNotFoundError:
Expand All @@ -15,7 +16,6 @@ class EcflowClient:
"""

def __init__(self, host: str = None, port: int = None, ssl: bool = False):

# only raise an error at this point if ecflow is not installed
if ecflow is None: # type: ignore[comparison‑overlap]
raise ModuleNotFoundError(
Expand Down
4 changes: 2 additions & 2 deletions tracksuite/init.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import argparse
import logging as log
import os
import tempfile

import git

from .utils import run_cmd
from tracksuite import LOGGER as log
from tracksuite.utils import run_cmd


class Client:
Expand Down
2 changes: 1 addition & 1 deletion tracksuite/replace.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import logging as log
import os

from tracksuite import LOGGER as log
from tracksuite.ecflow_client import EcflowClient


Expand Down
3 changes: 2 additions & 1 deletion tracksuite/repos.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import logging as log
import os
import tempfile

import git

from tracksuite import LOGGER as log


class GitRepositories:
def __init__(
Expand Down
2 changes: 1 addition & 1 deletion tracksuite/revert.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import argparse
import logging as log
import os

from tracksuite import LOGGER as log
from tracksuite.repos import GitRepositories


Expand Down
Loading