From 430a846d3fa5957e77e0f82e6fc7a91f626f34a3 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Sat, 8 Oct 2022 15:56:57 +0100 Subject: [PATCH 1/3] Add a warning comment to the vendoring session in noxfile --- noxfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/noxfile.py b/noxfile.py index 8199b64a681..975f52c2571 100644 --- a/noxfile.py +++ b/noxfile.py @@ -172,6 +172,10 @@ def lint(session: nox.Session) -> None: session.run("pre-commit", "run", *args) +# NOTE: This session will COMMIT upgardes to vendored libraries. +# You should therefore not run it directly against main, as you +# will put your main branch out of sync with upstream. Always run +# it on a dedicated branch @nox.session def vendoring(session: nox.Session) -> None: session.install("vendoring~=1.2.0") From bed8c14b251468cbddae542823ad023cd1be3f46 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Sat, 8 Oct 2022 17:30:30 +0100 Subject: [PATCH 2/3] Update noxfile.py Co-authored-by: Pradyun Gedam --- noxfile.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/noxfile.py b/noxfile.py index 975f52c2571..2227c33eee1 100644 --- a/noxfile.py +++ b/noxfile.py @@ -172,10 +172,13 @@ def lint(session: nox.Session) -> None: session.run("pre-commit", "run", *args) -# NOTE: This session will COMMIT upgardes to vendored libraries. -# You should therefore not run it directly against main, as you -# will put your main branch out of sync with upstream. Always run -# it on a dedicated branch +# NOTE: This session will COMMIT upgrades to vendored libraries. +# You should therefore not run it directly against `main`. If you +# do (asusming you started with a clean main), you can run: +# +# git checkout -b vendoring-updates +# git checkout main +# git reset --hard origin/main @nox.session def vendoring(session: nox.Session) -> None: session.install("vendoring~=1.2.0") From 08b7a100cae368c544b1e353f285286f38fcded5 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 8 Oct 2022 17:47:22 +0100 Subject: [PATCH 3/3] Update noxfile.py --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 2227c33eee1..7692bf4b507 100644 --- a/noxfile.py +++ b/noxfile.py @@ -174,7 +174,7 @@ def lint(session: nox.Session) -> None: # NOTE: This session will COMMIT upgrades to vendored libraries. # You should therefore not run it directly against `main`. If you -# do (asusming you started with a clean main), you can run: +# do (assuming you started with a clean main), you can run: # # git checkout -b vendoring-updates # git checkout main