Skip to content

Commit

Permalink
fix: [google-cloud-container] Deprecate "EXPERIMENTAL" option for Gat…
Browse files Browse the repository at this point in the history
…eway API (this value has never been supported) (#12856)

BEGIN_PUBLIC
fix: Deprecate "EXPERIMENTAL" option for Gateway API (this value has
never been supported)
END_PUBLIC

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 648792772

Source-Link:
googleapis/googleapis@fa77a9f

Source-Link:
googleapis/googleapis-gen@c3faf93
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiYzNmYWY5MzE0OGE0ZGY3M2I1NzhlNTlhNjQ5MjAwNzQ5NzIzNDYzYiJ9

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: ohmayr <omairnaveed@ymail.com>
  • Loading branch information
3 people authored Jul 3, 2024
1 parent e357c4d commit 6bbe99f
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 19 deletions.
2 changes: 1 addition & 1 deletion packages/google-cloud-container/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Python Client for Kubernetes Engine
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-container.svg
:target: https://pypi.org/project/google-cloud-container/
.. _Kubernetes Engine: https://cloud.google.com/kubernetes-engine/
.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/container/latest
.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/container/latest/summary_overview
.. _Product Documentation: https://cloud.google.com/kubernetes-engine/

Quick Start
Expand Down
5 changes: 5 additions & 0 deletions packages/google-cloud-container/docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@ For a list of all ``google-cloud-container`` releases:
:maxdepth: 2

CHANGELOG

.. toctree::
:hidden:

summary_overview.md
22 changes: 22 additions & 0 deletions packages/google-cloud-container/docs/summary_overview.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
This is a templated file. Adding content to this file may result in it being
reverted. Instead, if you want to place additional content, create an
"overview_content.md" file in `docs/` directory. The Sphinx tool will
pick up on the content and merge the content.
]: #

# Kubernetes Engine API

Overview of the APIs available for Kubernetes Engine API.

## All entries

Classes, methods and properties & attributes for
Kubernetes Engine API.

[classes](https://cloud.google.com/python/docs/reference/container/latest/summary_class.html)

[methods](https://cloud.google.com/python/docs/reference/container/latest/summary_method.html)

[properties and
attributes](https://cloud.google.com/python/docs/reference/container/latest/summary_property.html)
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
__version__ = "2.47.0" # {x-release-please-version}
__version__ = "0.0.0" # {x-release-please-version}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
__version__ = "2.47.0" # {x-release-please-version}
__version__ = "0.0.0" # {x-release-please-version}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
__version__ = "2.47.0" # {x-release-please-version}
__version__ = "0.0.0" # {x-release-please-version}
Original file line number Diff line number Diff line change
Expand Up @@ -9075,8 +9075,8 @@ class Channel(proto.Enum):
CHANNEL_DISABLED (1):
Gateway API support is disabled
CHANNEL_EXPERIMENTAL (3):
Gateway API support is enabled, experimental
CRDs are installed
Deprecated: use CHANNEL_STANDARD instead. Gateway API
support is enabled, experimental CRDs are installed
CHANNEL_STANDARD (4):
Gateway API support is enabled, standard CRDs
are installed
Expand Down
46 changes: 35 additions & 11 deletions packages/google-cloud-container/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,28 @@ def install_unittest_dependencies(session, *constraints):
session.install("-e", ".", *constraints)


def default(session):
@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
)
def unit(session, protobuf_implementation):
# Install all test dependencies, then install this package in-place.

if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12"):
session.skip("cpp implementation is not supported in python 3.11+")

constraints_path = str(
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
)
install_unittest_dependencies(session, "-c", constraints_path)

# TODO(https://github.com/googleapis/synthtool/issues/1976):
# Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
# The 'cpp' implementation requires Protobuf<4.
if protobuf_implementation == "cpp":
session.install("protobuf<4")

# Run py.test against the unit tests.
session.run(
"py.test",
Expand All @@ -181,15 +195,12 @@ def default(session):
"--cov-fail-under=0",
os.path.join("tests", "unit"),
*session.posargs,
env={
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
},
)


@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)
def unit(session):
"""Run the unit test suite."""
default(session)


def install_systemtest_dependencies(session, *constraints):
# Use pre-release gRPC for system tests.
# Exclude version 1.52.0rc1 which has a known issue.
Expand Down Expand Up @@ -358,9 +369,16 @@ def docfx(session):


@nox.session(python="3.12")
def prerelease_deps(session):
@nox.parametrize(
"protobuf_implementation",
["python", "upb", "cpp"],
)
def prerelease_deps(session, protobuf_implementation):
"""Run all tests with prerelease versions of dependencies installed."""

if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12"):
session.skip("cpp implementation is not supported in python 3.11+")

# Install all dependencies
session.install("-e", ".[all, tests, tracing]")
unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
Expand Down Expand Up @@ -397,9 +415,9 @@ def prerelease_deps(session):
"protobuf",
# dependency of grpc
"six",
"grpc-google-iam-v1",
"googleapis-common-protos",
# Exclude version 1.52.0rc1 which has a known issue. See https://github.com/grpc/grpc/issues/32163
"grpcio!=1.52.0rc1",
"grpcio",
"grpcio-status",
"google-api-core",
"google-auth",
Expand All @@ -425,4 +443,10 @@ def prerelease_deps(session):
session.run("python", "-c", "import grpc; print(grpc.__version__)")
session.run("python", "-c", "import google.auth; print(google.auth.__version__)")

session.run("py.test", "tests/unit")
session.run(
"py.test",
"tests/unit",
env={
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
},
)
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"language": "PYTHON",
"name": "google-cloud-container",
"version": "2.47.0"
"version": "0.1.0"
},
"snippets": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"language": "PYTHON",
"name": "google-cloud-container",
"version": "2.47.0"
"version": "0.1.0"
},
"snippets": [
{
Expand Down

0 comments on commit 6bbe99f

Please sign in to comment.