diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 319f6e4b..09090da7 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -17,7 +17,7 @@ branchProtectionRules: # List of required status check contexts that must pass for commits to be accepted to matching branches. requiredStatusCheckContexts: - 'Kokoro' - - 'Kokoro system-3.8' + - 'Kokoro system-3.10' - 'cla/google' - 'OwlBot Post Processor' - 'docs' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4866193a..1051da0b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.10" - name: Install nox run: | python -m pip install --upgrade setuptools pip wheel diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 3915cddd..e6a79291 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.10" - name: Install nox run: | python -m pip install --upgrade setuptools pip wheel diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index c66b757c..1c9d0789 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -45,7 +45,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.10" - name: Install coverage run: | python -m pip install --upgrade setuptools pip wheel diff --git a/.kokoro/presubmit/system-3.8.cfg b/.kokoro/presubmit/system-3.10.cfg similarity index 82% rename from .kokoro/presubmit/system-3.8.cfg rename to .kokoro/presubmit/system-3.10.cfg index f4bcee3d..f1c7c569 100644 --- a/.kokoro/presubmit/system-3.8.cfg +++ b/.kokoro/presubmit/system-3.10.cfg @@ -3,5 +3,5 @@ # Only run this nox session. env_vars: { key: "NOX_SESSION" - value: "system-3.8" + value: "system-3.10" } \ No newline at end of file diff --git a/mypy.ini b/mypy.ini index a94e6b3f..5dcb9ac9 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,7 +1,13 @@ [mypy] -python_version = 3.8 +python_version = 3.10 namespace_packages = True ignore_missing_imports = True [mypy-google.cloud.datastore._app_engine_key_pb2] ignore_errors = True + +[mypy-google.cloud.datastore_admin_v1.services.*] +ignore_errors = True + +[mypy-google.cloud.datastore_v1.services.*] +ignore_errors = True diff --git a/noxfile.py b/noxfile.py index 7fcab220..9ad43abb 100644 --- a/noxfile.py +++ b/noxfile.py @@ -32,7 +32,7 @@ ISORT_VERSION = "isort==5.11.0" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] -DEFAULT_PYTHON_VERSION = "3.8" +DEFAULT_PYTHON_VERSION = "3.10" UNIT_TEST_PYTHON_VERSIONS: List[str] = [ "3.7", @@ -58,7 +58,7 @@ UNIT_TEST_EXTRAS: List[str] = [] UNIT_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {} -SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.8"] +SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.10"] SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [ "mock", "pytest", @@ -75,7 +75,11 @@ CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() nox.options.sessions = [ - "unit", + "unit-3.9", + "unit-3.10", + "unit-3.11", + "unit-3.12", + "unit-3.13", "system", "mypy", "cover", diff --git a/owlbot.py b/owlbot.py index cbb0f8ae..5659b878 100644 --- a/owlbot.py +++ b/owlbot.py @@ -103,6 +103,8 @@ def get_staging_dirs( unit_test_external_dependencies=["six"], system_test_external_dependencies=["six"], cov_level=100, + default_python_version="3.10", + system_test_python_versions=["3.10"], ) s.move( templated_files, @@ -218,7 +220,11 @@ def docfx(session): "unit", "system",""", """nox.options.sessions = [ - "unit", + "unit-3.9", + "unit-3.10", + "unit-3.11", + "unit-3.12", + "unit-3.13", "system", "mypy",""", )