Skip to content

Commit

Permalink
Unwind some temporary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jhamon committed Feb 21, 2024
1 parent 886f932 commit d317cde
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .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.9, '3.10', 3.11]
python-version: [3.8, 3.12]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
42 changes: 29 additions & 13 deletions .github/workflows/testing-dependency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- 3.8
# - 3.9
# - "3.10"
# - 3.11
- 3.11
grpcio-version:
- 1.44.0
# - 1.46.5
Expand Down Expand Up @@ -63,15 +63,12 @@ jobs:
- 1.62.0
grpc-gateway-protoc-gen-openapiv2-version:
- 0.1.0

steps:
steps: &grpc_steps
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Setup Poetry
uses: ./.github/actions/setup-poetry
with:
Expand All @@ -85,7 +82,6 @@ jobs:
run: poetry add protobuf==${{ matrix.protobuf-version }}
- name: Install googleapis-common-protos ${{ matrix.googleapis-common-protos-version }}
run: poetry add googleapis-common-protos==${{ matrix.googleapis-common-protos-version }}

- uses: nick-fields/retry@v3
with:
timeout_minutes: 5
Expand All @@ -96,8 +92,32 @@ jobs:
PINECONE_API_KEY: ${{ secrets.PINECONE_API_KEY }}
INDEX_NAME: ${{ needs.dependency-matrix-setup.outputs.index_name }}

dependency-matrix-grpc-312:
name: Deps (GRPC)
needs: dependency-matrix-setup
runs-on: ubuntu-latest
strategy:
max-parallel: 5
fail-fast: false
matrix:
python-version:
- 3.12
grpcio-version:
- 1.59.3
- 1.60.0
lz4-version:
- 3.1.3
- 4.3.3
protobuf-version:
- 3.20.3
googleapis-common-protos-version:
- 1.53.0
- 1.62.0
grpc-gateway-protoc-gen-openapiv2-version:
- 0.1.0


steps:
*grpc_steps

dependency-matrix-rest:
name: Deps (REST)
Expand All @@ -108,15 +128,11 @@ jobs:
fail-fast: false
matrix:
python-version:
- 3.8
- 3.9
- '3.10'
- 3.11
- 3.12
urllib3-version:
- 1.26.0
- 1.26.5
- 1.26.18
- 2.0.2
- 2.0.5
- 2.1.0
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
testConfig:
- python-version: 3.8
pod: { environment: 'us-east1-gcp'}
- python-version: 3.11
- python-version: 3.12
pod: { environment: 'us-east4-gcp'}
fail-fast: false
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/testing-unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
- 3.9
- '3.10'
- 3.11
- 3.12
use_grpc:
- true
- false
Expand Down
51 changes: 16 additions & 35 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 13 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ classifiers=[
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Database",
"Topic :: Software Development",
"Topic :: Software Development :: Libraries",
Expand All @@ -47,15 +49,21 @@ classifiers=[
]

[tool.poetry.dependencies]
python = ">=3.8,<3.13"
python = "^3.8"
typing-extensions = ">=3.7.4"
urllib3 = ">=1.26.0"
urllib3 = [
{ version = ">=1.26.0", python = ">=3.8,<3.12" },
{ version = ">=1.26.5", python = "^3.12" }
]
tqdm = ">=4.64.1"
# certifi does not follow semver. Should always be
# on latest but setting a broad range to have maximum
# compatibility with libraries that may pin version.
certifi = ">=2019.11.17"
grpcio = { version = ">=1.44.0", optional = true }
grpcio = [
{ version = ">=1.44.0", optional = true, python = "^3.8,<3.12" },
{ version = "^1.59.0", optional = true, python = "^3.12" }
]
grpc-gateway-protoc-gen-openapiv2 = { version = "0.1.0", optional = true }
googleapis-common-protos = { version = ">=1.53.0", optional = true }
lz4 = { version = ">=3.1.3", optional = true }
Expand All @@ -82,11 +90,11 @@ numpy = [
]
pandas = ">=1.3.5"
pdoc = "^14.1.0"
pytest = "7.2.0"
pytest = "8.0.0"
pytest-asyncio = "0.15.1"
pytest-cov = "2.10.1"
pytest-mock = "3.6.1"
pytest-timeout = "1.4.2"
pytest-timeout = "2.2.0"
urllib3_mock = "0.3.3"
responses = ">=0.8.1"

Expand Down

0 comments on commit d317cde

Please sign in to comment.