Skip to content

Commit 03e629a

Browse files
committed
Add tox runs for multiple dependency configurations, and fix dependency version conflicts
1 parent 9cca26b commit 03e629a

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ develop:
1111

1212
tests:
1313
# skipping flake8 for now
14-
pip3 install --upgrade --quiet tox && tox -p 4 -e py36,py37,py38,py39
14+
pip3 install --upgrade --quiet tox && TOX_SKIP_ENV='flake|docs' tox
1515

1616
docs:
1717
echo skipping temporarily...

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ sentry-sdk>=1.0.0
66
dnspython>=2.0.0
77
# openapi generated client:
88
python_dateutil >= 2.5.3
9-
urllib3 >= 1.25.3
9+
urllib3 >= 1.21.1

tox.ini

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
[tox]
2-
envlist = py{36,37,38,39},flake8,docs
2+
envlist = py{36,37,38,39}-pcgrpc_{yes,no}-old_deps_{yes,no},flake8,docs
33
skip_missing_interpreters = true
44

55
[testenv]
66
setenv = HOSTNAME=hostname
77
deps=
8+
old_deps_yes: requests==2.19.0
9+
old_deps_yes: pyyaml==5.4
10+
old_deps_yes: loguru==0.5.0
11+
old_deps_yes: typing-extensions==3.7.4
12+
old_deps_yes: sentry-sdk==1.0.0
13+
old_deps_yes: dnspython==2.0.0
14+
old_deps_yes: python_dateutil==2.5.3
15+
old_deps_yes: urllib3==1.21.1
816
-r {toxinidir}/requirements.txt
9-
-r {toxinidir}/requirements-grpc.txt
1017
-r {toxinidir}/test-requirements.txt
18+
pcgrpc_yes: -r {toxinidir}/requirements-grpc.txt
1119
commands =
1220
pytest --cov=pinecone --timeout=120 tests/unit {posargs}
1321

0 commit comments

Comments
 (0)