protobuf 3.0.0b2 compiled protos

ValvePython · May 7, 2016 · 947766a · 947766a
1 parent 9736537
commit 947766a
Show file tree

Hide file tree

Showing 59 changed files with 7,859 additions and 4,575 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,9 @@ cache: pip
 sudo: false
 python:
     - "2.7"
-#     - "3.3"
-#     - "3.4"
-#     - "3.5"
+    - "3.3"
+    - "3.4"
+    - "3.5"
 install:
     - make init
     - pip install coveralls

diff --git a/Makefile b/Makefile
@@ -55,13 +55,15 @@ upload: dist register
 pb_fetch:
 	wget -nv --show-progress -N -P ./protobufs/ -i protobuf_list.txt
 	rename -v '.steamclient' '' protobufs/*.proto
+	sed -i '1s/^/syntax = "proto2"\;\n/' protobufs/*.proto
 	sed -i 's/cc_generic_services/py_generic_services/' protobufs/*.proto
 	sed -i 's/\.steamclient\.proto/.proto/' protobufs/*.proto
 
 pb_compile:
 	for filepath in `ls ./protobufs/*.proto`; do \
-		protoc --python_out ./steam/protobufs/ --proto_path=/usr/include --proto_path=./protobufs "$$filepath"; \
+		./tools/protoc3 --python_out ./steam/protobufs/ --proto_path=./tools/protobuf/src --proto_path=./protobufs "$$filepath"; \
 	done;
+	sed -i 's/^import /import steam.protobufs./' steam/protobufs/*_pb2.py
 
 pb_clear:
 	rm -f ./protobufs/*.proto ./steam/protobufs/*_pb2.py

diff --git a/README.rst b/README.rst
@@ -1,4 +1,4 @@
-|pypi| |license| |coverage| |scru| |master_build|
+|license| |coverage| |scru| |master_build|
 
 Module for interacting with various Steam_ features.
 
@@ -50,14 +50,14 @@ To run for ``python 2.7``, ``3.3``, ``3.4`` and ``pypy``, assuming you have them
     :target: https://pypi.python.org/pypi/steam
     :alt: MIT License
 
-.. |coverage| image:: https://img.shields.io/coveralls/ValvePython/steam/master.svg?style=flat
-    :target: https://coveralls.io/r/ValvePython/steam?branch=master
+.. |coverage| image:: https://img.shields.io/coveralls/ValvePython/steam/py3.svg?style=flat
+    :target: https://coveralls.io/r/ValvePython/steam?branch=py3
     :alt: Test coverage
 
-.. |scru| image:: https://scrutinizer-ci.com/g/ValvePython/steam/badges/quality-score.png?b=master
-    :target: https://scrutinizer-ci.com/g/ValvePython/steam/?branch=master
+.. |scru| image:: https://scrutinizer-ci.com/g/ValvePython/steam/badges/quality-score.png?b=py3
+    :target: https://scrutinizer-ci.com/g/ValvePython/steam/?branch=py3
     :alt: Scrutinizer score
 
-.. |master_build| image:: https://img.shields.io/travis/ValvePython/steam/master.svg?style=flat&label=master
-    :target: http://travis-ci.org/ValvePython/steam
+.. |master_build| image:: https://img.shields.io/travis/ValvePython/steam/master.svg?style=flat&label=py3
+    :target: http://travis-ci.org/ValvePython/steam/branches
     :alt: Build status of master branch
diff --git a/protobufs/content_manifest.proto b/protobufs/content_manifest.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 option optimize_for = SPEED;
 option py_generic_services = false;
 

diff --git a/protobufs/encrypted_app_ticket.proto b/protobufs/encrypted_app_ticket.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 option optimize_for = SPEED;
 option py_generic_services = false;
 

diff --git a/protobufs/gc.proto b/protobufs/gc.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 enum GCProtoBufMsgSrc {
 	GCProtoBufMsgSrc_Unspecified = 0;
 	GCProtoBufMsgSrc_FromSystem = 1;

diff --git a/protobufs/steammessages_base.proto b/protobufs/steammessages_base.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "google/protobuf/descriptor.proto";
 
 option optimize_for = SPEED;

diff --git a/protobufs/steammessages_broadcast.proto b/protobufs/steammessages_broadcast.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_clientserver.proto b/protobufs/steammessages_clientserver.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_base.proto";
 import "encrypted_app_ticket.proto";
 

diff --git a/protobufs/steammessages_clientserver_2.proto b/protobufs/steammessages_clientserver_2.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_base.proto";
 
 option optimize_for = SPEED;

diff --git a/protobufs/steammessages_cloud.proto b/protobufs/steammessages_cloud.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_credentials.proto b/protobufs/steammessages_credentials.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_depotbuilder.proto b/protobufs/steammessages_depotbuilder.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_deviceauth.proto b/protobufs/steammessages_deviceauth.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_econ.proto b/protobufs/steammessages_econ.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_gamenotifications.proto b/protobufs/steammessages_gamenotifications.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_gameservers.proto b/protobufs/steammessages_gameservers.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_inventory.proto b/protobufs/steammessages_inventory.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_linkfilter.proto b/protobufs/steammessages_linkfilter.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_offline.proto b/protobufs/steammessages_offline.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_parental.proto b/protobufs/steammessages_parental.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_partnerapps.proto b/protobufs/steammessages_partnerapps.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_physicalgoods.proto b/protobufs/steammessages_physicalgoods.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_player.proto b/protobufs/steammessages_player.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_publishedfile.proto b/protobufs/steammessages_publishedfile.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_secrets.proto b/protobufs/steammessages_secrets.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_twofactor.proto b/protobufs/steammessages_twofactor.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_unified_base.proto b/protobufs/steammessages_unified_base.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "google/protobuf/descriptor.proto";
 
 option optimize_for = SPEED;

diff --git a/protobufs/steammessages_unified_test.proto b/protobufs/steammessages_unified_test.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/protobufs/steammessages_video.proto b/protobufs/steammessages_video.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 import "steammessages_unified_base.proto";
 
 option py_generic_services = true;

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ enum34==1.1.2; python_version < '3.4'
 gevent==1.1.0
 mock==1.3.0
 nose==1.3.7
-protobuf==2.6.1
+protobuf==3.0.0b2
 cryptography==1.3
 PyYAML==3.11
 requests==2.9.1

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
 install_extras = {
     'client': [
         'gevent>=1.1.0',
-        'protobuf>=2.6.1',
+        'protobuf>=3.0.0b2',
         'gevent-eventemitter>=1.4',
     ],
 }