Skip to content

Commit

Permalink
Remove ddtrace configs, bump python 3.8 to 3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
jhamon committed Jan 28, 2025
1 parent 5d289fd commit 586c980
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 46 deletions.
7 changes: 1 addition & 6 deletions .github/actions/test-data-plane/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,8 @@ runs:
- name: Run data plane tests
id: data-plane-tests
shell: bash
run: poetry run pytest tests/integration/data --ddtrace
run: poetry run pytest tests/integration/data
env:
DD_CIVISIBILITY_AGENTLESS_ENABLED: true
DD_API_KEY: ${{ inputs.DATADOG_API_KEY }}
DD_SITE: datadoghq.com
DD_ENV: ci
DD_SERVICE: pinecone-python-client
PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
USE_GRPC: ${{ inputs.use_grpc }}
METRIC: ${{ inputs.metric }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test-dependency-grpc/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ runs:
timeout_minutes: 5
max_attempts: 3
retry_on: error
command: poetry run pytest tests/dependency/grpc -s -v --ddtrace
command: poetry run pytest tests/dependency/grpc -s -v
env:
PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }}
INDEX_NAME: ${{ inputs.index_name }}
2 changes: 1 addition & 1 deletion .github/actions/test-dependency-rest/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ runs:
timeout_minutes: 5
max_attempts: 3
retry_on: error
command: poetry run pytest tests/dependency/rest -s -v --ddtrace
command: poetry run pytest tests/dependency/rest -s -v
env:
PINECONE_API_KEY: '${{ inputs.PINECONE_API_KEY }}'
INDEX_NAME: '${{ inputs.index_name }}'
6 changes: 3 additions & 3 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, 3.12]
python-version: [3.9, 3.12]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -33,7 +33,7 @@ jobs:
uses: ./.github/actions/setup-poetry
- name: Package
run: poetry build

build-docs:
name: Build docs with pdoc
runs-on: ubuntu-latest
Expand All @@ -43,4 +43,4 @@ jobs:
- name: Build docs with pdoc
uses: './.github/actions/build-docs'
with:
python-version: 3.11
python-version: 3.11
10 changes: 1 addition & 9 deletions .github/workflows/testing-dependency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ name: Dependency Testing
on:
workflow_call: {}

env:
DD_CIVISIBILITY_AGENTLESS_ENABLED: true
DD_API_KEY: ${{ secrets.DATADOG_API_KEY }}
DD_SITE: datadoghq.com
DD_ENV: ci
DD_SERVICE: pinecone-python-client

jobs:
dependency-matrix-setup:
name: Deps setup
Expand All @@ -36,7 +29,6 @@ jobs:
fail-fast: false
matrix:
python_version:
- 3.8
- 3.9
- "3.10"
grpcio_version:
Expand Down Expand Up @@ -124,7 +116,7 @@ jobs:
fail-fast: false
matrix:
python_version:
- 3.8
- 3.9
- 3.11
urllib3_version:
- 1.26.0
Expand Down
25 changes: 9 additions & 16 deletions .github/workflows/testing-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,13 @@ name: "Integration Tests"
'on':
workflow_call: {}

env:
DD_CIVISIBILITY_AGENTLESS_ENABLED: true
DD_API_KEY: ${{ secrets.DATADOG_API_KEY }}
DD_SITE: datadoghq.com
DD_ENV: ci
DD_SERVICE: pinecone-python-client

