Adam Cozzette
94d55e5292
Merge branch '3.6.x' into merge-3-6-x
2018-08-01 13:44:55 -07:00
Adam Cozzette
9e1286b949
Updated version numbers to 3.6.1
2018-07-27 13:30:28 -07:00
Arun Olappamanna Vasudevan
c7e0e262a6
pyext needs c++11 in linux and mac. ( #4930 )
2018-07-23 13:35:15 -07:00
Feng Xiao
2dcd6ae409
Remove/replace travis references ( #4953 )
...
* Remove/replace travis references.
2018-07-22 17:14:24 -07:00
Yilun Chong
359889bafd
fix python cpp kokoro build
2018-07-15 21:01:48 -07:00
Yilun Chong
14bc658175
fix python cpp kokoro build
2018-07-12 16:49:26 -07:00
Ben Webb
0a59054c30
Add Python 3.7 compatibility ( #4862 )
...
Compilation of Python wrappers fails with Python 3.7 because
the Python folks changed their C API such that
PyUnicode_AsUTF8AndSize() now returns a const char* rather
than a char*. Add a patch to work around. Relates #4086 .
2018-07-12 10:58:10 -07:00
Thomas Colthurst
79700b56b9
Update message_module.cc ( #4835 )
...
* Update message_module.cc
Add missing piece from pull request #4698 : actually initialize the new API object.
* Update message_module.cc
2018-07-03 13:52:27 -07:00
Thomas Colthurst
1ae2cc02b6
Fix capsule name. ( #4836 )
...
Internal convert file was broken. Change the capsule to the correct name
2018-06-29 11:07:29 -07:00
Adam Cozzette
d6f346b4d5
Merge pull request #4827 from acozzette/merge-3-6-x
...
Merge 3.6.x branch into master
2018-06-25 15:52:29 -07:00
Yuchen Xie
595231dd5c
Update minimal Python version to 2.7 ( #4207 )
2018-06-25 15:20:53 -07:00
Adam Cozzette
82d3d7d250
Merge branch '3.6.x' into merge-3-6-x
2018-06-25 13:22:10 -07:00
cclauss
35567c1668
global __version__ In setup.py ( #4753 )
...
This change helps both humans and linters to understand the unusual method of instantiating this global variable.
2018-06-25 10:50:40 -07:00
cclauss
35c6927cc1
import inspect ( #3507 )
...
Inspect is used five times on line 65-74 without being imported.
2018-06-11 14:17:46 -07:00
Thomas Colthurst
7c6514245b
Introduce Proto C API; based on cl/198113115 by amauryfa
2018-05-30 10:33:02 -04:00
Paul Yang
6f723a6624
Always add -std=c++11 for mac ( #4684 )
2018-05-25 14:42:41 -07:00
Jisi Liu
45eb28b588
Update version number to 3.6.0
2018-05-14 16:06:22 -07:00
Yilun Chong
4a09836e6c
Fix python ext build on kokoro ( #4527 )
2018-05-03 15:55:27 -07:00
Thomas Hisch
451e0446ab
Add __init__.py files to compiler and util subpackages ( #4117 )
...
The compiler and util subpackages are created by the build_py class in
setup.py. This has caused an issue in the protobuf package in
conda-forge (https://github.com/conda-forge/protobuf-feedstock/issues/40 ),
which is fixed by this commit.
2018-04-09 12:43:10 -07:00
Paul Yang
3b6d027ba2
For windows, all python version should use /MT ( #4468 )
2018-04-06 15:43:32 -07:00
Paul Yang
c931743461
Merge branch ( #4466 )
...
* Fix setup.py for windows build.
* Bump version number to 3.5.2
* Cat the test-suite.log on errors for presubits
2018-04-02 15:55:28 -07:00
Adam Cozzette
11d26ce24c
Removed unused variables in repeated_scalar_container.cc
2018-03-20 14:44:30 -07:00
Adam Cozzette
8b3a72f3e9
Removed unused code pertaining to shared_ptr
2018-03-20 14:44:30 -07:00
Adam Cozzette
c5fcce5f69
Added pyext/thread_unsafe_shared_ptr.h
2018-03-20 13:02:18 -07:00
Adam Cozzette
3fa5dadb61
Removed unrecognized option from no_package.proto
2018-03-20 13:02:18 -07:00
Adam Cozzette
837c94b86f
Include no_package.proto in Python test
2018-03-14 13:11:32 -07:00
Adam Cozzette
afe96b6d42
Merge branch 'master' into down-integrate
2018-03-13 16:54:31 -07:00
Adam Cozzette
0400cca323
Integrated internal changes from Google
2018-03-13 16:37:29 -07:00
Jie Luo
e34ec6077a
Only check filenames when end with .py in _CalledFromGeneratedFile() ( #4262 )
...
* Cython's stack does not have .py file name. Only check filenames when end with .py for _CalledFromGeneratedFile()
2018-02-09 15:54:03 -08:00
Jisi Liu
ec826c5a59
Merge remote-tracking branch 'origin/3.5.x' into master
2018-01-03 09:28:58 -08:00
Jisi Liu
383a4941d5
Merge remote-tracking branch 'origin/3.5.x' into master
2018-01-03 09:28:40 -08:00
Jisi Liu
8fc40b5502
Fix uploading binary wheel.
...
The script now takes two prompt for user name and password. One single
input redirection no longer works.
2017-12-22 12:05:37 -08:00
Jisi Liu
7ad8e7ad59
Disable pip cache when testing uploaded packages
...
Otherwise, pip complains "cannot find a version satisfies the
requirement." I suspect it was due to caching issues. I usued to
manually add a `sleep 30` between the upload and the installation test
which is quite unstable.
2017-12-22 11:47:13 -08:00
Feng Xiao
a5b743f8ae
Merge pull request #4030 from cyyber/master
...
Calling Keychecker before checking key in MessageMap
2017-12-20 12:07:46 -08:00
Jisi Liu
050fc9a437
Update version number to 3.5.1
2017-12-19 11:00:33 -08:00
Feng Xiao
3a06fe1fc9
Fix file permission for python package.
...
`umask 0022` makes sure the created package will be accessible by all users.
2017-12-15 12:57:26 -08:00
Feng Xiao
77d32bc56c
Merge pull request #4053 from xfxyjwf/fixumask
...
Fix file permission for python package.
2017-12-15 12:09:19 -08:00
Feng Xiao
0fc85acdf2
Fix file permission for python package.
...
`umask 0022` makes sure the created package will be accessible by all users.
2017-12-14 17:54:18 -08:00
cyyber
0e2089c775
Calling Keychecker before checking key in MessageMap
2017-12-15 01:01:31 +05:30
Jisi Liu
acadade56e
Remove py2.6 support.
2017-12-14 11:26:58 -08:00
Jisi Liu
594ec2262c
Fix python descriptor test.
2017-12-14 11:16:34 -08:00
Adam Cozzette
0ba8eea655
Merge branch 'master' into down-integrate
2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7
Integrated internal changes from Google
2017-12-01 10:05:10 -08:00
Adam Cozzette
a27da09339
Merge branch '3.5.x' into 3.5.x-merge
2017-11-30 13:34:51 -08:00
Jisi Liu
cf65a7946f
Update version for 3.5.0.post1
2017-11-22 14:05:10 -08:00
Jie Luo
45d99a15f3
Add _file_desc_by_toplevel_extension back
...
Add _file_desc_by_toplevel_extension back for compatibility issue with 3.4.1.
_file_desc_by_toplevel_extension is a temporary solution for FieldDescriptor.file.
FieldDescriptor.file was added in code gen. However, we need to keep it for some time for compatibility reason (with 3.4.1 only). May try to remove it after 2 years.
2017-11-22 13:59:11 -08:00
Paul Kilgo
9935829a66
Include .cc and .h files in source distribution
2017-11-17 15:30:31 -08:00
Jisi Liu
97dd175a91
Update version number to 3.5.0
2017-11-02 14:16:22 -07:00
Roman Nekhoroshev
da3bfa693a
Fix a typo in WKT's test suite
...
Hi!
Sorry for bothering with such a minor thing, but I just noticed and fixed one annoying typo in WKT's test suite:
`"accpets" -> "accepts"`
Thanks!
2017-11-02 13:47:11 -07:00
Jisi Liu
07b9238a1c
Merge pull request #3770 from pherl/3.5-integrate
...
Integrate google internal changes for the up coming 3.5 release.
2017-10-19 10:48:54 -07:00