Skip to content
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

fix: rename rst files to avoid conflict with service names #1856

Merged
merged 9 commits into from
Oct 18, 2023

Conversation

dizcology
Copy link
Contributor

Python GAPIC generator will rename the template rst files, adding trailing underscore to avoid name collision when an API has a service called Services googleapis/gapic-generator-python#1706:
services.rst -> services_.rst
types.rst -> types_.rst

This PR makes the corresponding change in index.rst files.

@dizcology dizcology added the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Sep 8, 2023
@parthea parthea marked this pull request as draft September 8, 2023 18:13
@SurferJeffAtGoogle
Copy link
Contributor

Please re-assign to me when ready for review.

suztomo added a commit that referenced this pull request Sep 13, 2023
Just to see the validity of the test failures in #1856
@suztomo
Copy link
Member

suztomo commented Sep 13, 2023

Kokoro CI failed: https://source.cloud.google.com/results/invocations/a1603b4f-1b4d-4a21-9cfc-afdff613edd9/targets/cloud-devrel%2Fclient-libraries%2Fsynthtool%2Fpresubmit/log

=================================== FAILURES ===================================
___________________________ test_walk_through_apiary ___________________________

mock_subproc_popen = <MagicMock name='run' id='139646549292848'>

    @patch("subprocess.run")
    def test_walk_through_apiary(mock_subproc_popen):
        process_mock = Mock()
        attrs = {"communicate.return_value": ("output", "error")}
        process_mock.configure_mock(**attrs)
        mock_subproc_popen.return_value = process_mock
        dirs = node.walk_through_apiary(FIXTURES / "node_apiary", "src/apis/**/*")
        assert not mock_subproc_popen.called
>       assert re.search("src/apis/admin", dirs[0])
E       AssertionError: assert None
E        +  where None = <function search at 0x7f020127b760>('src/apis/admin', '/tmpfs/src/github/synthtool/tests/fixtures/node_apiary/src/apis/docs')
E        +    where <function search at 0x7f020127b760> = re.search

@parthea
Copy link
Contributor

parthea commented Sep 14, 2023

The specific test that is failing is part of the node templates. tests/test_node.py::test_walk_through_apiary . @sofisl Do you know who would be the best person to take a look?

@dizcology dizcology added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Oct 16, 2023
@kokoro-team kokoro-team removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Oct 16, 2023
@dizcology dizcology marked this pull request as ready for review October 16, 2023 16:22
@dizcology dizcology added owlbot:run Add this label to trigger the Owlbot post processor. and removed do not merge Indicates a pull request not ready for merge, due to either quality or timing. labels Oct 16, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Oct 17, 2023
@dizcology dizcology merged commit d52e638 into master Oct 18, 2023
10 checks passed
@dizcology dizcology deleted the rename-rst-files branch October 18, 2023 15:31
parthea added a commit to googleapis/google-cloud-python that referenced this pull request Oct 26, 2023
This PR updates the post processor image to the latest one which is
`gcr.io/cloud-devrel-public-resources/owlbot-python-mono-repo@sha256:590e38040466dced83fa3f0817b8b79723ca3a55ce8c61243d911fe253662f04`.

The latest image includes the following fixes:
googleapis/synthtool#1856
googleapis/synthtool#1881

Run the following commands to obtain the latest sha256
```
docker pull gcr.io/cloud-devrel-public-resources/owlbot-python-mono-repo:latest
```

```
partheniou@partheniou-vm-3:~$ docker inspect --format='{{.RepoDigests}}' gcr.io/cloud-devrel-public-resources/owlbot-python-mono-repo:latest
[gcr.io/cloud-devrel-public-resources/owlbot-python-mono-repo@sha256:590e38040466dced83fa3f0817b8b79723ca3a55ce8c61243d911fe253662f04]
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants