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

Respect user preferred dir and allow to configure logs dir #490

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

@krassowski krassowski added the enhancement New feature or request label Nov 25, 2023
Copy link
Collaborator

@3coins 3coins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krassowski
Thanks for working on this change. I have one comment about the logs dir name, looks good otherwise.

packages/jupyter-ai/jupyter_ai/extension.py Outdated Show resolved Hide resolved
@JasonWeill
Copy link
Collaborator

@krassowski Thanks for your patience on this PR! Could you please rebase this change against main?

@krassowski krassowski force-pushed the generate-preferred-dir branch from 0f6d175 to bc4b5fe Compare December 15, 2023 12:26
@krassowski
Copy link
Member Author

Done @JasonWeill

Copy link
Collaborator

@3coins 3coins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krassowski
Thanks for making the updates. LGTM!

@3coins 3coins merged commit 976f8b9 into jupyterlab:main Dec 15, 2023
6 checks passed
@krassowski
Copy link
Member Author

Thank you both!

@dlqqq
Copy link
Member

dlqqq commented Dec 19, 2023

@meeseeksdev please backport to 1.x

Copy link

lumberbot-app bot commented Dec 19, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 1.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 976f8b9303d198fb339f7b594d29e4cd879618a4
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #490: Respect user preferred dir and allow to configure logs dir'
  1. Push to a named branch:
git push YOURFORK 1.x:auto-backport-of-pr-490-on-1.x
  1. Create a PR against branch 1.x, I would have named this PR:

"Backport PR #490 on branch 1.x (Respect user preferred dir and allow to configure logs dir)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
4 participants