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

Adjust tox passenv to be multiline #6405

Merged
merged 1 commit into from
Dec 7, 2022
Merged

Adjust tox passenv to be multiline #6405

merged 1 commit into from
Dec 7, 2022

Conversation

jtcohen6
Copy link
Contributor

@jtcohen6 jtcohen6 commented Dec 7, 2022

deals with tox-dev/tox#2615

(or we can pin to tox<4)

Checklist

@jtcohen6 jtcohen6 requested a review from a team as a code owner December 7, 2022 21:11
@cla-bot cla-bot bot added the cla:yes label Dec 7, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Dec 7, 2022

Thank you for your pull request! We could not find a changelog entry for this change. For details on how to document a change, see the contributing guide.

@jtcohen6 jtcohen6 added the Skip Changelog Skips GHA to check for changelog file label Dec 7, 2022
Copy link
Member

@emmyoop emmyoop left a comment

Choose a reason for hiding this comment

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

Let's fix it if it's this easy instead of pinning it.

@jtcohen6 jtcohen6 merged commit 9c91f3a into main Dec 7, 2022
@jtcohen6 jtcohen6 deleted the jerco/tox-ick branch December 7, 2022 21:47
@jtcohen6 jtcohen6 added backport 1.0.latest Tag for PR to be backported to the 1.0.latest branch backport 1.1.latest backport 1.2.latest This PR will be backported to the 1.2.latest branch backport 1.3.latest labels Dec 7, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Dec 7, 2022

The backport to 1.0.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.0.latest 1.0.latest
# Navigate to the new working tree
cd .worktrees/backport-1.0.latest
# Create a new branch
git switch --create backport-6405-to-1.0.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9c91f3a7bd40f4f071a5349cf1ce63c4b591c927
# Push it to GitHub
git push --set-upstream origin backport-6405-to-1.0.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.0.latest

Then, create a pull request where the base branch is 1.0.latest and the compare/head branch is backport-6405-to-1.0.latest.

@github-actions
Copy link
Contributor

github-actions bot commented Dec 7, 2022

The backport to 1.3.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3.latest 1.3.latest
# Navigate to the new working tree
cd .worktrees/backport-1.3.latest
# Create a new branch
git switch --create backport-6405-to-1.3.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9c91f3a7bd40f4f071a5349cf1ce63c4b591c927
# Push it to GitHub
git push --set-upstream origin backport-6405-to-1.3.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3.latest

Then, create a pull request where the base branch is 1.3.latest and the compare/head branch is backport-6405-to-1.3.latest.

@github-actions
Copy link
Contributor

github-actions bot commented Dec 7, 2022

The backport to 1.2.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.2.latest 1.2.latest
# Navigate to the new working tree
cd .worktrees/backport-1.2.latest
# Create a new branch
git switch --create backport-6405-to-1.2.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9c91f3a7bd40f4f071a5349cf1ce63c4b591c927
# Push it to GitHub
git push --set-upstream origin backport-6405-to-1.2.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.2.latest

Then, create a pull request where the base branch is 1.2.latest and the compare/head branch is backport-6405-to-1.2.latest.

@github-actions
Copy link
Contributor

github-actions bot commented Dec 7, 2022

The backport to 1.1.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.1.latest 1.1.latest
# Navigate to the new working tree
cd .worktrees/backport-1.1.latest
# Create a new branch
git switch --create backport-6405-to-1.1.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9c91f3a7bd40f4f071a5349cf1ce63c4b591c927
# Push it to GitHub
git push --set-upstream origin backport-6405-to-1.1.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.1.latest

Then, create a pull request where the base branch is 1.1.latest and the compare/head branch is backport-6405-to-1.1.latest.

@jtcohen6
Copy link
Contributor Author

jtcohen6 commented Dec 7, 2022

It was worth a shot

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.0.latest Tag for PR to be backported to the 1.0.latest branch backport 1.1.latest backport 1.2.latest This PR will be backported to the 1.2.latest branch backport 1.3.latest cla:yes Skip Changelog Skips GHA to check for changelog file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants