activate.fish: update fish major version check #2891
Conversation
r5d
force-pushed
the
activate-fish-openbsd
branch
from
9db37a1 to
24f90bb
Compare
Use fish's [`string sub`][ss] command to get fish's major version from `$FISH_VERSION`. The [`head`][head] program in OpenBSD does not have the `-c` flag. Addresses pypa#2892. [head]: https://man.openbsd.org/head [ss]: https://fishshell.com/docs/current/cmds/string.html#sub-subcommand
Head branch was pushed to by a user without write access
r5d
force-pushed
the
activate-fish-openbsd
branch
from
24f90bb to
55caf36
Compare
|
@gaborbernat some tests are failing and it does not seem to be related to the changes in this PR. Are you able to look into it and possibly get this merged? |
Add `test_fish_path` to verify that the PATH is reverted to the original PATH after virtualenv deactivation. This verification confirms that the `_OLD_VIRTUAL_PATH` was correctly set in fish during the activation of the virtualenv.
Added a test in See if it looks good. |
tests/unit/activation/test_fish.py
Outdated
|
|
||
|
|
||
| @pytest.mark.skipif(IS_WIN, reason="we have not setup fish in CI yet") | ||
| def test_fish_path(activation_tester_class, activation_tester, monkeypatch, tmp_path): |
There was a problem hiding this comment.
Any reason we can't include this into test_fish?
There was a problem hiding this comment.
@gaborbernat I've moved the test into test_fish.
Move test `test_fish_path` into `test_fish`. Rename the class that verifies the preservation of original `PATH` after virtualenv deactivation to `FishPath`.
tests/unit/activation/test_fish.py
Outdated
| @@ -20,4 +20,25 @@ def __init__(self, session) -> None: | |||
| def print_prompt(self): | |||
| return "fish_prompt" | |||
|
|
|||
| class FishPath(activation_tester_class): | |||
There was a problem hiding this comment.
this can be merged into the Fish class, we don't need two classes here 🤔
There was a problem hiding this comment.
@gaborbernat moved the test into the Fish class.
Merge test in `FishPath` into `Fish`.
Use fish's
string subcommand to get fish's major version from$FISH_VERSION.The
headprogram in OpenBSD does not have the-cflag.Addresses #2892.