Skip to content

Commit 042db4b

Browse files
chore(python): fix docs build (#871)
Source-Link: googleapis/synthtool@bef813d Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:94bb690db96e6242b2567a4860a94d48fa48696d092e51b0884a1a2c0a79a407 Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent e9b0557 commit 042db4b

File tree

3 files changed

+16
-20
lines changed

3 files changed

+16
-20
lines changed

.github/.OwlBot.lock.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:52210e0e0559f5ea8c52be148b33504022e1faef4e95fbe4b32d68022af2fa7e
17-
# created: 2024-07-08T19:25:35.862283192Z
16+
digest: sha256:94bb690db96e6242b2567a4860a94d48fa48696d092e51b0884a1a2c0a79a407
17+
# created: 2024-07-31T14:52:44.926548819Z

.kokoro/docker/docs/Dockerfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,18 @@ RUN tar -xvf Python-3.10.14.tgz
7272
RUN ./Python-3.10.14/configure --enable-optimizations
7373
RUN make altinstall
7474

75-
RUN python3.10 -m venv /venv
76-
ENV PATH /venv/bin:$PATH
75+
ENV PATH /usr/local/bin/python3.10:$PATH
7776

7877
###################### Install pip
7978
RUN wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
80-
&& python3 /tmp/get-pip.py \
79+
&& python3.10 /tmp/get-pip.py \
8180
&& rm /tmp/get-pip.py
8281

8382
# Test pip
84-
RUN python3 -m pip
83+
RUN python3.10 -m pip
8584

8685
# Install build requirements
8786
COPY requirements.txt /requirements.txt
88-
RUN python3 -m pip install --require-hashes -r requirements.txt
87+
RUN python3.10 -m pip install --require-hashes -r requirements.txt
8988

9089
CMD ["python3.10"]

.kokoro/publish-docs.sh

+10-13
Original file line numberDiff line numberDiff line change
@@ -21,45 +21,42 @@ export PYTHONUNBUFFERED=1
2121
export PATH="${HOME}/.local/bin:${PATH}"
2222

2323
# Install nox
24-
python3 -m pip install --require-hashes -r .kokoro/requirements.txt
25-
python3 -m nox --version
24+
python3.10 -m pip install --require-hashes -r .kokoro/requirements.txt
25+
python3.10 -m nox --version
2626

2727
# build docs
2828
nox -s docs
2929

3030
# create metadata
31-
python3 -m docuploader create-metadata \
31+
python3.10 -m docuploader create-metadata \
3232
--name=$(jq --raw-output '.name // empty' .repo-metadata.json) \
33-
--version=$(python3 setup.py --version) \
33+
--version=$(python3.10 setup.py --version) \
3434
--language=$(jq --raw-output '.language // empty' .repo-metadata.json) \
35-
--distribution-name=$(python3 setup.py --name) \
35+
--distribution-name=$(python3.10 setup.py --name) \
3636
--product-page=$(jq --raw-output '.product_documentation // empty' .repo-metadata.json) \
3737
--github-repository=$(jq --raw-output '.repo // empty' .repo-metadata.json) \
3838
--issue-tracker=$(jq --raw-output '.issue_tracker // empty' .repo-metadata.json)
3939

4040
cat docs.metadata
4141

4242
# upload docs
43-
python3 -m docuploader upload docs/_build/html --metadata-file docs.metadata --staging-bucket "${STAGING_BUCKET}"
43+
python3.10 -m docuploader upload docs/_build/html --metadata-file docs.metadata --staging-bucket "${STAGING_BUCKET}"
4444

4545

4646
# docfx yaml files
4747
nox -s docfx
4848

4949
# create metadata.
50-
python3 -m docuploader create-metadata \
50+
python3.10 -m docuploader create-metadata \
5151
--name=$(jq --raw-output '.name // empty' .repo-metadata.json) \
52-
--version=$(python3 setup.py --version) \
52+
--version=$(python3.10 setup.py --version) \
5353
--language=$(jq --raw-output '.language // empty' .repo-metadata.json) \
54-
--distribution-name=$(python3 setup.py --name) \
54+
--distribution-name=$(python3.10 setup.py --name) \
5555
--product-page=$(jq --raw-output '.product_documentation // empty' .repo-metadata.json) \
5656
--github-repository=$(jq --raw-output '.repo // empty' .repo-metadata.json) \
5757
--issue-tracker=$(jq --raw-output '.issue_tracker // empty' .repo-metadata.json)
5858

5959
cat docs.metadata
6060

61-
# Replace toc.yml template file
62-
mv docs/templates/toc.yml docs/_build/html/docfx_yaml/toc.yml
63-
6461
# upload docs
65-
python3 -m docuploader upload docs/_build/html/docfx_yaml --metadata-file docs.metadata --destination-prefix docfx --staging-bucket "${V2_STAGING_BUCKET}"
62+
python3.10 -m docuploader upload docs/_build/html/docfx_yaml --metadata-file docs.metadata --destination-prefix docfx --staging-bucket "${V2_STAGING_BUCKET}"

0 commit comments

Comments
 (0)