Skip to content
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.

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

activate.fish: support activating conda in fish shells #342

Merged
merged 2 commits into from
Jun 19, 2024
Merged

Conversation

d4l3k
Copy link
Contributor

@d4l3k d4l3k commented Jun 11, 2024

Description

This adds support for the fish shell #72

Test plan:

$ pytest conda_pack/tests/test_core.py

manual tests

$ conda-pack
$ tar xvf ~/conda-pack/conda-pack-3.10.tar.gz; . bin/activate.fish
$ which python3
$ deactivate

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot
Copy link
Contributor

We require contributors to sign our Contributor License Agreement and we don't have one on file for @d4l3k.

In order for us to review and merge your code, please e-sign the Contributor License Agreement PDF. We then need to manually verify your signature, merge the PR (conda/infrastructure#956), and ping the bot to refresh the PR.

@d4l3k
Copy link
Contributor Author

d4l3k commented Jun 11, 2024

I signed the CLA

@conda-bot

@xhochy
Copy link
Collaborator

xhochy commented Jun 12, 2024

@d4l3k The tests are sadly failing in CI

@d4l3k
Copy link
Contributor Author

d4l3k commented Jun 12, 2024

@xhochy tests should be passing now -- I added fish as a conda-forge dep to the tests worklfow

@xhochy
Copy link
Collaborator

xhochy commented Jun 13, 2024

It still fails, we probably need to skip it on Windows.

@d4l3k
Copy link
Contributor Author

d4l3k commented Jun 13, 2024

@xhochy updated it to only install fish on mac/linux. test_activate is passing on mac/linux.

The failing mac test only failed on Py3.8 and seems to be flakiness unrelated to this PR.

@d4l3k
Copy link
Contributor Author

d4l3k commented Jun 14, 2024

@xhochy seems like all but 1 test is passing now. Looking at that failure I'm not sure how this PR could have caused it since I don't think I touched anything related to that file. Would appreciate your help in debugging this

I also don't have access to a mac environment where I could debug this locally

@xhochy
Copy link
Collaborator

xhochy commented Jun 16, 2024

Everything looks good now, needs someone to merge the CLA though (I cannot do that)

@travishathaway
Copy link

@conda-bot check

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jun 19, 2024
@travishathaway
Copy link

Should be good to go. Sorry for the delay!

@xhochy xhochy merged commit bc1ef6a into conda:main Jun 19, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants