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.

Sign up for GitHub

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

Jump to bottom

Support pyenv on Windows #94

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Support pyenv on Windows #94

wants to merge 12 commits into from

Conversation

nre-ableton
Copy link
Contributor

@nre-ableton nre-ableton commented Jun 29, 2022 •
edited
Loading

This PR adds support for Windows in pyenv.createVirtualEnv() and virtualenv.create(). I've bumped the minor version since this is technically a breaking change, since these functions previously resulted in an error being thrown when run on Windows.

@nre-ableton nre-ableton requested a review from a team as a code owner June 29, 2022 15:53
@nre-ableton nre-ableton requested review from ala-ableton and removed request for a team June 29, 2022 15:53
ala-ableton
ala-ableton requested changes Jul 7, 2022
View reviewed changes
src/com/ableton/VirtualEnv.groovy Outdated Show resolved Hide resolved
src/com/ableton/VirtualEnv.groovy Outdated Show resolved Hide resolved
src/com/ableton/VirtualEnv.groovy Outdated Show resolved Hide resolved
src/com/ableton/VirtualEnv.groovy Outdated Show resolved Hide resolved
src/com/ableton/VirtualEnv.groovy Outdated Show resolved Hide resolved
@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch from 0c705e7 to 1d876bc Compare July 7, 2022 17:19
@nre-ableton nre-ableton requested a review from ala-ableton July 7, 2022 17:31
@nre-ableton
Copy link
Contributor Author

@ala-ableton my changes should squash cleanly. Let me know when I should squash.

@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch from bd05e01 to 9a325a1 Compare July 11, 2022 10:19
@nre-ableton nre-ableton requested a review from ala-ableton July 11, 2022 11:03
ala-ableton
ala-ableton requested changes Jul 19, 2022
View reviewed changes
Copy link
Contributor

@ala-ableton ala-ableton left a comment

Choose a reason for hiding this comment

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

Please fix 31ed1db and we're almost done.

@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch from 9a325a1 to 78189f0 Compare July 19, 2022 12:51
@nre-ableton nre-ableton requested a review from ala-ableton July 19, 2022 12:51
ala-ableton
ala-ableton requested changes Jul 19, 2022
View reviewed changes
Copy link
Contributor

@ala-ableton ala-ableton left a comment

Choose a reason for hiding this comment

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

In 43d3b35, we now have export PATH=... twice.

@nre-ableton
Copy link
Contributor Author

In 43d3b35, we now have export PATH=... twice.

Sorry about that. Fixed in b5b1c96.

@nre-ableton nre-ableton requested a review from ala-ableton July 19, 2022 17:07
ala-ableton
ala-ableton requested changes Jul 19, 2022
View reviewed changes
Copy link
Contributor

@ala-ableton ala-ableton left a comment

Choose a reason for hiding this comment

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

Please rebase/squash, then re-rebase and edit 43d3b35 to make sure that export PYENV_ROOT=... keeps on coming before export PATH=..., instead of having export PATH=... move around.

src/com/ableton/VirtualEnv.groovy Outdated Show resolved Hide resolved
@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch from b5b1c96 to 8f2a143 Compare July 19, 2022 17:57
@nre-ableton nre-ableton requested a review from ala-ableton July 19, 2022 17:57
ala-ableton
ala-ableton requested changes Jul 19, 2022
View reviewed changes
src/com/ableton/VirtualEnv.groovy Outdated Show resolved Hide resolved
@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch 2 times, most recently from 732bd30 to 6381850 Compare July 28, 2022 08:44
@nre-ableton
Copy link
Contributor Author

So I've rebased this PR, and also added Windows support for the newly-added integration tests, but they keep timing out after 1 hour.

The first time, the build failed with a different error (not a timeout):

[2022-07-28T08:33:57.000Z] F:/jenkins-node/workspace@tmp/durable-6cb19c97/script.sh: line 4: /f/jenkins-node/workspace/.venv/venv-95957963/Scripts/activate: No such file or directory

I've no idea why this is happening. 😞

