Skip to content

Commit

Permalink
chore(python): update release script dependencies (#386)
Browse files Browse the repository at this point in the history
* chore(python): update release script dependencies

Source-Link: googleapis/synthtool@25083af
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:e6cbd61f1838d9ff6a31436dfc13717f372a7482a82fc1863ca954ec47bff8c8

* Remove unneeded replacement

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Replace DEFAULT_PYTHON_VERSION with "3.9"

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Mariatta Wijaya <mariattaw@google.com>
  • Loading branch information
3 people committed Nov 17, 2022
1 parent 7c5a138 commit db8e753
Show file tree
Hide file tree
Showing 9 changed files with 222 additions and 181 deletions.
2 changes: 1 addition & 1 deletion .github/.OwlBot.lock.yaml
Expand Up @@ -13,4 +13,4 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
digest: sha256:7a40313731a7cb1454eef6b33d3446ebb121836738dc3ab3d2d3ded5268c35b6
digest: sha256:e6cbd61f1838d9ff6a31436dfc13717f372a7482a82fc1863ca954ec47bff8c8
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.9"
- name: Install nox
run: |
python -m pip install --upgrade setuptools pip wheel
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.9"
- name: Install nox
run: |
python -m pip install --upgrade setuptools pip wheel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.8"
- name: Install nox
run: |
python -m pip install --upgrade setuptools pip wheel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittest.yml
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.8"
- name: Install coverage
run: |
python -m pip install --upgrade setuptools pip wheel
Expand Down
12 changes: 6 additions & 6 deletions .kokoro/docker/docs/Dockerfile
Expand Up @@ -60,16 +60,16 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /var/cache/apt/archives/*.deb

###################### Install python 3.8.11
###################### Install python 3.9.13

# Download python 3.8.11
RUN wget https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tgz
# Download python 3.9.13
RUN wget https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tgz

# Extract files
RUN tar -xvf Python-3.8.11.tgz
RUN tar -xvf Python-3.9.13.tgz

# Install python 3.8.11
RUN ./Python-3.8.11/configure --enable-optimizations
# Install python 3.9.13
RUN ./Python-3.9.13/configure --enable-optimizations
RUN make altinstall

###################### Install pip
Expand Down
4 changes: 3 additions & 1 deletion .kokoro/requirements.in
Expand Up @@ -5,4 +5,6 @@ typing-extensions
twine
wheel
setuptools
nox
nox
charset-normalizer<3
click<8.1.0
354 changes: 193 additions & 161 deletions .kokoro/requirements.txt

Large diffs are not rendered by default.

17 changes: 12 additions & 5 deletions noxfile.py
Expand Up @@ -291,12 +291,16 @@ def cover(session):
session.run("coverage", "erase")


@nox.session(python=DEFAULT_PYTHON_VERSION)
@nox.session(python="3.9")
def docs(session):
"""Build the docs for this library."""

session.install("-e", ".")
session.install("sphinx==4.0.1", "alabaster", "recommonmark")
session.install(
"sphinx==4.0.1",
"alabaster",
"recommonmark",
)

shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
session.run(
Expand All @@ -313,7 +317,7 @@ def docs(session):
)


@nox.session(python=DEFAULT_PYTHON_VERSION)
@nox.session(python="3.9")
def doctests(session):
# Install all test dependencies, then install this package into the
# virtualenv's dist-packages.
Expand All @@ -324,13 +328,16 @@ def doctests(session):
session.run("py.test", "tests/doctests.py")


@nox.session(python=DEFAULT_PYTHON_VERSION)
@nox.session(python="3.9")
def docfx(session):
"""Build the docfx yaml files for this library."""

session.install("-e", ".")
session.install(
"sphinx==4.0.1", "alabaster", "recommonmark", "gcp-sphinx-docfx-yaml"
"sphinx==4.0.1",
"alabaster",
"recommonmark",
"gcp-sphinx-docfx-yaml",
)

shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
Expand Down
6 changes: 3 additions & 3 deletions owlbot.py
Expand Up @@ -179,11 +179,11 @@ def system(session, disable_grpc):
assert 1 == s.replace(
"noxfile.py",
r"""\
@nox.session\(python=DEFAULT_PYTHON_VERSION\)
@nox.session\(python="3.9"\)
def docfx\(session\):
""",
"""\
@nox.session(python=DEFAULT_PYTHON_VERSION)
@nox.session(python="3.9")
def doctests(session):
# Install all test dependencies, then install this package into the
# virtualenv's dist-packages.
Expand All @@ -194,7 +194,7 @@ def doctests(session):
session.run("py.test", "tests/doctests.py")
@nox.session(python=DEFAULT_PYTHON_VERSION)
@nox.session(python="3.9")
def docfx(session):
""",
)
Expand Down

0 comments on commit db8e753

Please sign in to comment.