Skip to content

Commit e56a705

Browse files
authored
Merge pull request #65 from pinecone-io/packaging-improvements
Packaging improvements: multi-python testing and looser depedency version constraints
2 parents 14467fc + 03e629a commit e56a705

File tree

4 files changed

+32
-14
lines changed

4 files changed

+32
-14
lines changed

.github/workflows/pr.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,24 @@ jobs:
66
run-tests:
77
name: Run tests
88
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
python-version: [3.6, 3.7, 3.8, 3.9]
912

1013
steps:
11-
- uses: actions/checkout@v2
12-
- uses: actions/setup-python@v2
14+
- uses: actions/checkout@v1
15+
- name: Set up Python ${{ matrix.python-version }}
16+
uses: actions/setup-python@v2
1317
with:
14-
python-version: 3.7
18+
python-version: ${{ matrix.python-version }}
19+
20+
- name: Install dependencies
21+
run: |
22+
python -m pip install --upgrade pip
23+
pip install tox tox-gh-actions
1524
1625
- name: Run tests
17-
run: make tests
26+
run: make tests TOX_PARALLEL_NO_SPINNER=1
1827

1928
- name: Build Python client
2029
run: make package

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 -e py3
14+
pip3 install --upgrade --quiet tox && TOX_SKIP_ENV='flake|docs' tox
1515

1616
docs:
1717
echo skipping temporarily...

requirements.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
requests==2.25.1
2-
pyyaml==5.4
3-
loguru==0.5.3
4-
typing-extensions==3.10.0.0
5-
sentry-sdk==1.1.0
6-
dnspython==2.1.0
1+
requests>=2.19.0
2+
pyyaml>=5.4
3+
loguru>=0.5.0
4+
typing-extensions>=3.7.4
5+
sentry-sdk>=1.0.0
6+
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: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
[tox]
2-
envlist = py3,flake8,docs
2+
envlist = py{36,37,38,39}-pcgrpc_{yes,no}-old_deps_{yes,no},flake8,docs
3+
skip_missing_interpreters = true
34

45
[testenv]
56
setenv = HOSTNAME=hostname
67
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
716
-r {toxinidir}/requirements.txt
8-
-r {toxinidir}/requirements-grpc.txt
917
-r {toxinidir}/test-requirements.txt
18+
pcgrpc_yes: -r {toxinidir}/requirements-grpc.txt
1019
commands =
1120
pytest --cov=pinecone --timeout=120 tests/unit {posargs}
1221

0 commit comments

Comments
 (0)