diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 8c95296..d1c415c 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -66,13 +66,6 @@ "minor", "patch" ], - }, - { - "description": "Disable isort updates for python <=3.9 in pyproject.toml", - "matchFileNames": ["pyproject.toml"], - "matchPackageNames": ["isort"], - "matchCurrentValue": "==6.1.0", - "enabled": false } ], } diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 5ee5b8a..fb352be 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -27,10 +27,10 @@ branchProtectionRules: requiredStatusCheckContexts: - "cla/google" - "lint" - - "integration-test-pr-py39 (llamaindex-alloydb-testing)" - "integration-test-pr-py310 (llamaindex-alloydb-testing)" - "integration-test-pr-py311 (llamaindex-alloydb-testing)" - "integration-test-pr-py312 (llamaindex-alloydb-testing)" + - "integration-test-pr-py313 (llamaindex-alloydb-testing)" - "conventionalcommits.org" - "header-check" # - Add required status checks like presubmit tests diff --git a/DEVELOPER.md b/DEVELOPER.md index e65c140..62ce183 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -82,11 +82,11 @@ These tests are registered as required tests in `.github/sync-repo-settings.yaml #### Trigger Setup -Cloud Build triggers (for Python versions 3.9 to 3.11) were created with the following specs: +Cloud Build triggers (for Python versions 3.10 to 3.13) were created with the following specs: ```YAML -name: pg-integration-test-pr-py39 -description: Run integration tests on PR for Python 3.9 +name: pg-integration-test-pr-py310 +description: Run integration tests on PR for Python 3.10 filename: integration.cloudbuild.yaml github: name: llamaindex-alloydb-pg-python @@ -103,7 +103,7 @@ substitutions: _DATABASE_ID: _INSTANCE_ID: _REGION: us-central1 - _VERSION: "3.9" + _VERSION: "3.10" ``` Use `gcloud builds triggers import --source=trigger.yaml` to create triggers via the command line diff --git a/README.rst b/README.rst index f990104..8d0520c 100644 --- a/README.rst +++ b/README.rst @@ -55,7 +55,7 @@ dependencies. Supported Python Versions ^^^^^^^^^^^^^^^^^^^^^^^^^ -Python >= 3.9 +Python >= 3.10 Mac/Linux ^^^^^^^^^ diff --git a/integration.cloudbuild.yaml b/integration.cloudbuild.yaml index 3749777..7002ef1 100644 --- a/integration.cloudbuild.yaml +++ b/integration.cloudbuild.yaml @@ -74,7 +74,7 @@ availableSecrets: env: "IAM_ACCOUNT" substitutions: - _VERSION: "3.9" + _VERSION: "3.10" _INSTANCE_CONNECTION_NAME: projects/${PROJECT_ID}/locations/${_REGION}/clusters/${_CLUSTER_ID}/instances/${_INSTANCE_ID} _DATABASE_PORT: "5432" _IP_ADDRESS: "127.0.0.1" diff --git a/pyproject.toml b/pyproject.toml index afca7d3..242189c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,13 +4,12 @@ dynamic = ["version"] description = "LlamaIndex integrations for Google Cloud AlloyDB for PostgreSQL" readme = "README.rst" license = {file = "LICENSE"} -requires-python = ">=3.9" +requires-python = ">=3.10" authors = [ {name = "Google LLC", email = "googleapis-packages@google.com"} ] dependencies = [ - "google-cloud-alloydb-connector[asyncpg]>=1.2.0, <1.9.1; python_version <= '3.9'", - "google-cloud-alloydb-connector[asyncpg]>=1.2.0, <2.0.0; python_version >= '3.10'", + "google-cloud-alloydb-connector[asyncpg]>=1.2.0, <2.0.0", "pgvector>=0.2.5, <1.0.0", "SQLAlchemy[asyncio]>=2.0.25, <3.0.0", "llama-index-core>=0.12.0, <1.0.0", @@ -21,10 +20,10 @@ classifiers = [ "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "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", ] [tool.setuptools.dynamic] @@ -39,11 +38,9 @@ Changelog = "https://github.com/googleapis/llama-index-alloydb-pg-python/blob/ma [project.optional-dependencies] test = [ "black[jupyter]==25.11.0", - "isort==6.1.0; python_version == '3.9'", - "isort==7.0.0; python_version >= '3.10'", + "isort==7.0.0", "mypy==1.18.2", - "pytest-asyncio==1.2.0; python_version == '3.9'", - "pytest-asyncio==1.3.0; python_version >= '3.10'", + "pytest-asyncio==1.3.0", "pytest==8.4.2", "pytest-cov==7.0.0", "pytest-depends==1.0.1", @@ -57,13 +54,13 @@ build-backend = "setuptools.build_meta" asyncio_default_fixture_loop_scope = "class" [tool.black] -target-version = ['py39'] +target-version = ['py310'] [tool.isort] profile = "black" [tool.mypy] -python_version = "3.9" +python_version = "3.10" warn_unused_configs = true disallow_incomplete_defs = true diff --git a/requirements.txt b/requirements.txt index d53a33f..cd02112 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -google-cloud-alloydb-connector[asyncpg]==1.10.0; python_version >= "3.10" -google-cloud-alloydb-connector[asyncpg]==1.9.1; python_version <= "3.9" +google-cloud-alloydb-connector[asyncpg]==1.10.0 llama-index-core==0.14.8 pgvector==0.4.1 SQLAlchemy[asyncio]==2.0.44