Skip to content

Commit 4dc5238

Browse files
authored
fix(ci): Pin protobuf version until new major is not supported (#369)
* This only fixes up the CI part, a new commit will fix the setup.py so pip2 can install instana
1 parent bf00c97 commit 4dc5238

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

.circleci/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ commands:
2020
virtualenv --python=python2.7 --always-copy venv
2121
. venv/bin/activate
2222
pip install 'wheel>=0.29.0'
23+
# Install pinned verison of proobuf first,
24+
# as opentracing in the core requirements
25+
# would pull in a newer one
26+
pip install 'protobuf<4.0.0'
2327
pip install -r requirements.txt
2428
pip install -r <<parameters.requirements>>
2529
@@ -257,7 +261,6 @@ jobs:
257261
working_directory: ~/repo
258262
steps:
259263
- checkout
260-
- install-couchbase-deps
261264
- pip-install-deps-27:
262265
requirements: "tests/requirements-cassandra.txt"
263266
- run:

tests/requirements-27.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ PyMySQL[rsa]>=0.9.1
1919
pyOpenSSL>=16.1.0;python_version<="2.7"
2020
psycopg2>=2.7.1
2121
pika>=1.0.0
22+
23+
# protobuf is pulled in and also `basictracer`, a core instana dependency
24+
# and also by google-cloud-storage
25+
# but also directly needed by tests/apps/grpc_server/stan_pb2.py
26+
# when protobuf is above 4.0.0 the following error happens:
27+
# ERROR: Package 'protobuf' requires a different Python: 2.7.16 not in '>=3.7'
28+
protobuf<4.0.0
29+
2230
pymongo>=3.7.0
2331
pyramid>=1.2
2432
pytest>=4.6

tests/requirements-310.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@ nose>=1.3.7
2929
PyMySQL[rsa]>=1.0.2
3030
psycopg2-binary>=2.8.6
3131
pika>=1.2.0
32+
33+
# protobuf is pulled in and also `basictracer`, a core instana dependency
34+
# and also by google-cloud-storage
35+
# but also directly needed by tests/apps/grpc_server/stan_pb2.py
36+
# On 4.0.0 we currently get:
37+
# AttributeError: module 'google._upb._message' has no attribute 'Message'
38+
# TODO: Remove this when support for 4.0.0 is done
39+
protobuf<4.0.0
40+
3241
pymongo>=3.11.4
3342
pyramid>=2.0
3443
pytest>=6.2.4

tests/requirements.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ nose>=1.3.7
1717
PyMySQL[rsa]>=1.0.2
1818
psycopg2-binary>=2.8.6
1919
pika>=1.2.0
20+
21+
# protobuf is pulled in and also `basictracer`, a core instana dependency
22+
# and also by google-cloud-storage
23+
# but also directly needed by tests/apps/grpc_server/stan_pb2.py
24+
# On 4.0.0 we currently get:
25+
# AttributeError: module 'google._upb._message' has no attribute 'Message'
26+
# TODO: Remove this when support for 4.0.0 is done
27+
protobuf<4.0.0
28+
2029
pymongo>=3.11.4
2130
pyramid>=2.0
2231
pytest>=6.2.4

0 commit comments

Comments
 (0)