Skip to content

Commit a47d51b

Browse files
authored
Merge pull request #241 from justinmayer/check-fish-version
2 parents d280414 + b4a4510 commit a47d51b

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
python-version: [3.7]
19+
python-version: ["3.9"]
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2323
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v2
24+
uses: actions/setup-python@v5
2525
with:
2626
python-version: ${{ matrix.python-version }}
2727
- name: Install Fish
@@ -42,7 +42,7 @@ jobs:
4242
- name: Check for release
4343
if: github.ref == 'refs/heads/main'
4444
run: |
45-
python -m pip install githubrelease httpx==0.16.1 autopub
45+
python -m pip install githubrelease httpx==0.18.2 autopub
4646
echo "##[set-output name=release;]$(autopub check)"
4747
id: check_release
4848
- name: Deploy

RELEASE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Release type: patch
2+
3+
Improve resiliency of `check_fish_version()` function to invisible characters such as tabs.

virtualfish/loader/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def check_fish_version():
2828
import subprocess
2929
from packaging import version
3030

31-
cmd = ["fish", "-c", "echo $version"]
31+
cmd = ["fish", "-N", "-c", "echo $version"]
3232
fish_version = subprocess.check_output(cmd).decode("utf-8").strip()
3333
# Remove any extraneous hyphen-suffixed bits
3434
fish_version = fish_version.partition("-")[0]

0 commit comments

Comments
 (0)