Cherry-pick fixes for 3.18.1#9021

Merged

acozzette merged 6 commits intoprotocolbuffers:3.18.xfrom

acozzette:cherry-pick-fixes

Sep 30, 2021

acozzette commented Sep 24, 2021 •

edited

Loading

This PR cherry-picks a couple fixes for the 3.18.1 release. The main one is from #8989 and ensures that we explicitly require Python 3 in setup.py. I also made some other small tweaks to get all the tests passing.

aisk and others added 2 commits

September 24, 2021 12:30


          Add python-requires in setup.py (protocolbuffers#8989)

2fffff8

* Add python-requires in setup.py

* Update setup.py


          Fix dist install test by ensuring that we use Python 3 (protocolbuffe…

151e632

…rs#9011)

* Fix dist install test by ensuring that we use Python 3

Now that we have dropped Python 2 support, we need to make sure this
install test uses Python 3.

* Update Docker image to install Python 3 version of setuptools

* Run pip3 instead of pip

google-cla Bot commented Sep 24, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla Bot added the cla: no label

google-cla Bot commented Sep 24, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

acozzette added the cla: yes label

google-cla Bot removed the cla: no label

Author

acozzette commented Sep 24, 2021

The CLA is OK because the cherry-picked commits already went through the CLA check on the master branch.

acozzette added release notes: no labels

protobuf-kokoro removed kokoro:run labels

acozzette requested a review from haberman

September 24, 2021 19:48

haberman approved these changes

View reviewed changes

google-cla Bot commented Sep 24, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla Bot removed the cla: yes label

acozzette added cla: yes kokoro:run labels

google-cla Bot added cla: no and removed cla: no labels

protobuf-kokoro removed the kokoro:run label

acozzette force-pushed the cherry-pick-fixes branch from 32b785c to 65efe58 Compare

September 24, 2021 22:03

google-cla Bot commented Sep 24, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla Bot added cla: no and removed cla: yes labels

acozzette added the cla: yes label

google-cla Bot removed the cla: no label

acozzette added cla: no kokoro:run labels

acozzette added the kokoro:force-run label

protobuf-kokoro removed the kokoro:force-run label

acozzette force-pushed the cherry-pick-fixes branch from b7a948b to 88a9e5f Compare

September 30, 2021 00:12

google-cla Bot commented Sep 30, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla Bot added cla: no and removed cla: yes labels

acozzette added the cla: yes label

google-cla Bot removed the cla: no label

acozzette added cla: no kokoro:run labels

protobuf-kokoro removed the kokoro:run label

acozzette force-pushed the cherry-pick-fixes branch from 88a9e5f to b59ad78 Compare

September 30, 2021 16:40

google-cla Bot commented Sep 30, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla Bot removed the cla: yes label

acozzette added cla: yes kokoro:run labels

google-cla Bot removed the cla: no label

protobuf-kokoro removed the kokoro:run label

acozzette force-pushed the cherry-pick-fixes branch from b59ad78 to 115e69d Compare

September 30, 2021 17:38

google-cla Bot commented Sep 30, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

Adam Cozzette added 2 commits

September 30, 2021 11:53


          Update dist_install test to work around Python issue

0e7a35f

googletest uses a Python script in its build which is not compatible
with Python 3. Unfortunately we can't easily upgrade googletest right
now, so this commit works around the problem by putting a python symlink
pointing to Python 2 in the $PATH.


          Update ruby/travis-test.sh to print commands

0333cb7

google-cla Bot commented Sep 30, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

3 similar comments

google-cla Bot commented Sep 30, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla Bot commented Sep 30, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla Bot commented Sep 30, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.


          Fix Ruby tests on Mac

55b0e11

It appears that this extra conditional in travis-test.sh is no longer
necessary, and in fact we need to avoid using a custom version of
OpenSSL since that is causing its own error.

google-cla Bot commented Sep 30, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.


          Use the stable version of rvm

5378c9a

I am hoping this will fix the error we are getting as described here:
rvm/rvm#5014

google-cla Bot commented Sep 30, 2021

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels