Skip to content

Commit 57794c3

Browse files
build(deps): bump certifi from 2022.9.24 to 2022.12.7 in /synthtool/gcp/templates/python_library/.kokoro (#535)
Source-Link: googleapis/synthtool@b4fe62e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:3bf87e47c2173d7eed42714589dc4da2c07c3268610f1e47f8e1a30decbfc7f1 Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 4e17259 commit 57794c3

File tree

7 files changed

+214
-198
lines changed

7 files changed

+214
-198
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:7a40313731a7cb1454eef6b33d3446ebb121836738dc3ab3d2d3ded5268c35b6
16+
digest: sha256:3bf87e47c2173d7eed42714589dc4da2c07c3268610f1e47f8e1a30decbfc7f1

.kokoro/docker/docs/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ RUN apt-get update \
6060
&& rm -rf /var/lib/apt/lists/* \
6161
&& rm -f /var/cache/apt/archives/*.deb
6262

63-
###################### Install python 3.8.11
63+
###################### Install python 3.9.13
6464

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

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

71-
# Install python 3.8.11
72-
RUN ./Python-3.8.11/configure --enable-optimizations
71+
# Install python 3.9.13
72+
RUN ./Python-3.9.13/configure --enable-optimizations
7373
RUN make altinstall
7474

7575
###################### Install pip

.kokoro/requirements.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ typing-extensions
55
twine
66
wheel
77
setuptools
8-
nox
8+
nox
9+
charset-normalizer<3
10+
click<8.1.0

.kokoro/requirements.txt

Lines changed: 193 additions & 161 deletions
Large diffs are not rendered by default.

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
rev: 22.3.0
2626
hooks:
2727
- id: black
28-
- repo: https://gitlab.com/pycqa/flake8
28+
- repo: https://github.com/pycqa/flake8
2929
rev: 3.9.2
3030
hooks:
3131
- id: flake8

noxfile.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@
5757
],
5858
}
5959

60-
61-
# We're using two Python versions to test with sqlalchemy 1.3 and 1.4.
6260
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8", "3.10"]
6361
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
6462
"mock",
@@ -418,13 +416,17 @@ def cover(session):
418416
session.run("coverage", "erase")
419417

420418

421-
@nox.session(python=DEFAULT_PYTHON_VERSION)
419+
@nox.session(python="3.9")
422420
def docs(session):
423421
"""Build the docs for this library."""
424422

425423
session.install("-e", ".")
426424
session.install(
427-
"sphinx==4.0.1", "alabaster", "geoalchemy2", "shapely", "recommonmark"
425+
"sphinx==4.0.1",
426+
"alabaster",
427+
"geoalchemy2",
428+
"shapely",
429+
"recommonmark",
428430
)
429431

430432
shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
@@ -442,7 +444,7 @@ def docs(session):
442444
)
443445

444446

445-
@nox.session(python=DEFAULT_PYTHON_VERSION)
447+
@nox.session(python="3.9")
446448
def docfx(session):
447449
"""Build the docfx yaml files for this library."""
448450

samples/snippets/noxfile.py

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import os
1919
from pathlib import Path
2020
import sys
21-
from typing import Callable, Dict, List, Optional
21+
from typing import Callable, Dict, Optional
2222

2323
import nox
2424

@@ -109,22 +109,6 @@ def get_pytest_env_vars() -> Dict[str, str]:
109109
#
110110

111111

112-
def _determine_local_import_names(start_dir: str) -> List[str]:
113-
"""Determines all import names that should be considered "local".
114-
115-
This is used when running the linter to insure that import order is
116-
properly checked.
117-
"""
118-
file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)]
119-
return [
120-
basename
121-
for basename, extension in file_ext_pairs
122-
if extension == ".py"
123-
or os.path.isdir(os.path.join(start_dir, basename))
124-
and basename not in ("__pycache__")
125-
]
126-
127-
128112
# Linting with flake8.
129113
#
130114
# We ignore the following rules:
@@ -139,7 +123,6 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
139123
"--show-source",
140124
"--builtin=gettext",
141125
"--max-complexity=20",
142-
"--import-order-style=google",
143126
"--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py",
144127
"--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202",
145128
"--max-line-length=88",
@@ -149,14 +132,11 @@ def _determine_local_import_names(start_dir: str) -> List[str]:
149132
@nox.session
150133
def lint(session: nox.sessions.Session) -> None:
151134
if not TEST_CONFIG["enforce_type_hints"]:
152-
session.install("flake8", "flake8-import-order")
135+
session.install("flake8")
153136
else:
154-
session.install("flake8", "flake8-import-order", "flake8-annotations")
137+
session.install("flake8", "flake8-annotations")
155138

156-
local_names = _determine_local_import_names(".")
157139
args = FLAKE8_COMMON_ARGS + [
158-
"--application-import-names",
159-
",".join(local_names),
160140
".",
161141
]
162142
session.run("flake8", *args)

0 commit comments

Comments
 (0)