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

[3006.x] salt-pip related fixes #64212

Merged
merged 17 commits into from
May 5, 2023
Merged

[3006.x] salt-pip related fixes #64212

merged 17 commits into from
May 5, 2023

Conversation

s0undt3ch
Copy link
Collaborator

What does this PR do?

  • Add a .pth to the onedir env to ensure packages in extras are importable.
  • Upgrade relenv

What issues does this PR fix or reference?

Fixes: #64192

@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title salt-pip related fixes [3006.x] salt-pip related fixes May 2, 2023
@s0undt3ch s0undt3ch linked an issue May 2, 2023 that may be closed by this pull request
[BUG] Salt Extensions Installed to Extras Location Are Not Accessible #64192
Closed
@s0undt3ch s0undt3ch added this to the Sulfur v3006.1 milestone May 2, 2023
@s0undt3ch s0undt3ch force-pushed the hotfix/issue-64192 branch 2 times, most recently from c3e9f2b to 93b3809 Compare May 3, 2023 06:09
@s0undt3ch s0undt3ch force-pushed the hotfix/issue-64192 branch 2 times, most recently from 30e5b00 to 897166a Compare May 3, 2023 06:40
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 06:55 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 06:55 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 06:55 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 08:18 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 08:18 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 08:18 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 09:06 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 09:06 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 09:06 — with GitHub Actions Inactive
@dwoz dwoz temporarily deployed to ci May 3, 2023 10:14 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch force-pushed the hotfix/issue-64192 branch 2 times, most recently from 082bff1 to c856500 Compare May 3, 2023 10:29
@s0undt3ch s0undt3ch marked this pull request as ready for review May 3, 2023 10:32
@s0undt3ch s0undt3ch requested a review from a team as a code owner May 3, 2023 10:32
@s0undt3ch s0undt3ch requested review from dwoz and removed request for a team May 3, 2023 10:32
@s0undt3ch s0undt3ch temporarily deployed to ci May 3, 2023 10:47 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 5, 2023 07:00 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 5, 2023 07:01 — with GitHub Actions Inactive
s0undt3ch and others added 15 commits May 5, 2023 09:02
@s0undt3ch
Confirm salt extensions are discoverable by salt when salt-pip inst…
cdb4fb4 
…alled

Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Only delete existing paths on macOS onedir
37aa198 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Get site-packages from python
1808df6 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
The extras-<python-major>.<python-minor> is a Salt thing.
35f27c7 
Create it at the right stage.

Signed-off-by: Pedro Algarvio <[email protected]>
@dwoz @s0undt3ch
Update relenv version to 0.12.0
06e7486
@s0undt3ch
Generate workflows if cicd/shared-gh-workflows-context.yml is modified
8ffcc66 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Add build time checks to ensure the right relenv version is being used
f77b1d1 
Signed-off-by: Pedro Algarvio <[email protected]>
@dwoz @s0undt3ch
Remove un-needed code block
2724689
@dwoz @s0undt3ch
Bump relenv to 0.12.1
a65f73c
@dwoz @s0undt3ch
Account for different extras location on win32
e9d009d
@s0undt3ch
Fix typo
f9c3990 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Handle stale cache
b488fe1 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Add 3006.1 release notes template.
14efd1f 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Let's not concentrate the logic into a "one liner"
53288c5 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Bump to relenv 0.12.3
070b4d0 
Signed-off-by: Pedro Algarvio <[email protected]>
dwoz
dwoz previously approved these changes May 5, 2023
View reviewed changes
@s0undt3ch s0undt3ch force-pushed the hotfix/issue-64192 branch from 81f5a06 to 070b4d0 Compare May 5, 2023 08:07
@s0undt3ch s0undt3ch temporarily deployed to ci May 5, 2023 08:24 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 5, 2023 08:24 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 5, 2023 08:24 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch merged commit 6531a38 into saltstack:3006.x May 5, 2023
@s0undt3ch s0undt3ch deleted the hotfix/issue-64192 branch May 5, 2023 09:11
@s0undt3ch s0undt3ch temporarily deployed to ci May 5, 2023 09:19 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 5, 2023 09:19 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 5, 2023 09:19 — with GitHub Actions Inactive
@anilsil anilsil mentioned this pull request May 5, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ch3LL Ch3LL Ch3LL left review comments

@dwoz dwoz dwoz approved these changes

@twangboy twangboy twangboy left review comments

@garethgreenaway garethgreenaway garethgreenaway left review comments

Assignees
No one assigned
Labels
Sulfur v3006.1
Projects
None yet
Milestone
Sulfur v3006.1
Development

Successfully merging this pull request may close these issues.

[BUG] Salt Extensions Installed to Extras Location Are Not Accessible
5 participants
@s0undt3ch @garethgreenaway @dwoz @Ch3LL @twangboy