From 3371dedced4460a936fcba352bb4f4d17cc56043 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 30 Dec 2020 15:36:01 -0700 Subject: [PATCH 1/9] chore: add constraints file --- testing/constraints-3.10.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testing/constraints-3.10.txt diff --git a/testing/constraints-3.10.txt b/testing/constraints-3.10.txt new file mode 100644 index 00000000..e69de29b From 270a9582056a09b5e07539110fefd34e74937d85 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 30 Dec 2020 15:36:02 -0700 Subject: [PATCH 2/9] chore: add constraints file --- testing/constraints-3.11.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testing/constraints-3.11.txt diff --git a/testing/constraints-3.11.txt b/testing/constraints-3.11.txt new file mode 100644 index 00000000..e69de29b From 880b814353302521d85b952b276a3b88cf9e98fd Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 30 Dec 2020 15:36:03 -0700 Subject: [PATCH 3/9] chore: add constraints file --- testing/constraints-3.6.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 testing/constraints-3.6.txt diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt new file mode 100644 index 00000000..3867c65f --- /dev/null +++ b/testing/constraints-3.6.txt @@ -0,0 +1,18 @@ +# This constraints file is used to check that lower bounds +# are correct in setup.py +# List *all* library dependencies and extras in this file. +# Pin the version to the lower bound. +# +# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", +# Then this file should have foo==1.14.0 +googleapis-common-protos==1.6.0 +protobuf==3.12.0 +google-auth==1.21.1 +requests==2.18.0 +setuptools==34.0.0 +six==1.13.0 +pytz==100000.0.0 +futures==3.2.0 +grpcio==1.29.0 +grpcio-gcp==0.2.2 +grpcio-gcp==0.2.2 \ No newline at end of file From 173f0d77655ece7d86a6a96f17b3cd7d9d966a52 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 30 Dec 2020 15:36:04 -0700 Subject: [PATCH 4/9] chore: add constraints file --- testing/constraints-3.7.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testing/constraints-3.7.txt diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt new file mode 100644 index 00000000..e69de29b From f4579fbe77e3ddfceb8fe3056b9eb4f58ce4b5fd Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 30 Dec 2020 15:36:05 -0700 Subject: [PATCH 5/9] chore: add constraints file --- testing/constraints-3.8.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testing/constraints-3.8.txt diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt new file mode 100644 index 00000000..e69de29b From 470554bf63dbb32d0a417e6ad5588095d179ad26 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 30 Dec 2020 15:36:06 -0700 Subject: [PATCH 6/9] chore: add constraints file --- testing/constraints-3.9.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testing/constraints-3.9.txt diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt new file mode 100644 index 00000000..e69de29b From 2f6a07be9cba18eb39416bc2c622dcdc47aae79d Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Wed, 30 Dec 2020 22:42:22 +0000 Subject: [PATCH 7/9] chore: remove irrelevant deps --- noxfile.py | 16 ++++++++++++---- testing/constraints-3.6.txt | 2 -- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/noxfile.py b/noxfile.py index 86758e1f..650cef28 100644 --- a/noxfile.py +++ b/noxfile.py @@ -14,13 +14,15 @@ from __future__ import absolute_import import os +import pathlib import shutil # https://github.com/google/importlab/issues/25 import nox # pytype: disable=import-error -_MINIMAL_ASYNCIO_SUPPORT_PYTHON_VERSION = [3, 6] +CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() +_MINIMAL_ASYNCIO_SUPPORT_PYTHON_VERSION = [3, 6] def _greater_or_equal_than_36(version_string): tokens = version_string.split(".") @@ -40,9 +42,13 @@ def default(session): Python corresponding to the ``nox`` binary the ``PATH`` can run the tests. """ + constraints_path = str( + CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt" + ) + # Install all test dependencies, then install this package in-place. session.install("mock", "pytest", "pytest-cov", "grpcio >= 1.0.2") - session.install("-e", ".") + session.install("-e", ".", "-c", constraints_path) pytest_args = [ "python", @@ -80,9 +86,11 @@ def unit(session): @nox.session(python=["2.7", "3.6", "3.7", "3.8", "3.9"]) def unit_grpc_gcp(session): """Run the unit test suite with grpcio-gcp installed.""" - + constraints_path = str( + CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt" + ) # Install grpcio-gcp - session.install("grpcio-gcp") + session.install("grpcio-gcp", "-c", constraints_path) default(session) diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 3867c65f..1eb58c85 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -11,8 +11,6 @@ google-auth==1.21.1 requests==2.18.0 setuptools==34.0.0 six==1.13.0 -pytz==100000.0.0 -futures==3.2.0 grpcio==1.29.0 grpcio-gcp==0.2.2 grpcio-gcp==0.2.2 \ No newline at end of file From 671f5d52c38738fefafca06fa920742bf1ad48d3 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Wed, 30 Dec 2020 22:49:17 +0000 Subject: [PATCH 8/9] fix: bump setuptools min version --- setup.py | 2 +- testing/constraints-2.7.txt | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 testing/constraints-2.7.txt diff --git a/setup.py b/setup.py index 576363a5..30adb954 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ "protobuf >= 3.12.0", "google-auth >= 1.21.1, < 2.0dev", "requests >= 2.18.0, < 3.0.0dev", - "setuptools >= 34.0.0", + "setuptools >= 40.3.0", "six >= 1.13.0", "pytz", 'futures >= 3.2.0; python_version < "3.2"', diff --git a/testing/constraints-2.7.txt b/testing/constraints-2.7.txt new file mode 100644 index 00000000..e69de29b From 41d7dca48f7adcf5fc79c7ba1711feb92c0a9776 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Wed, 13 Jan 2021 16:37:51 -0500 Subject: [PATCH 9/9] fix: use actual minimum setuptools version from setup.py --- testing/constraints-3.6.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 1eb58c85..2d498173 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -9,8 +9,8 @@ googleapis-common-protos==1.6.0 protobuf==3.12.0 google-auth==1.21.1 requests==2.18.0 -setuptools==34.0.0 +setuptools==40.3.0 six==1.13.0 grpcio==1.29.0 grpcio-gcp==0.2.2 -grpcio-gcp==0.2.2 \ No newline at end of file +grpcio-gcp==0.2.2