Skip to content

Commit 325b7c4

Browse files
1 parent c3ed5aa commit 325b7c4

File tree

2 files changed

+12
-40
lines changed

2 files changed

+12
-40
lines changed

‎.kokoro/trampoline.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ function cleanup() {
2525
trap cleanup EXIT
2626

2727
$(dirname $0)/populate-secrets.sh # Secret Manager secrets.
28-
python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
28+
python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"

‎noxfile.py

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [
5353
"mock",
5454
"pytest",
55-
"pytest-asyncio",
5655
"google-cloud-testutils",
5756
]
5857
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
@@ -138,7 +137,7 @@ def mypy(session):
138137
session.run(
139138
"mypy",
140139
"-p",
141-
"google.cloud.bigtable.data",
140+
"google.cloud.bigtable",
142141
"--check-untyped-defs",
143142
"--warn-unreachable",
144143
"--disallow-any-generics",
@@ -160,8 +159,16 @@ def install_unittest_dependencies(session, *constraints):
160159
standard_deps = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_DEPENDENCIES
161160
session.install(*standard_deps, *constraints)
162161

162+
if UNIT_TEST_EXTERNAL_DEPENDENCIES:
163+
warnings.warn(
164+
"'unit_test_external_dependencies' is deprecated. Instead, please "
165+
"use 'unit_test_dependencies' or 'unit_test_local_dependencies'.",
166+
DeprecationWarning,
167+
)
168+
session.install(*UNIT_TEST_EXTERNAL_DEPENDENCIES, *constraints)
169+
163170
if UNIT_TEST_LOCAL_DEPENDENCIES:
164-
session.install("-e", *UNIT_TEST_LOCAL_DEPENDENCIES, *constraints)
171+
session.install(*UNIT_TEST_LOCAL_DEPENDENCIES, *constraints)
165172

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

178-
if UNIT_TEST_EXTERNAL_DEPENDENCIES:
179-
warnings.warn(
180-
"'unit_test_external_dependencies' is deprecated. Instead, please "
181-
"use 'unit_test_dependencies' or 'unit_test_local_dependencies'.",
182-
DeprecationWarning,
183-
)
184-
session.install(
185-
"--upgrade",
186-
"--no-deps",
187-
"--force-reinstall",
188-
*UNIT_TEST_EXTERNAL_DEPENDENCIES,
189-
*constraints,
190-
)
191-
192185

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

279272

280-
@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
281-
def conformance(session):
282-
"""
283-
Run the set of shared bigtable conformance tests
284-
"""
285-
TEST_REPO_URL = "https://github.com/googleapis/cloud-bigtable-clients-test.git"
286-
CLONE_REPO_DIR = "cloud-bigtable-clients-test"
287-
# install dependencies
288-
constraints_path = str(
289-
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
290-
)
291-
install_unittest_dependencies(session, "-c", constraints_path)
292-
with session.chdir("test_proxy"):
293-
# download the conformance test suite
294-
clone_dir = os.path.join(CURRENT_DIRECTORY, CLONE_REPO_DIR)
295-
if not os.path.exists(clone_dir):
296-
print("downloading copy of test repo")
297-
session.run("git", "clone", TEST_REPO_URL, CLONE_REPO_DIR, external=True)
298-
session.run("bash", "-e", "run_tests.sh", external=True)
299-
300-
301273
@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
302274
def system(session):
303275
"""Run the system test suite."""
@@ -477,7 +449,7 @@ def prerelease_deps(session):
477449
# Exclude version 1.52.0rc1 which has a known issue. See https://github.com/grpc/grpc/issues/32163
478450
"grpcio!=1.52.0rc1",
479451
"grpcio-status",
480-
"google-api-core==2.16.0rc0", # TODO: remove pin once streaming retries is merged
452+
"google-api-core",
481453
"google-auth",
482454
"proto-plus",
483455
"google-cloud-testutils",

0 commit comments

Comments
 (0)