From a0f9dae67cb41116d38200d1afbdf3b0fc9ff99b Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Thu, 14 Oct 2021 09:49:21 +0000 Subject: [PATCH 1/6] feat: add support for python 3.10 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 5798f628..ba7d8856 100644 --- a/setup.py +++ b/setup.py @@ -61,6 +61,7 @@ def main(): "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Operating System :: OS Independent", From e4f5e6f1d27447dce1ab402bbafabe1d3b5f560e Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Thu, 14 Oct 2021 09:50:01 +0000 Subject: [PATCH 2/6] fix formatting --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ba7d8856..6bf67e6a 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ def main(): "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Operating System :: OS Independent", From 835e8f0692b5daa098b3a137d17f2172e09c41e6 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Fri, 15 Oct 2021 14:22:42 +0000 Subject: [PATCH 3/6] actually test python 3.10 --- noxfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index add49d84..55dd5ae4 100644 --- a/noxfile.py +++ b/noxfile.py @@ -26,8 +26,8 @@ LOCAL_DEPS = ("google-api-core", "google-cloud-core") NOX_DIR = os.path.abspath(os.path.dirname(__file__)) DEFAULT_INTERPRETER = "3.8" -ALL_INTERPRETERS = ("2.7", "3.6", "3.7", "3.8", "3.9") -PY3_INTERPRETERS = ("3.6", "3.7", "3.8", "3.9") +ALL_INTERPRETERS = ("2.7", "3.6", "3.7", "3.8", "3.9", "3.10") +PY3_INTERPRETERS = ("3.6", "3.7", "3.8", "3.9", "3.10") MAJOR_INTERPRETERS = ("2.7", "3.8") CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() From 650341c61598ce433ab45f5d6a36da86e848fc38 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Fri, 15 Oct 2021 14:22:55 +0000 Subject: [PATCH 4/6] update docs to include python 3.10 --- CONTRIBUTING.rst | 7 ++++--- README.md | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index a750f765..838dc692 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -24,7 +24,7 @@ In order to add a feature to ``python-ndb``: documentation (in ``docs/``). - The feature must work fully on the following CPython versions: 2.7, 3.6 - 3.7, 3.8, and 3.9 on both UNIX and Windows. + 3.7, 3.8, 3.9 and 3.10 on both UNIX and Windows. - The feature must not add unnecessary dependencies (where "unnecessary" is of course subjective, but new dependencies should @@ -72,7 +72,7 @@ We use `nox `__ to instrument our tests. - To test your changes, run unit tests with ``nox``:: - $ nox -s unit-3.7 + $ nox -s unit-3.10 $ nox -s unit-3.6 $ ... @@ -278,13 +278,14 @@ We support: - `Python 3.7`_ - `Python 3.8`_ - `Python 3.9`_ +- `Python 3.10`_ .. _Python 2.7: https://docs.python.org/2.7/ .. _Python 3.6: https://docs.python.org/3.6/ .. _Python 3.7: https://docs.python.org/3.7/ .. _Python 3.8: https://docs.python.org/3.8/ .. _Python 3.9: https://docs.python.org/3.9/ - +.. _Python 3.10: https://docs.python.org/3.10/ Supported versions can be found in our ``noxfile.py`` `config`_. diff --git a/README.md b/README.md index 5c55d584..c1eadd95 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,4 @@ run on other Python platforms as well. GA ### Officially Supported Python Versions -Python 2.7 & Python 3.6, 3.7, 3.8, 3.9 +Python 2.7 & Python 3.6, 3.7, 3.8, 3.9, 3.10 From 5cc1001fa78eb9f2aca99c050d1d1518ae3e8f01 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Fri, 15 Oct 2021 14:24:34 +0000 Subject: [PATCH 5/6] restore line break --- CONTRIBUTING.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 838dc692..8a1db6d9 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -287,6 +287,7 @@ We support: .. _Python 3.9: https://docs.python.org/3.9/ .. _Python 3.10: https://docs.python.org/3.10/ + Supported versions can be found in our ``noxfile.py`` `config`_. .. _config: https://github.com/googleapis/python-ndb/blob/main/noxfile.py From c8901ccd6585f42f548eb15d2c4aec97ea5a6ae0 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Thu, 28 Oct 2021 14:25:12 -0400 Subject: [PATCH 6/6] tests: fix coverage collection --- noxfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index 55dd5ae4..a2dc739b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -58,6 +58,7 @@ def unit(session): [ "--cov=google.cloud.ndb", "--cov=unit", + "--cov-append", "--cov-config", get_path(".coveragerc"), "--cov-report=term-missing", @@ -75,8 +76,6 @@ def unit(session): def cover(session): # Install all dependencies. session.install("coverage") - # THis variable is used to skip coverage by Python version - session.env["PY_VERSION"] = session.python[0] # Run coverage report. session.run("coverage", "report", "--fail-under=100", "--show-missing") # Erase cached coverage data.