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

Rework static requirements #56904

Merged
merged 15 commits into from
Sep 30, 2020
Merged

Rework static requirements #56904

merged 15 commits into from
Sep 30, 2020

Conversation

s0undt3ch
Copy link
Collaborator

@s0undt3ch s0undt3ch commented Apr 27, 2020 •
edited by sagetherage
Loading

What does this PR do?

All requirements are now compiled to static requirements.
This includes Windows and Darwin packaging requirements.

What issues does this PR fix or reference?

Refs https://github.com/saltstack/release-planning/issues/238
Fixes #56335
Fixes #56048

@s0undt3ch s0undt3ch force-pushed the features/static-pkg-requirements branch 3 times, most recently from 076297f to ddd02dc Compare April 29, 2020 10:51
@s0undt3ch s0undt3ch marked this pull request as ready for review April 29, 2020 13:28
@s0undt3ch s0undt3ch requested a review from a team as a code owner April 29, 2020 13:28
@ghost ghost requested review from Akm0d and removed request for a team April 29, 2020 13:28
@s0undt3ch s0undt3ch force-pushed the features/static-pkg-requirements branch from 4017048 to 1777ac4 Compare April 29, 2020 17:17
@s0undt3ch s0undt3ch mentioned this pull request Apr 30, 2020
Closed
@s0undt3ch s0undt3ch force-pushed the features/static-pkg-requirements branch 6 times, most recently from d540d71 to 5e6bbba Compare May 7, 2020 18:08
@s0undt3ch
Copy link
Collaborator Author

Conflicts solved again.

@s0undt3ch s0undt3ch force-pushed the features/static-pkg-requirements branch from 5e6bbba to c524b13 Compare May 7, 2020 20:16
@twangboy
Copy link
Contributor

twangboy commented May 7, 2020

Rebase?

@s0undt3ch s0undt3ch force-pushed the features/static-pkg-requirements branch 5 times, most recently from f7e2e98 to 81ffbd9 Compare May 12, 2020 16:26
@dwoz dwoz added Needs-Testcase PR needs test cases written, or the issue is about a bug/feature that needs test cases has-failing-test labels May 12, 2020
@s0undt3ch s0undt3ch force-pushed the features/static-pkg-requirements branch from 81ffbd9 to c623085 Compare May 14, 2020 11:15
@s0undt3ch
Copy link
Collaborator Author

re-run full all

@s0undt3ch s0undt3ch force-pushed the features/static-pkg-requirements branch 4 times, most recently from b1a2b85 to 8d027fc Compare September 29, 2020 16:13
@s0undt3ch s0undt3ch requested a review from Ch3LL September 29, 2020 16:28
Ch3LL
Ch3LL previously approved these changes Sep 29, 2020
View reviewed changes
Copy link
Contributor

@Ch3LL Ch3LL left a comment

Choose a reason for hiding this comment

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

Is there documentation that covers how to update dependencies for packages and test dependencies? If not we should add some, although does not need to be in this PR.

Also, will salt-pkg need to be udpated, because it is currently pulling in the requirements here: https://gitlab.com/saltstack/open/salt-pkg/-/blob/master/redhat/sources/requirements.txt

@s0undt3ch s0undt3ch force-pushed the features/static-pkg-requirements branch from 8d027fc to 9caca71 Compare September 30, 2020 06:56
s0undt3ch and others added 15 commits September 30, 2020 09:30
@s0undt3ch
Fix format keys
122e703
@s0undt3ch
Ohlo is long gone
8820616
@s0undt3ch
Fix path in license
17b5c8a
@s0undt3ch
Salt no longer supports IOFLO
e313185
@s0undt3ch
Move CI static requirements to it's own subdirectory
7efd601
@s0undt3ch
Salt is not Py2 compatible since Sodium
d773dfc
@s0undt3ch
Add packaging static requirements
67b25ad
@s0undt3ch
Use the locked packaging requirements
0706ce9
@s0undt3ch
Rework static requirements. Darwin and Windows packaging are now also…
49556ca 
… static.

Refs https://github.com/saltstack/release-planning/issues/238
@s0undt3ch
Allow choosing static vs base requirements.
c3ff9de 
Additionally, detect if setup is running under a tiamat build(single
binary).

If so, provide the locked requirements for linux instead of the base
requirements.
Windows and macOS already provide locked requirements, running under
pop-build or not.
@s0undt3ch
Update OSX build script to point to the right static requirements file
c09632a
@s0undt3ch
Update Windows build script to point to the right static requirements…
7643acb 
… file
@s0undt3ch
Upgrade pip on the created virtualenv's
439dd9f
@s0undt3ch
Strip out any pip flags when parsing requirements.
14bf175
@twangboy @s0undt3ch
Fix pip/setuptools upgrade
d31989f
@s0undt3ch s0undt3ch force-pushed the features/static-pkg-requirements branch from 9caca71 to d31989f Compare September 30, 2020 08:32
@s0undt3ch s0undt3ch merged commit 5b9b10c into master Sep 30, 2020
@s0undt3ch s0undt3ch deleted the features/static-pkg-requirements branch September 30, 2020 12:26
@s0undt3ch
Copy link
Collaborator Author

Is there documentation that covers how to update dependencies for packages and test dependencies? If not we should add some, although does not need to be in this PR.
No and we should add some.

Also, will salt-pkg need to be udpated, because it is currently pulling in the requirements here: https://gitlab.com/saltstack/open/salt-pkg/-/blob/master/redhat/sources/requirements.txt
Yes.

@bayandin bayandin mentioned this pull request Oct 15, 2020
Closed
@bayandin bayandin mentioned this pull request Nov 27, 2020
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twangboy twangboy twangboy left review comments

@Ch3LL Ch3LL Ch3LL left review comments

@thatch45 thatch45 Awaiting requested review from thatch45

@Akm0d Akm0d Awaiting requested review from Akm0d

Assignees

@s0undt3ch s0undt3ch

Labels
has-failing-test Magnesium Mg release after Na prior to Al
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@s0undt3ch @twangboy @Ch3LL @dwoz @sagetherage