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

Removal of Windows msi installer related function #56352

Merged
merged 19 commits into from
Apr 18, 2020
Merged

Removal of Windows msi installer related function #56352

merged 19 commits into from
Apr 18, 2020

Conversation

marbx
Copy link
Contributor

@marbx marbx commented Mar 11, 2020

What does this PR do?

  • Removes code related to the Windows msi installer builder.
    • The builder containes the removed code since PR #41

Tests written?

No, only code removed.

@marbx marbx requested a review from a team as a code owner March 11, 2020 00:43
@ghost ghost requested a review from Ch3LL March 11, 2020 00:43
@marbx
Copy link
Contributor Author

marbx commented Mar 11, 2020

@twangboy could you please pick up and review?

salt/version.py Outdated Show resolved Hide resolved
@marbx marbx changed the title Windows msi installer internal version for 3000 scheme Removal of Windows msi installer related function Mar 12, 2020
twangboy
twangboy previously approved these changes Mar 13, 2020
@twangboy twangboy added ZRelease-Sodium retired label severity-high 2nd top severity, seen by most users, causes major problems P1 Priority 1 labels Mar 13, 2020
@Ch3LL Ch3LL self-assigned this Mar 16, 2020
Ch3LL
Ch3LL previously approved these changes Mar 16, 2020
@Ch3LL
Copy link
Contributor

Ch3LL commented Apr 8, 2020

ping @markuskramerIgitt looks like there is a conflict here that needs to be resolved. im guessing this conflict occurred with migrating to using the black tool in this PR addition: #55765

@marbx
Copy link
Contributor Author

marbx commented Apr 8, 2020

Thank you @Ch3LL
Conflict solved

@marbx
Copy link
Contributor Author

marbx commented Apr 10, 2020

Why does the ci/pre-commit check fails?

@DmitryKuzmenko
Copy link
Contributor

@markuskramerIgitt we are using isor and black for code formatting. You can follow the Details link on the pre-commit check and then click Console Output and scroll down to black ...... Failed. It shows the diff with changes recommended to be applied.
Also it's recommended to install pre-commit hook that would do the job for you before commit.

pip install pre-commit
pre-commit install

After this pre-commit would run automatically on commit or you can run it manually for your changes using pre-commit run --files $(git show --pretty="" --name-only master..HEAD) or just run isort and black on your changes with this:

FILES="$(git show --pretty="" --name-only master..HEAD)"
pre-commit run isort --files $FILES
pre-commit run black --files $FILES

@marbx marbx dismissed stale reviews from Ch3LL and twangboy via ba16abe April 12, 2020 09:32
@marbx
Copy link
Contributor Author

marbx commented Apr 12, 2020

Thank you @DmitryKuzmenko
ci/pre-commit passed

@dwoz
Copy link
Contributor

dwoz commented Apr 13, 2020

@twangboy Does this look good to you now?

@twangboy
Copy link
Contributor

@dwoz Yeah, looks good.

@dwoz dwoz merged commit 5dbc010 into saltstack:master Apr 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P1 Priority 1 severity-high 2nd top severity, seen by most users, causes major problems ZRelease-Sodium retired label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants