Updated Protobuf-version requirements.

tcld · tcld · commit 93f14d2954db · 2015-11-16T10:56:40.000+01:00
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@
         'console_scripts': ['worldengine=worldengine.cli.main:main'],
     },
     'install_requires': ['PyPlatec==1.4.0', 'pypng>=0.0.18', 'numpy>=1.9.2, <= 1.10.0.post2',
-                         'argparse==1.2.1', 'noise==1.2.2', 'protobuf>=2.6.0'],
+                         'argparse==1.2.1', 'noise==1.2.2', 'protobuf==3.0.0a3'],
     'license': 'MIT License'
 }
 
diff --git a/tox.ini b/tox.ini
@@ -8,7 +8,6 @@ deps =
     PyPlatec
     noise
     nose
-    protobuf
     six
     pypng
     h5py
@@ -18,6 +17,7 @@ deps =
     coverage
     numpy==1.9.2
     pygdal==1.10.0.1
+    protobuf==3.0.0a3
     {[base]deps}
 
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`'console_scripts': ['worldengine=worldengine.cli.main:main'],`
`27`	`27`	`},`
`28`	`28`	`'install_requires': ['PyPlatec==1.4.0', 'pypng>=0.0.18', 'numpy>=1.9.2, <= 1.10.0.post2',`
`29`		`- 'argparse==1.2.1', 'noise==1.2.2', 'protobuf>=2.6.0'],`
	`29`	`+ 'argparse==1.2.1', 'noise==1.2.2', 'protobuf==3.0.0a3'],`
`30`	`30`	`'license': 'MIT License'`
`31`	`31`	`}`
`32`	`32`