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

Integrate from Piper for C++, Java, and Python #8076

Merged
merged 8 commits into from
Nov 23, 2020

Conversation

haberman
Copy link
Member

Important: this integration must be merged, not squashed!

python/setup.py Outdated
@@ -254,7 +254,7 @@ def get_option_from_sys_argv(option_str):
os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp'

# Keep this list of dependencies in sync with tox.ini.
install_requires = ['six>=1.9']
install_requires = ['six>=1.9', 'setuptools']
Copy link
Member

Choose a reason for hiding this comment

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

This setuptools dependency was just recently deleted in #7511 so I think something must be going wrong if it's getting reverted.

Python 3.8 changed the meaning and type of the tp_print slot.
@@ -348,7 +348,7 @@ class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {
}
}

// The following are routines are for monitoring. They will aproximate the

Choose a reason for hiding this comment

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

CHANGES.txt

Copy link
Member Author

Choose a reason for hiding this comment

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

Are you suggesting that something needs to be added to CHANGES.txt here?

@haberman haberman merged commit bd9a710 into protocolbuffers:master Nov 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants