Skip to content

Commit

Permalink
🦉 Updates from OwlBot post-processor
Browse files Browse the repository at this point in the history
  • Loading branch information
gcf-owl-bot[bot] committed Jan 19, 2024
1 parent a1d4568 commit c11e7c7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .kokoro/trampoline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ function cleanup() {
trap cleanup EXIT

$(dirname $0)/populate-secrets.sh # Secret Manager secrets.
python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
50 changes: 11 additions & 39 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [
"mock",
"pytest",
"pytest-asyncio",
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand Down Expand Up @@ -138,7 +137,7 @@ def mypy(session):
session.run(
"mypy",
"-p",
"google.cloud.bigtable.data",
"google.cloud.bigtable",
"--check-untyped-defs",
"--warn-unreachable",
"--disallow-any-generics",
Expand All @@ -160,8 +159,16 @@ def install_unittest_dependencies(session, *constraints):
standard_deps = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_DEPENDENCIES
session.install(*standard_deps, *constraints)

if UNIT_TEST_EXTERNAL_DEPENDENCIES:
warnings.warn(
"'unit_test_external_dependencies' is deprecated. Instead, please "
"use 'unit_test_dependencies' or 'unit_test_local_dependencies'.",
DeprecationWarning,
)
session.install(*UNIT_TEST_EXTERNAL_DEPENDENCIES, *constraints)

if UNIT_TEST_LOCAL_DEPENDENCIES:
session.install("-e", *UNIT_TEST_LOCAL_DEPENDENCIES, *constraints)
session.install(*UNIT_TEST_LOCAL_DEPENDENCIES, *constraints)

if UNIT_TEST_EXTRAS_BY_PYTHON:
extras = UNIT_TEST_EXTRAS_BY_PYTHON.get(session.python, [])
Expand All @@ -175,20 +182,6 @@ def install_unittest_dependencies(session, *constraints):
else:
session.install("-e", ".", *constraints)

if UNIT_TEST_EXTERNAL_DEPENDENCIES:
warnings.warn(
"'unit_test_external_dependencies' is deprecated. Instead, please "
"use 'unit_test_dependencies' or 'unit_test_local_dependencies'.",
DeprecationWarning,
)
session.install(
"--upgrade",
"--no-deps",
"--force-reinstall",
*UNIT_TEST_EXTERNAL_DEPENDENCIES,
*constraints,
)


def default(session):
# Install all test dependencies, then install this package in-place.
Expand Down Expand Up @@ -277,27 +270,6 @@ def system_emulated(session):
os.killpg(os.getpgid(p.pid), signal.SIGKILL)


@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
def conformance(session):
"""
Run the set of shared bigtable conformance tests
"""
TEST_REPO_URL = "https://github.com/googleapis/cloud-bigtable-clients-test.git"
CLONE_REPO_DIR = "cloud-bigtable-clients-test"
# install dependencies
constraints_path = str(
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
)
install_unittest_dependencies(session, "-c", constraints_path)
with session.chdir("test_proxy"):
# download the conformance test suite
clone_dir = os.path.join(CURRENT_DIRECTORY, CLONE_REPO_DIR)
if not os.path.exists(clone_dir):
print("downloading copy of test repo")
session.run("git", "clone", TEST_REPO_URL, CLONE_REPO_DIR, external=True)
session.run("bash", "-e", "run_tests.sh", external=True)


@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
def system(session):
"""Run the system test suite."""
Expand Down Expand Up @@ -477,7 +449,7 @@ def prerelease_deps(session):
# Exclude version 1.52.0rc1 which has a known issue. See https://github.com/grpc/grpc/issues/32163
"grpcio!=1.52.0rc1",
"grpcio-status",
"google-api-core==2.16.0rc0", # TODO: remove pin once streaming retries is merged
"google-api-core",
"google-auth",
"proto-plus",
"google-cloud-testutils",
Expand Down

0 comments on commit c11e7c7

Please sign in to comment.