Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ commands:
virtualenv --python=python2.7 --always-copy venv
. venv/bin/activate
pip install 'wheel>=0.29.0'
# Install pinned verison of proobuf first,
# as opentracing in the core requirements
# would pull in a newer one
pip install 'protobuf<4.0.0'
pip install -r requirements.txt
pip install -r <<parameters.requirements>>

Expand Down Expand Up @@ -257,7 +261,6 @@ jobs:
working_directory: ~/repo
steps:
- checkout
- install-couchbase-deps
- pip-install-deps-27:
requirements: "tests/requirements-cassandra.txt"
- run:
Expand Down
8 changes: 8 additions & 0 deletions tests/requirements-27.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ PyMySQL[rsa]>=0.9.1
pyOpenSSL>=16.1.0;python_version<="2.7"
psycopg2>=2.7.1
pika>=1.0.0

# protobuf is pulled in and also `basictracer`, a core instana dependency
# and also by google-cloud-storage
# but also directly needed by tests/apps/grpc_server/stan_pb2.py
# when protobuf is above 4.0.0 the following error happens:
# ERROR: Package 'protobuf' requires a different Python: 2.7.16 not in '>=3.7'
protobuf<4.0.0

pymongo>=3.7.0
pyramid>=1.2
pytest>=4.6
Expand Down
9 changes: 9 additions & 0 deletions tests/requirements-310.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ nose>=1.3.7
PyMySQL[rsa]>=1.0.2
psycopg2-binary>=2.8.6
pika>=1.2.0

# protobuf is pulled in and also `basictracer`, a core instana dependency
# and also by google-cloud-storage
# but also directly needed by tests/apps/grpc_server/stan_pb2.py
# On 4.0.0 we currently get:
# AttributeError: module 'google._upb._message' has no attribute 'Message'
# TODO: Remove this when support for 4.0.0 is done
protobuf<4.0.0

pymongo>=3.11.4
pyramid>=2.0
pytest>=6.2.4
Expand Down
9 changes: 9 additions & 0 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ nose>=1.3.7
PyMySQL[rsa]>=1.0.2
psycopg2-binary>=2.8.6
pika>=1.2.0

# protobuf is pulled in and also `basictracer`, a core instana dependency
# and also by google-cloud-storage
# but also directly needed by tests/apps/grpc_server/stan_pb2.py
# On 4.0.0 we currently get:
# AttributeError: module 'google._upb._message' has no attribute 'Message'
# TODO: Remove this when support for 4.0.0 is done
protobuf<4.0.0

pymongo>=3.11.4
pyramid>=2.0
pytest>=6.2.4
Expand Down