jobs:
plugin-inference:
name: Test inference plugin
runs-on: ubuntu-latest
strategy:
matrix:
python_version: [3.8, 3.12]
python_version: [3.9, 3.12]
steps:
- uses: actions/checkout@v4
- name: 'Set up Python ${{ matrix.python_version }}'
Expand All @@ -27,7 +20,7 @@ jobs:
with:
include_grpc: 'true'
- name: 'Run integration tests'
run: poetry run pytest tests/integration/inference -s -vv --ddtrace
run: poetry run pytest tests/integration/inference -s -vv
env:
PINECONE_DEBUG_CURL: 'true'
PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
Expand All @@ -38,7 +31,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python_version: [3.8, 3.12]
python_version: [3.9, 3.12]
use_grpc: [true, false]
metric:
- cosine
Expand Down Expand Up @@ -106,7 +99,7 @@ jobs:
pineconeEnv:
- prod
testConfig:
- python-version: 3.8
- python-version: 3.9
pod: { environment: 'us-east1-gcp'}
- python-version: 3.12
pod: { environment: 'us-east4-gcp'}
Expand All @@ -121,7 +114,7 @@ jobs:
uses: ./.github/actions/setup-poetry
- name: 'Run integration tests (REST, prod)'
if: matrix.pineconeEnv == 'prod'
run: poetry run pytest tests/integration/control/pod -s -v --ddtrace
run: poetry run pytest tests/integration/control/pod -s -v
env:
PINECONE_DEBUG_CURL: 'true'
PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
Expand All @@ -131,7 +124,7 @@ jobs:
METRIC: 'cosine'
- name: 'Run integration tests (REST, staging)'
if: matrix.pineconeEnv == 'staging'
run: poetry run pytest tests/integration/control/pod -s -v --ddtrace
run: poetry run pytest tests/integration/control/pod -s -v
env:
PINECONE_DEBUG_CURL: 'true'
PINECONE_CONTROLLER_HOST: 'https://api-staging.pinecone.io'
Expand All @@ -149,7 +142,7 @@ jobs:
pineconeEnv:
- prod
testConfig:
- python-version: 3.8 # Do one test run with 3.8 for sanity check
- python-version: 3.9 # Do one test run with 3.9 for sanity check
pod: { environment: 'us-east1-gcp'}
serverless: { cloud: 'aws', region: 'us-west-2'}
- python-version: 3.12
Expand All @@ -166,7 +159,7 @@ jobs:
uses: ./.github/actions/setup-poetry
- name: 'Run integration tests (REST, prod)'
if: matrix.pineconeEnv == 'prod'
run: poetry run pytest tests/integration/control/serverless -s -vv --ddtrace
run: poetry run pytest tests/integration/control/serverless -s -vv
env:
PINECONE_DEBUG_CURL: 'true'
PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}'
Expand All @@ -175,7 +168,7 @@ jobs:
SERVERLESS_REGION: '${{ matrix.testConfig.serverless.region }}'
- name: 'Run integration tests (REST, staging)'
if: matrix.pineconeEnv == 'staging'
run: poetry run pytest tests/integration/control/serverless -s -vv --ddtrace
run: poetry run pytest tests/integration/control/serverless -s -vv
env:
PINECONE_DEBUG_CURL: 'true'
PINECONE_CONTROLLER_HOST: 'https://api-staging.pinecone.io'
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/testing-unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ name: "Unit Tests"
'on':
workflow_call: {}

env:
DD_CIVISIBILITY_AGENTLESS_ENABLED: true
DD_API_KEY: ${{ secrets.DATADOG_API_KEY }}
DD_SITE: datadoghq.com
DD_ENV: ci
DD_SERVICE: pinecone-python-client

jobs:
unit-tests:
name: Unit tests
Expand All @@ -17,7 +10,6 @@ jobs:
fail-fast: false
matrix:
python-version:
- 3.8
- 3.9
- '3.10'
- 3.11
Expand All @@ -37,10 +29,10 @@ jobs:
include_grpc: '${{ matrix.use_grpc }}'
include_types: true
- name: Run unit tests (REST)
run: poetry run pytest --cov=pinecone --timeout=120 tests/unit --ddtrace
run: poetry run pytest --cov=pinecone --timeout=120 tests/unit
- name: Run unit tests (GRPC)
if: ${{ matrix.use_grpc == true }}
run: poetry run pytest --cov=pinecone/grpc --timeout=120 tests/unit_grpc --ddtrace
run: poetry run pytest --cov=pinecone/grpc --timeout=120 tests/unit_grpc
- name: mypy check
env:
INCLUDE_GRPC: '${{ matrix.use_grpc }}'
Expand Down

0 comments on commit 586c980

Please sign in to comment.