-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix: updates automl dependency and missing pandas install #17133
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
chalmerlowe
wants to merge
10
commits into
main
Choose a base branch
from
fix-automl-dependency-and-pandas
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
0d16d46
chore: regenerate google-cloud-automl to resolve conflict
chalmerlowe 4490bd5
Revert "chore: regenerate google-cloud-automl to resolve conflict"
chalmerlowe 127c969
fix: resolve dependency conflict and missing reference to pandas
chalmerlowe 50a929d
chore: remove skip_generate from automl
chalmerlowe 11f2895
chore: removes refs to automl in integrate-isolated-handwritten-code.…
chalmerlowe 4958205
fix: updates post-processing regex
chalmerlowe 238065d
chore: updates regex patterns
chalmerlowe 65f02a5
chore: adds generated content
chalmerlowe ad662c7
chore: updates regex patterns
chalmerlowe 4d94e96
chore: updates generated code
chalmerlowe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
120 changes: 120 additions & 0 deletions
120
.librarian/generator-input/client-post-processing/automl-integration.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| # Copyright 2023 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| description: Update google-auth version to avoid dependency conflict | ||
| url: https://github.com/googleapis/google-cloud-python/issues/17131 | ||
| replacements: | ||
| - paths: [ | ||
| packages/google-cloud-automl/setup.py, | ||
| ] | ||
| before: '(?s)dependencies = \[.*?\]\nextras = \{\}' | ||
| after: | | ||
| dependencies = [ | ||
| "google-api-core[grpc] >= 2.17.1, <3.0.0", | ||
| # Exclude incompatible versions of `google-auth` | ||
| # See https://github.com/googleapis/google-cloud-python/issues/17131 | ||
| "google-auth >= 2.26.1, <3.0.0,!=2.24.0,!=2.25.0", | ||
| "grpcio >= 1.44.0, < 2.0.0", | ||
| "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", | ||
| "proto-plus >= 1.22.3, <2.0.0", | ||
| "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'", | ||
| "protobuf >= 4.25.8, < 8.0.0", | ||
| ] | ||
| extras = { | ||
| "libcst": "libcst >= 0.2.5", | ||
| "pandas": ["pandas>=1.1.3"], | ||
| "storage": ["google-cloud-storage >=2.14.0, <4.0.0"], | ||
| } | ||
| count: 1 | ||
| - paths: [ | ||
| packages/google-cloud-automl/docs/automl_v1beta1/services_.rst, | ||
| ] | ||
| before: | | ||
| Services for Google Cloud Automl v1beta1 API | ||
| ============================================ | ||
| .. toctree:: | ||
| :maxdepth: 2 | ||
|
|
||
| auto_ml | ||
| prediction_service | ||
| after: | | ||
| Services for Google Cloud Automl v1beta1 API | ||
| ============================================ | ||
| .. toctree:: | ||
| :maxdepth: 2 | ||
|
|
||
| tables | ||
| auto_ml | ||
| prediction_service | ||
| count: 1 | ||
| - paths: [ | ||
| packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py, | ||
| ] | ||
| before: | | ||
| \) | ||
| from .types.annotation_payload import AnnotationPayload | ||
| after: | | ||
| ) | ||
| from .services.tables.gcs_client import GcsClient | ||
| from .services.tables.tables_client import TablesClient | ||
| from .types.annotation_payload import AnnotationPayload | ||
| count: 1 | ||
| - paths: [ | ||
| packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py, | ||
| ] | ||
| before: | | ||
| __all__ = \( | ||
| "AutoMlAsyncClient", | ||
| after: | | ||
| __all__ = ( | ||
| "GcsClient", | ||
| "TablesClient", | ||
| "AutoMlAsyncClient", | ||
| count: 1 | ||
| - paths: [ | ||
| packages/google-cloud-automl/noxfile.py, | ||
| ] | ||
| before: | | ||
| UNIT_TEST_EXTRAS: List\[str\] = \[\] | ||
| after: | | ||
| UNIT_TEST_EXTRAS: List[str] = ["pandas", "storage"] | ||
| count: 1 | ||
| - paths: [ | ||
| packages/google-cloud-automl/noxfile.py, | ||
| ] | ||
| before: '(?s)([ \t]+)unit_deps_all = (?:(?!UNIT_TEST_EXTRAS)[\s\S])*?session\.install\(\*unit_deps_all\)' | ||
| after: | | ||
| \g<1>unit_deps_all = ( | ||
| \g<1> UNIT_TEST_STANDARD_DEPENDENCIES | ||
| \g<1> + UNIT_TEST_EXTERNAL_DEPENDENCIES | ||
| \g<1> + UNIT_TEST_EXTRAS | ||
| \g<1>) | ||
| \g<1>session.install(*unit_deps_all) | ||
| count: 2 | ||
| - paths: [ | ||
| packages/google-cloud-automl/noxfile.py, | ||
| ] | ||
| before: | | ||
| "types-protobuf", | ||
| \ \) | ||
| after: | | ||
| "types-protobuf", | ||
| "pandas-stubs", | ||
| ) | ||
| count: 1 | ||
| - paths: [ | ||
| packages/google-cloud-automl/testing/constraints-3.10.txt, | ||
| ] | ||
| before: 'google-auth==2.14.1' | ||
| after: 'google-auth==2.26.1' | ||
| count: 1 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is an unnecessary backslash before the indentation spaces. This will likely cause the regex to fail to match the intended line in
noxfile.py. Indentation in YAML block scalars is preserved, so you should just use spaces to match the indentation of the target code.\)