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

Cherry-pick fixes for 3.18.1 #9021

Merged
merged 6 commits into from Sep 30, 2021

Commits on Sep 24, 2021

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

    * Add python-requires in setup.py
    
    * Update setup.py
    aisk authored and acozzette committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    2fffff8 View commit details
    Browse the repository at this point in the history
  2. Fix dist install test by ensuring that we use Python 3 (protocolbuffe…

    …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
    acozzette committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    151e632 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Update dist_install test to work around Python issue

    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.
    acozzette committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    0e7a35f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0333cb7 View commit details
    Browse the repository at this point in the history
  3. Fix Ruby tests on Mac

    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.
    acozzette committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    55b0e11 View commit details
    Browse the repository at this point in the history
  4. Use the stable version of rvm

    I am hoping this will fix the error we are getting as described here:
    rvm/rvm#5014
    acozzette committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    5378c9a View commit details
    Browse the repository at this point in the history