Skip to content

fix: 🐛 Import Error when running from nox in woodpecker... #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robvanderleek merged 1 commit into from
Dec 15, 2024
Merged

fix: 🐛 Import Error when running from nox in woodpecker... #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions codelimit/common/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
from pathlib import Path
from typing import Union, Any

import sh
from rich.style import Style
from rich.text import Text
from sh import git, ErrorReturnCode

from codelimit.common.Configuration import Configuration
from codelimit.common.Measurement import Measurement
from codelimit.common.GithubRepository import GithubRepository
from codelimit.common.Measurement import Measurement
from codelimit.common.gsm.Expression import Expression
from codelimit.common.gsm.operator.Operator import Operator
from codelimit.common.token_matching.predicate.TokenValue import TokenValue
Expand Down Expand Up @@ -207,17 +207,17 @@ def replace_string_literal_with_predicate(expression: Expression) -> Expression:

def _get_git_branch(path: Path) -> str | None:
try:
out = git('rev-parse', '--abbrev-ref', 'HEAD', _cwd=path)
out = sh.git('rev-parse', '--abbrev-ref', 'HEAD', _cwd=path)
return out.strip()
except ErrorReturnCode:
except sh.ErrorReturnCode | sh.CommandNotFound:
return None


def _get_remote_url(path: Path) -> str | None:
try:
out = git('config', '--get', 'remote.origin.url', _cwd=path)
out = sh.git('config', '--get', 'remote.origin.url', _cwd=path)
return out.strip()
except ErrorReturnCode:
except sh.ErrorReturnCode | sh.CommandNotFound:
return None


Expand Down
Loading