googleapis · parthea · Jul 8, 2022 · Jul 8, 2022 · Jul 8, 2022 · Jul 8, 2022
diff --git a/.kokoro/test-samples-impl.sh b/.kokoro/test-samples-impl.sh
@@ -33,7 +33,7 @@ export PYTHONUNBUFFERED=1
 env | grep KOKORO
 
 # Install nox
-python3.6 -m pip install --upgrade --quiet nox
+python3.9 -m pip install --upgrade --quiet nox
 
 # Use secrets acessor service account to get secrets
 if [[ -f "${KOKORO_GFILE_DIR}/secrets_viewer_service_account.json" ]]; then
@@ -76,7 +76,7 @@ for file in samples/**/requirements.txt; do
     echo "------------------------------------------------------------"
 
     # Use nox to execute the tests for the project.
-    python3.6 -m nox -s "$RUN_TESTS_SESSION"
+    python3.9 -m nox -s "$RUN_TESTS_SESSION"
     EXIT=$?
 
     # If this is a periodic build, send the test log to the FlakyBot.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1 +1,8 @@
 # Changelog
+
+## 0.1.0 (2022-07-08)
+
+
+### Features
+
+* generate v1alpha2 ([bb0d40d](https://github.com/googleapis/python-dataform/commit/bb0d40d43efd4b9c546dbe7de4fa0374cdc0cff3))
diff --git a/noxfile.py b/noxfile.py
@@ -331,42 +331,15 @@ def docfx(session):
 def prerelease_deps(session):
     """Run all tests with prerelease versions of dependencies installed."""
 
-    prerel_deps = [
-        "protobuf",
-        # dependency of grpc
-        "six",
-        "googleapis-common-protos",
-        "google-auth",
-        "grpcio",
-        "grpcio-status",
-        "google-api-core",
-        "proto-plus",
-        # dependencies of google-auth
-        "cryptography",
-        "pyasn1",
-        "google-cloud-testutils",
-        # dependencies of google-cloud-testutils"
-        "click",
-    ]
-
-    for dep in prerel_deps:
-        session.install("--pre", "--no-deps", "--upgrade", dep)
-
-    # Remaining dependencies
-    other_deps = ["requests"]
-    session.install(*other_deps)
-
-    # Don't overwrite prerelease packages.
-    unit_test_deps = [
-        dep for dep in UNIT_TEST_STANDARD_DEPENDENCIES if dep not in prerel_deps
-    ]
-    session.install(*unit_test_deps)
-
-    # Don't overwrite prerelease packages.
-    system_deps = [
-        dep for dep in SYSTEM_TEST_STANDARD_DEPENDENCIES if dep not in prerel_deps
-    ]
-    session.install(*system_deps)
+    # Install all dependencies
+    session.install("-e", ".[all, tests, tracing]")
+    session.install(*UNIT_TEST_STANDARD_DEPENDENCIES)
+    system_deps_all = (
+        SYSTEM_TEST_STANDARD_DEPENDENCIES
+        + SYSTEM_TEST_EXTERNAL_DEPENDENCIES
+        + SYSTEM_TEST_EXTRAS
+    )
+    session.install(*system_deps_all)
 
     # Because we test minimum dependency versions on the minimum Python
     # version, the first version we test with in the unit tests sessions has a
@@ -387,14 +360,37 @@ def prerelease_deps(session):
         )
     ]
 
-    # Don't overwrite prerelease packages.
-    constraints_deps = [dep for dep in constraints_deps if dep not in prerel_deps]
-    if constraints_deps:
-        session.install(*constraints_deps)
+    session.install(*constraints_deps)
+
+    if os.path.exists("samples/snippets/requirements.txt"):
+        session.install("-r", "samples/snippets/requirements.txt")
+
+    if os.path.exists("samples/snippets/requirements-test.txt"):
+        session.install("-r", "samples/snippets/requirements-test.txt")
+
+    prerel_deps = [
+        "protobuf",
+        # dependency of grpc
+        "six",
+        "googleapis-common-protos",
+        "grpcio",
+        "grpcio-status",
+        "google-api-core",
+        "proto-plus",
+        "google-cloud-testutils",
+        # dependencies of google-cloud-testutils"
+        "click",
+    ]
+
+    for dep in prerel_deps:
+        session.install("--pre", "--no-deps", "--upgrade", dep)
 
-    # We use --no-deps to ensure that pre-release versions aren't overwritten
-    # by the version ranges in setup.py.
-    session.install("--no-deps", "-e", ".[all]")
+    # Remaining dependencies
+    other_deps = [
+        "requests",
+        "google-auth",
+    ]
+    session.install(*other_deps)
 
     # Print out prerelease package versions
     session.run(
@@ -403,5 +399,16 @@ def prerelease_deps(session):
     session.run("python", "-c", "import grpc; print(grpc.__version__)")
 
     session.run("py.test", "tests/unit")
-    session.run("py.test", "tests/system")
-    session.run("py.test", "samples/snippets")
+
+    system_test_path = os.path.join("tests", "system.py")
+    system_test_folder_path = os.path.join("tests", "system")
+
+    # Only run system tests if found.
+    if os.path.exists(system_test_path) or os.path.exists(system_test_folder_path):
+        session.run("py.test", "tests/system")
+
+    snippets_test_path = os.path.join("samples", "snippets")
+
+    # Only run samples tests if found.
+    if os.path.exists(snippets_test_path):
+        session.run("py.test", "samples/snippets")
diff --git a/setup.py b/setup.py
@@ -24,10 +24,7 @@
 version = "0.1.0"
 release_status = "Development Status :: 3 - Alpha"
 dependencies = [
-    # NOTE: Maintainers, please do not require google-api-core>=2.x.x
-    # Until this issue is closed
-    # https://github.com/googleapis/google-cloud-python/issues/10566
-    "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
+    "google-api-core[grpc] >= 2.8.0, <3.0.0dev",
     "proto-plus >= 1.15.0, <2.0.0dev",
     "protobuf >= 3.19.0, <4.0.0dev",
     "grpc-google-iam-v1 >=0.12.4, <1.0.0dev",

diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
@@ -4,7 +4,7 @@
 # Pin the version to the lower bound.
 # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have google-cloud-foo==1.14.0
-google-api-core==1.31.5
+google-api-core==2.8.0
 proto-plus==1.15.0
 protobuf==3.19.0
 grpc-google-iam-v1==0.12.4