From bb6601264ce6cbaefa97addab4d283e256a1f5b6 Mon Sep 17 00:00:00 2001 From: Peter Lamut Date: Wed, 27 Jan 2021 17:39:38 +0100 Subject: [PATCH 1/6] process: declare Python 3.9 support --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 0ea6ccca2..89e25dca7 100644 --- a/setup.py +++ b/setup.py @@ -45,12 +45,11 @@ # grpc.Channel.close() method isn't added until 1.32.0. # https://github.com/grpc/grpc/pull/15254 "grpcio >= 1.32.0, < 2.0dev", - "pyarrow >= 1.0.0, < 3.0dev", + "pyarrow >= 3.0.0, < 4.0dev", ], "pandas": [ "pandas>=0.23.0", - # pyarrow 1.0.0 is required for the use of timestamp_as_object keyword. - "pyarrow >= 1.0.0, < 3.0dev", + "pyarrow >= 3.0.0, < 4.0dev", ], "tqdm": ["tqdm >= 4.7.4, <5.0.0dev"], "opentelemetry": [ @@ -112,6 +111,7 @@ "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Operating System :: OS Independent", "Topic :: Internet", ], @@ -120,7 +120,7 @@ namespace_packages=namespaces, install_requires=dependencies, extras_require=extras, - python_requires=">=3.6, <3.9", + python_requires=">=3.6, <3.10", include_package_data=True, zip_safe=False, ) From 21edf6af8a646116f0408fc33fe2fa90f51a180b Mon Sep 17 00:00:00 2001 From: Peter Lamut Date: Wed, 27 Jan 2021 17:41:25 +0100 Subject: [PATCH 2/6] Use the latest Python (3.9) for most nox sessions --- noxfile.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/noxfile.py b/noxfile.py index e6a739d1e..d57be2b96 100644 --- a/noxfile.py +++ b/noxfile.py @@ -80,13 +80,13 @@ def default(session): ) -@nox.session(python=["3.6", "3.7", "3.8"]) +@nox.session(python=["3.6", "3.7", "3.8", "3.9"]) def unit(session): """Run the unit test suite.""" default(session) -@nox.session(python=["3.8"]) +@nox.session(python=["3.9"]) def system(session): """Run the system test suite.""" @@ -154,7 +154,7 @@ def snippets(session): ) -@nox.session(python="3.8") +@nox.session(python="3.9") def cover(session): """Run the final coverage report. @@ -166,7 +166,7 @@ def cover(session): session.run("coverage", "erase") -@nox.session(python="3.8") +@nox.session(python="3.9") def prerelease_deps(session): """Run all tests with prerelease versions of dependencies installed. @@ -201,7 +201,7 @@ def prerelease_deps(session): session.run("py.test", "samples/tests") -@nox.session(python="3.8") +@nox.session(python="3.9") def lint(session): """Run linters. @@ -218,7 +218,7 @@ def lint(session): session.run("black", "--check", *BLACK_PATHS) -@nox.session(python="3.8") +@nox.session(python="3.9") def lint_setup_py(session): """Verify that setup.py is valid (including RST check).""" @@ -239,7 +239,7 @@ def blacken(session): session.run("black", *BLACK_PATHS) -@nox.session(python="3.8") +@nox.session(python="3.9") def docs(session): """Build the docs.""" @@ -262,7 +262,7 @@ def docs(session): ) -@nox.session(python="3.8") +@nox.session(python="3.9") def docfx(session): """Build the docfx yaml files for this library.""" From 7e3c887cc790c7a4a5c8f9e3204757caf7d2f9f8 Mon Sep 17 00:00:00 2001 From: Peter Lamut Date: Wed, 27 Jan 2021 17:44:46 +0100 Subject: [PATCH 3/6] Bump minimum pyarrow version in constraints file --- testing/constraints-3.6.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index fe2bcfda7..2ce1936ed 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -27,5 +27,5 @@ opentelemetry-api==0.11b0 opentelemetry-sdk==0.11b0 opentelemetry-instrumentation==0.11b0 pandas==0.23.0 -pyarrow==1.0.0 +pyarrow==3.0.0 tqdm==4.7.4 \ No newline at end of file From abe2b16170465b72b07579fa52c3a0f0004c11cb Mon Sep 17 00:00:00 2001 From: Peter Lamut Date: Wed, 27 Jan 2021 17:48:04 +0100 Subject: [PATCH 4/6] Bump max supported Python verson in README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 61192b625..8454cf9c0 100644 --- a/README.rst +++ b/README.rst @@ -52,7 +52,7 @@ dependencies. Supported Python Versions ^^^^^^^^^^^^^^^^^^^^^^^^^ -Python >= 3.6, < 3.9 +Python >= 3.6, < 3.10 Unsupported Python Versions ^^^^^^^^^^^^^^^^^^^^^^^^^^^ From c00b21e3148e47869e1ab8b6705c06dd6ff52b38 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 27 Jan 2021 14:09:19 -0600 Subject: [PATCH 5/6] sort constraints. use pyarrow 1.0 --- setup.py | 4 ++-- testing/constraints-3.6.txt | 22 ++++++---------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/setup.py b/setup.py index 89e25dca7..147654128 100644 --- a/setup.py +++ b/setup.py @@ -45,11 +45,11 @@ # grpc.Channel.close() method isn't added until 1.32.0. # https://github.com/grpc/grpc/pull/15254 "grpcio >= 1.32.0, < 2.0dev", - "pyarrow >= 3.0.0, < 4.0dev", + "pyarrow >= 1.0.0, < 4.0dev", ], "pandas": [ "pandas>=0.23.0", - "pyarrow >= 3.0.0, < 4.0dev", + "pyarrow >= 1.0.0, < 4.0dev", ], "tqdm": ["tqdm >= 4.7.4, <5.0.0dev"], "opentelemetry": [ diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 2ce1936ed..c4a5c51be 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -6,26 +6,16 @@ # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", # Then this file should have foo==1.14.0 google-api-core==1.23.0 -proto-plus==1.10.0 +google-cloud-bigquery-storage==2.0.0 google-cloud-core==1.4.1 google-resumable-media==0.6.0 -six==1.13.0 -protobuf==3.12.0 -google-cloud-bigquery-storage==2.0.0 grpcio==1.32.0 -pyarrow==1.0.0 -pandas==0.23.0 -pyarrow==1.0.0 -tqdm==4.7.4 opentelemetry-api==0.11b0 -opentelemetry-sdk==0.11b0 opentelemetry-instrumentation==0.11b0 -google-cloud-bigquery-storage==2.0.0 -grpcio==1.32.0 -pyarrow==1.0.0 -opentelemetry-api==0.11b0 opentelemetry-sdk==0.11b0 -opentelemetry-instrumentation==0.11b0 pandas==0.23.0 -pyarrow==3.0.0 -tqdm==4.7.4 \ No newline at end of file +proto-plus==1.10.0 +protobuf==3.12.0 +pyarrow==1.0.0 +six==1.13.0 +tqdm==4.7.4 From e9387cac45da3d7cff593055f92e7547900348fc Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 27 Jan 2021 14:40:09 -0600 Subject: [PATCH 6/6] align more closely with central noxfile templates --- noxfile.py | 22 +++++++++++++--------- setup.py | 5 +---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/noxfile.py b/noxfile.py index d57be2b96..942525ca9 100644 --- a/noxfile.py +++ b/noxfile.py @@ -23,6 +23,10 @@ BLACK_VERSION = "black==19.10b0" BLACK_PATHS = ("docs", "google", "samples", "tests", "noxfile.py", "setup.py") + +DEFAULT_PYTHON_VERSION = "3.8" +SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"] +UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"] CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() # 'docfx' is excluded since it only needs to run in 'docs-presubmit' @@ -80,13 +84,13 @@ def default(session): ) -@nox.session(python=["3.6", "3.7", "3.8", "3.9"]) +@nox.session(python=UNIT_TEST_PYTHON_VERSIONS) def unit(session): """Run the unit test suite.""" default(session) -@nox.session(python=["3.9"]) +@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS) def system(session): """Run the system test suite.""" @@ -118,7 +122,7 @@ def system(session): session.run("py.test", "--quiet", os.path.join("tests", "system"), *session.posargs) -@nox.session(python=["3.8"]) +@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS) def snippets(session): """Run the snippets test suite.""" @@ -154,7 +158,7 @@ def snippets(session): ) -@nox.session(python="3.9") +@nox.session(python=DEFAULT_PYTHON_VERSION) def cover(session): """Run the final coverage report. @@ -166,7 +170,7 @@ def cover(session): session.run("coverage", "erase") -@nox.session(python="3.9") +@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS) def prerelease_deps(session): """Run all tests with prerelease versions of dependencies installed. @@ -201,7 +205,7 @@ def prerelease_deps(session): session.run("py.test", "samples/tests") -@nox.session(python="3.9") +@nox.session(python=DEFAULT_PYTHON_VERSION) def lint(session): """Run linters. @@ -218,7 +222,7 @@ def lint(session): session.run("black", "--check", *BLACK_PATHS) -@nox.session(python="3.9") +@nox.session(python=DEFAULT_PYTHON_VERSION) def lint_setup_py(session): """Verify that setup.py is valid (including RST check).""" @@ -239,7 +243,7 @@ def blacken(session): session.run("black", *BLACK_PATHS) -@nox.session(python="3.9") +@nox.session(python=DEFAULT_PYTHON_VERSION) def docs(session): """Build the docs.""" @@ -262,7 +266,7 @@ def docs(session): ) -@nox.session(python="3.9") +@nox.session(python=DEFAULT_PYTHON_VERSION) def docfx(session): """Build the docfx yaml files for this library.""" diff --git a/setup.py b/setup.py index 147654128..ea2df4843 100644 --- a/setup.py +++ b/setup.py @@ -47,10 +47,7 @@ "grpcio >= 1.32.0, < 2.0dev", "pyarrow >= 1.0.0, < 4.0dev", ], - "pandas": [ - "pandas>=0.23.0", - "pyarrow >= 1.0.0, < 4.0dev", - ], + "pandas": ["pandas>=0.23.0", "pyarrow >= 1.0.0, < 4.0dev",], "tqdm": ["tqdm >= 4.7.4, <5.0.0dev"], "opentelemetry": [ "opentelemetry-api==0.11b0",