From 8e61d323bf536651f7be8a342b92f35d547b38b4 Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Wed, 4 Mar 2015 15:28:35 -0800 Subject: Fix python package version to alpha-2. Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf --- python/google/protobuf/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/google/protobuf/__init__.py') diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index ec3b0934..d1af74ba 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -32,4 +32,4 @@ # # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.0.0-pre' +__version__ = '3.0.0-alpha-2' -- cgit v1.2.3 From 4573e110b89d3b1288f2f9f611fc85b91256db3a Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Wed, 4 Mar 2015 16:45:13 -0800 Subject: Fix python versions to comply with pep-0440. Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c --- python/google/protobuf/__init__.py | 2 +- python/setup.py | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'python/google/protobuf/__init__.py') diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index ef8c9c58..1345bd5f 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -32,4 +32,4 @@ # # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.0.0-alpha-3-pre' +__version__ = '3.0.0a3.dev0' diff --git a/python/setup.py b/python/setup.py index b97fdaea..c18818e2 100755 --- a/python/setup.py +++ b/python/setup.py @@ -44,6 +44,18 @@ elif os.path.exists("../vsprojects/Release/protoc.exe"): else: protoc = find_executable("protoc") +def GetVersion(): + """Gets the version from google/protobuf/__init__.py + + Do not import google.protobuf.__init__ directly, because an installed protobuf + library may be loaded instead. + + """ + with open(os.path.join('google', 'protobuf', '__init__.py')) as version_file: + exec(version_file.read()) + return __version__ + + def generate_proto(source): """Invokes the Protocol Compiler to generate a _pb2.py from the given .proto file. Does nothing if the output already exists and is newer than @@ -150,7 +162,7 @@ if __name__ == '__main__': os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp' setup(name = 'protobuf', - version = '3.0.0-alpha-3-pre', + version = GetVersion(), packages = [ 'google' ], namespace_packages = [ 'google' ], google_test_dir = "google/protobuf/internal", -- cgit v1.2.3 From 9839c0c2c964f2c3881be042758536e9bd68bd8a Mon Sep 17 00:00:00 2001 From: teboring Date: Fri, 22 May 2015 22:22:21 -0700 Subject: Update version number to 3.0.0-alpha-3 --- configure.ac | 2 +- java/pom.xml | 4 ++-- javanano/pom.xml | 4 ++-- protoc-artifacts/pom.xml | 2 +- python/google/protobuf/__init__.py | 2 +- ruby/Gemfile.lock | 2 +- ruby/google-protobuf.gemspec | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'python/google/protobuf/__init__.py') diff --git a/configure.ac b/configure.ac index 8338c18d..92bc0471 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) # In the SVN trunk, the version should always be the next anticipated release # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[3.0.0-alpha-3-pre],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.0.0-alpha-3],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/java/pom.xml b/java/pom.xml index 112bd9c3..cb41977c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,7 +10,7 @@ com.google.protobuf protobuf-java - 3.0.0-alpha-3-pre + 3.0.0-alpha-3 bundle Protocol Buffer Java API @@ -164,7 +164,7 @@ https://developers.google.com/protocol-buffers/ com.google.protobuf - com.google.protobuf;version=3.0.0-alpha-3-pre + com.google.protobuf;version=3.0.0-alpha-3 diff --git a/javanano/pom.xml b/javanano/pom.xml index 3d8cfb9f..73496779 100644 --- a/javanano/pom.xml +++ b/javanano/pom.xml @@ -10,7 +10,7 @@ com.google.protobuf.nano protobuf-javanano - 3.0.0-alpha-3-pre + 3.0.0-alpha-3 bundle Protocol Buffer JavaNano API @@ -165,7 +165,7 @@ https://developers.google.com/protocol-buffers/ com.google.protobuf - com.google.protobuf;version=3.0.0-alpha-3-pre + com.google.protobuf;version=3.0.0-alpha-3 diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index fad81b57..28ba0049 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -10,7 +10,7 @@ com.google.protobuf protoc - 3.0.0-alpha-3-pre + 3.0.0-alpha-3 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 1345bd5f..46d29fa4 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -32,4 +32,4 @@ # # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.0.0a3.dev0' +__version__ = '3.0.0a3' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 6f349276..2cf5e472 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - google-protobuf (3.0.0.alpha.3.1.pre) + google-protobuf (3.0.0.alpha.3) GEM remote: https://rubygems.org/ diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 28cdebf5..3f98a37b 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.0.0.alpha.3.1.pre" + s.version = "3.0.0.alpha.3" s.licenses = ["BSD"] s.summary = "Protocol Buffers" s.description = "Protocol Buffers are Google's data interchange format." -- cgit v1.2.3 From e107e2d68edb550bc7763db2cbbc463ae264dcce Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Fri, 29 May 2015 11:00:57 -0700 Subject: Update version number to 3.0.0-alpha-4 --- configure.ac | 2 +- java/pom.xml | 2 +- javanano/pom.xml | 2 +- protoc-artifacts/pom.xml | 2 +- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'python/google/protobuf/__init__.py') diff --git a/configure.ac b/configure.ac index 4e1c0d24..8018cc75 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) # In the SVN trunk, the version should always be the next anticipated release # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[3.0.0-alpha-3],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.0.0-alpha-4-pre],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/java/pom.xml b/java/pom.xml index cb41977c..f0969db7 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,7 +10,7 @@ com.google.protobuf protobuf-java - 3.0.0-alpha-3 + 3.0.0-alpha-4-pre bundle Protocol Buffer Java API diff --git a/javanano/pom.xml b/javanano/pom.xml index 73496779..3b3813ab 100644 --- a/javanano/pom.xml +++ b/javanano/pom.xml @@ -10,7 +10,7 @@ com.google.protobuf.nano protobuf-javanano - 3.0.0-alpha-3 + 3.0.0-alpha-4-pre bundle Protocol Buffer JavaNano API diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 28ba0049..52a7d2d6 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -10,7 +10,7 @@ com.google.protobuf protoc - 3.0.0-alpha-3 + 3.0.0-alpha-4-pre pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 46d29fa4..3f67dfc7 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -32,4 +32,4 @@ # # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.0.0a3' +__version__ = '3.0.0a4.dev0' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 3f98a37b..a9e570ec 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.0.0.alpha.3" + s.version = "3.0.0.alpha.4.0.pre" s.licenses = ["BSD"] s.summary = "Protocol Buffers" s.description = "Protocol Buffers are Google's data interchange format." -- cgit v1.2.3