Skip to content
Draft
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: 8 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@ jobs:
name: Run tests
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.6]
poetry-version: [1.1.4]
os: [ubuntu-20.04, macos-latest]
python-version: [3.6, 3.11]
exclude:
- os: ubuntu-20.04
python-version: "3.6"
poetry-version: [1.1.5]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Run image
Expand Down
54 changes: 29 additions & 25 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ flake8-eradicate = "^1.0.0"
flake8-isort = "^4.0.0"
flake8-use-fstring = "^1.1"
isort = "^5.7.0"
mypy = "^0.800"
mypy = "0.900"
pylint = "^2.6.2"
pytest = "^6.2.2"
vulture = "^2.3"
Expand Down
5 changes: 4 additions & 1 deletion src/pathpicker/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ def join_files_into_command(files_and_line_numbers: List[Tuple[str, int]]) -> st
and line_num != 0
):
cmd += f" +{line_num} '{file_path}'"
elif editor_without_args in ["subl", "sublime", "atom", "hx"] and line_num != 0:
elif (
editor_without_args in ["subl", "sublime", "atom", "hx"]
and line_num != 0
):
cmd += f" '{file_path}:{line_num}'"
elif line_num != 0 and os.environ.get("FPP_LINENUM_SEP"):
cmd += f" '{file_path}{os.environ.get('FPP_LINENUM_SEP')}{line_num}'"
Expand Down