Merge pull request #11196 from ericsalo/21.x

sync with current 21.x upb
protocolbuffers · Dec 8, 2022 · c0bc0cf · c0bc0cf
2 parents d024e3b + 9d17e97
commit c0bc0cf
Show file tree

Hide file tree

Showing 6 changed files with 24,179 additions and 19,552 deletions.
diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc
@@ -36,7 +36,7 @@ pyenv install -v -s 2.7.18 && pyenv global 2.7.18
 if [[ "${KOKORO_INSTALL_TOX:-}" == "yes" ]] ; then
   pyenv install -v -s 3.7.13
   pyenv global 3.7.13
-  sudo python -m pip install --upgrade pip tox tox-pyenv
+  sudo python -m pip install --upgrade pip 'tox==3.27.1' tox-pyenv
 fi
 
 ##