Skip to content

[REF] cli: Fix lints and CI #220

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
moylop260 merged 2 commits into from
Jun 9, 2025
Merged

[REF] cli: Fix lints and CI #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f30720
[REF] cli: Fix lints
moylop260 Jun 9, 2025
ed58cfc
fix-py3.7
moylop260 Jun 9, 2025
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
5 changes: 5 additions & 0 deletions .github/workflows/github-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:
- python: '3.12'
os: ubuntu-latest
tox_env: 'build'
- python: '3.7'
os: ubuntu-22.04
tox_env: ["py,codecov"]
exclude:
# macos-14 AKA macos-latest has switched to being an ARM runner, only supporting newer versions of Python
# https://github.com/actions/setup-python/issues/825#issuecomment-2096792396
Expand All @@ -42,6 +45,8 @@ jobs:
os: macos-latest
- python: '3.10'
os: macos-latest
- python: '3.7'
os: ubuntu-latest

steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 2 additions & 1 deletion src/travis2docker/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ def get_git_data(project, path, revision):

def yml_read(yml_path):
yml_path_expanded = expandvars(expanduser(yml_path))
alt_yml_path_expanded = None
if isdir(yml_path_expanded):
yml_path_expanded = join(yml_path_expanded, '.travis.yml')
alt_yml_path_expanded = join(yml_path_expanded, '.t2d.yml')
if not isfile(yml_path_expanded):
if isfile(alt_yml_path_expanded):
if alt_yml_path_expanded and isfile(alt_yml_path_expanded):
yml_path_expanded = alt_yml_path_expanded
else:
return
Expand Down