@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch 5 times, most recently from 161f29f to 8c50355 Compare September 14, 2023 16:53
@nre-ableton nre-ableton marked this pull request as draft September 14, 2023 16:54
@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch from 8c50355 to 240d754 Compare September 14, 2023 16:55
ala-ableton
ala-ableton reviewed Sep 21, 2023
View reviewed changes
src/com/ableton/Pyenv.groovy Outdated Show resolved Hide resolved
src/com/ableton/VirtualEnv.groovy Outdated Show resolved Hide resolved
src/com/ableton/Pyenv.groovy Outdated Show resolved Hide resolved
vars/pyenv.groovy Outdated Show resolved Hide resolved
src/com/ableton/Pyenv.groovy Show resolved Hide resolved
src/com/ableton/Pyenv.groovy Outdated Show resolved Hide resolved
@nre-ableton
Copy link
Contributor Author

@ala-ableton Please let me know when I should rebase.

@ala-ableton
Copy link
Contributor

@nre-ableton Feel free to rebase whenever you want.

@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch from 5d4b875 to 9e11f26 Compare September 25, 2023 14:35
@nre-ableton
Copy link
Contributor Author

@nre-ableton Feel free to rebase whenever you want.

Done. Feel free to review. 😊 Note that I pushed a dropme commit just to make sure that installing fresh (uncached) Python versions still works.

ala-ableton
ala-ableton reviewed Jan 24, 2024
View reviewed changes
src/com/ableton/Pyenv.groovy Outdated Show resolved Hide resolved
src/com/ableton/Pyenv.groovy Outdated Show resolved Hide resolved
src/com/ableton/Pyenv.groovy Outdated Show resolved Hide resolved
@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch 3 times, most recently from 4ba1913 to 03f3599 Compare January 30, 2024 10:43
@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch from 5837771 to aa99293 Compare January 31, 2024 14:09
@nre-ableton
Copy link
Contributor Author

Forgive the rebase/force-push, I just noticed a vim-related typo in a commit message and decided to just drop the experiment commits regarding pyenv shell.

@nre-ableton
Cleanup: refactor duplicated string to variable
13840e5
@nre-ableton
Print environment variables in integration tests
a2daa8a
@nre-ableton
Add a helper method to reduce duplicated test code
1143c0f
@nre-ableton
Store installation commands in a list
b2a4ff8 
In future commits, we'll need to modify the commands used depending on
the platform (and some other factors as well). Storing them in a list
will make this easier to manipulate.
@nre-ableton
Use pyenv exec when running pip install
f132d02 
This will facilitate Windows support, which will be added in a
future commit.
@nre-ableton
Export PYENV_VERSION rather than using pyenv shell
8b8f02c 
This is needed to support pyenv on Windows.
@nre-ableton
Introduce a method to convert Windows paths
7dd8d68 
This will be needed to fully support Windows, which will happen in a
future commit.
@nre-ableton
Use posixPath when creating Windows venvs
8476517 
This is needed to support pyenv on Windows, which will be added in a
future commit.
@nre-ableton
Use posixPath to make safe paths
c71656b 
This will be needed to support pyenv on Windows, which will happen in a
subsequent commit.
@nre-ableton
Run pyenv to assert the pyenv root path exists
719bc1d 
To support Windows (which will be done in a subsequent commit), we'll
need to translate Windows-style paths to Cygwin-style paths (for
example, C:\foo\bar -> /c/foo/bar). The fileExists step only supports
Windows-style paths when run on Windows, which means that we need to
actually run pyenv to assert that it exists.
@nre-ableton
Support pyenv on Windows
2f88943
@nre-ableton
Version 0.14.0
4934877
@nre-ableton nre-ableton force-pushed the nre/master/2497-pyenv-windows branch from aa99293 to 4934877 Compare November 29, 2024 10:35
@nre-ableton
Copy link
Contributor Author

@ala-ableton I've rebased this PR, ptal!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ala-ableton ala-ableton Awaiting requested review from ala-ableton

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nre-ableton @ala-ableton