Skip to content

Commit fff52fa

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
chore(python): use python 3.10 for docs build (#303)
* chore(python): use python 3.10 for docs build Source-Link: googleapis/synthtool@9ae0785 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:52210e0e0559f5ea8c52be148b33504022e1faef4e95fbe4b32d68022af2fa7e * use python 3.10 for docs build * Apply same changes to docs.yml --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent c23177e commit fff52fa

5 files changed

Lines changed: 16 additions & 13 deletions

File tree

‎packages/google-cloud-org-policy/.github/.OwlBot.lock.yaml‎

Lines changed: 2 additions & 2 deletions
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:99ab465187b4891e878ee4f9977b4a6aeeb0ceadf404870c416c50e06500eb42
17-
# created: 2024-07-08T16:17:14.833595692Z
16+
digest: sha256:52210e0e0559f5ea8c52be148b33504022e1faef4e95fbe4b32d68022af2fa7e
17+
# created: 2024-07-08T19:25:35.862283192Z

‎packages/google-cloud-org-policy/.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup Python
1313
uses: actions/setup-python@v5
1414
with:
15-
python-version: "3.9"
15+
python-version: "3.10"
1616
- name: Install nox
1717
run: |
1818
python -m pip install --upgrade setuptools pip wheel

‎packages/google-cloud-org-policy/.kokoro/docker/docs/Dockerfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ RUN apt-get update \
4040
libssl-dev \
4141
libsqlite3-dev \
4242
portaudio19-dev \
43-
python3-distutils \
4443
redis-server \
4544
software-properties-common \
4645
ssh \
@@ -60,18 +59,22 @@ RUN apt-get update \
6059
&& rm -rf /var/lib/apt/lists/* \
6160
&& rm -f /var/cache/apt/archives/*.deb
6261

63-
###################### Install python 3.9.13
6462

65-
# Download python 3.9.13
66-
RUN wget https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tgz
63+
###################### Install python 3.10.14 for docs/docfx session
64+
65+
# Download python 3.10.14
66+
RUN wget https://www.python.org/ftp/python/3.10.14/Python-3.10.14.tgz
6767

6868
# Extract files
69-
RUN tar -xvf Python-3.9.13.tgz
69+
RUN tar -xvf Python-3.10.14.tgz
7070

71-
# Install python 3.9.13
72-
RUN ./Python-3.9.13/configure --enable-optimizations
71+
# Install python 3.10.14
72+
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
77+
7578
###################### Install pip
7679
RUN wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
7780
&& python3 /tmp/get-pip.py \
@@ -84,4 +87,4 @@ RUN python3 -m pip
8487
COPY requirements.txt /requirements.txt
8588
RUN python3 -m pip install --require-hashes -r requirements.txt
8689

87-
CMD ["python3.8"]
90+
CMD ["python3.10"]

‎packages/google-cloud-org-policy/noxfile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ def cover(session):
304304
session.run("coverage", "erase")
305305

306306

307-
@nox.session(python="3.9")
307+
@nox.session(python="3.10")
308308
def docs(session):
309309
"""Build the docs for this library."""
310310

‎packages/google-cloud-org-policy/owlbot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
microgenerator=True,
7070
versions=gcp.common.detect_versions(path="./google", default_first=True),
7171
)
72-
s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml", "noxfile.py"])
72+
s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml", "noxfile.py", ".github/workflows/docs.yml"])
7373

7474
s.replace("setup.py",
7575
"url = \"https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-org-policy\"",

0 commit comments

Comments
 (0)