Skip to content
This repository was archived by the owner on Dec 31, 2023. It is now read-only.

Commit e5afa2c

Browse files
gcf-owl-bot[bot]m-strzelczykparthea
authored
fix: require python 3.7+ (#304)
* chore(python): drop python 3.6 Source-Link: googleapis/synthtool@4f89b13 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:e7bb19d47c13839fe8c147e50e02e8b6cf5da8edd1af8b82208cd6f66cc2829c * add api_description to .repo-metadata.json * require python 3.7+ in setup.py * remove python 3.6 sample configs * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * exclude templated readme Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Maciej Strzelczyk <[email protected]> Co-authored-by: Anthonios Partheniou <[email protected]>
1 parent 79b26c5 commit e5afa2c

File tree

14 files changed

+65
-117
lines changed

14 files changed

+65
-117
lines changed

.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:a5d81b61dfd1a432d3c03f51a25d2e71b37be24da509966d50724aea7c57c5c2
17-
# created: 2022-07-04T12:33:08.125873124Z
16+
digest: sha256:e7bb19d47c13839fe8c147e50e02e8b6cf5da8edd1af8b82208cd6f66cc2829c
17+
# created: 2022-07-05T18:31:20.838186805Z

.github/workflows/unittest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
11+
python: ['3.7', '3.8', '3.9', '3.10']
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v3

.kokoro/samples/python3.6/common.cfg

Lines changed: 0 additions & 40 deletions
This file was deleted.

.kokoro/samples/python3.6/continuous.cfg

Lines changed: 0 additions & 7 deletions
This file was deleted.

.kokoro/samples/python3.6/periodic-head.cfg

Lines changed: 0 additions & 11 deletions
This file was deleted.

.kokoro/samples/python3.6/periodic.cfg

Lines changed: 0 additions & 6 deletions
This file was deleted.

.kokoro/samples/python3.6/presubmit.cfg

Lines changed: 0 additions & 6 deletions
This file was deleted.

.repo-metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
"api_id": "compute.googleapis.com",
1313
"codeowner_team": "@googleapis/api-compute",
1414
"default_version": "v1",
15-
"api_shortname": "compute"
15+
"api_shortname": "compute",
16+
"api_description": "delivers virtual machines running in Google's innovative data centers and worldwide fiber network. Compute Engine's tooling and workflow support enable scaling from single instances to global, load-balanced cloud computing. Compute Engine's VMs boot quickly, come with persistent disk storage, deliver consistent performance and are available in many configurations."
1617
}

CONTRIBUTING.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In order to add a feature:
2222
documentation.
2323

2424
- The feature must work fully on the following CPython versions:
25-
3.6, 3.7, 3.8, 3.9 and 3.10 on both UNIX and Windows.
25+
3.7, 3.8, 3.9 and 3.10 on both UNIX and Windows.
2626

2727
- The feature must not add unnecessary dependencies (where
2828
"unnecessary" is of course subjective, but new dependencies should
@@ -221,13 +221,11 @@ Supported Python Versions
221221

222222
We support:
223223

224-
- `Python 3.6`_
225224
- `Python 3.7`_
226225
- `Python 3.8`_
227226
- `Python 3.9`_
228227
- `Python 3.10`_
229228

230-
.. _Python 3.6: https://docs.python.org/3.6/
231229
.. _Python 3.7: https://docs.python.org/3.7/
232230
.. _Python 3.8: https://docs.python.org/3.8/
233231
.. _Python 3.9: https://docs.python.org/3.9/
@@ -239,7 +237,7 @@ Supported versions can be found in our ``noxfile.py`` `config`_.
239237
.. _config: https://github.com/googleapis/python-compute/blob/main/noxfile.py
240238

241239

242-
We also explicitly decided to support Python 3 beginning with version 3.6.
240+
We also explicitly decided to support Python 3 beginning with version 3.7.
243241
Reasons for this include:
244242

245243
- Encouraging use of newest versions of Python 3

noxfile.py

Lines changed: 54 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
DEFAULT_PYTHON_VERSION = "3.8"
3333

34-
UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
34+
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"]
3535
UNIT_TEST_STANDARD_DEPENDENCIES = [
3636
"mock",
3737
"asyncmock",
@@ -331,28 +331,15 @@ def docfx(session):
331331
def prerelease_deps(session):
332332
"""Run all tests with prerelease versions of dependencies installed."""
333333

334-
prerel_deps = [
335-
"protobuf",
336-
"googleapis-common-protos",
337-
"google-auth",
338-
"grpcio",
339-
"grpcio-status",
340-
"google-api-core",
341-
"proto-plus",
342-
# dependencies of google-auth
343-
"cryptography",
344-
"pyasn1",
345-
]
346-
347-
for dep in prerel_deps:
348-
session.install("--pre", "--no-deps", "--upgrade", dep)
349-
350-
# Remaining dependencies
351-
other_deps = ["requests"]
352-
session.install(*other_deps)
353-
334+
# Install all dependencies
335+
session.install("-e", ".[all, tests, tracing]")
354336
session.install(*UNIT_TEST_STANDARD_DEPENDENCIES)
355-
session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES)
337+
system_deps_all = (
338+
SYSTEM_TEST_STANDARD_DEPENDENCIES
339+
+ SYSTEM_TEST_EXTERNAL_DEPENDENCIES
340+
+ SYSTEM_TEST_EXTRAS
341+
)
342+
session.install(*system_deps_all)
356343

357344
# Because we test minimum dependency versions on the minimum Python
358345
# version, the first version we test with in the unit tests sessions has a
@@ -366,19 +353,44 @@ def prerelease_deps(session):
366353
constraints_text = constraints_file.read()
367354

368355
# Ignore leading whitespace and comment lines.
369-
deps = [
356+
constraints_deps = [
370357
match.group(1)
371358
for match in re.finditer(
372359
r"^\s*(\S+)(?===\S+)", constraints_text, flags=re.MULTILINE
373360
)
374361
]
375362

376-
# Don't overwrite prerelease packages.
377-
deps = [dep for dep in deps if dep not in prerel_deps]
378-
# We use --no-deps to ensure that pre-release versions aren't overwritten
379-
# by the version ranges in setup.py.
380-
session.install(*deps)
381-
session.install("--no-deps", "-e", ".[all]")
363+
session.install(*constraints_deps)
364+
365+
if os.path.exists("samples/snippets/requirements.txt"):
366+
session.install("-r", "samples/snippets/requirements.txt")
367+
368+
if os.path.exists("samples/snippets/requirements-test.txt"):
369+
session.install("-r", "samples/snippets/requirements-test.txt")
370+
371+
prerel_deps = [
372+
"protobuf",
373+
# dependency of grpc
374+
"six",
375+
"googleapis-common-protos",
376+
"grpcio",
377+
"grpcio-status",
378+
"google-api-core",
379+
"proto-plus",
380+
"google-cloud-testutils",
381+
# dependencies of google-cloud-testutils"
382+
"click",
383+
]
384+
385+
for dep in prerel_deps:
386+
session.install("--pre", "--no-deps", "--upgrade", dep)
387+
388+
# Remaining dependencies
389+
other_deps = [
390+
"requests",
391+
"google-auth",
392+
]
393+
session.install(*other_deps)
382394

383395
# Print out prerelease package versions
384396
session.run(
@@ -387,5 +399,16 @@ def prerelease_deps(session):
387399
session.run("python", "-c", "import grpc; print(grpc.__version__)")
388400

389401
session.run("py.test", "tests/unit")
390-
session.run("py.test", "tests/system")
391-
session.run("py.test", "samples/snippets")
402+
403+
system_test_path = os.path.join("tests", "system.py")
404+
system_test_folder_path = os.path.join("tests", "system")
405+
406+
# Only run system tests if found.
407+
if os.path.exists(system_test_path) or os.path.exists(system_test_folder_path):
408+
session.run("py.test", "tests/system")
409+
410+
snippets_test_path = os.path.join("samples", "snippets")
411+
412+
# Only run samples tests if found.
413+
if os.path.exists(snippets_test_path):
414+
session.run("py.test", "samples/snippets")

owlbot.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@
5353
versions=gcp.common.detect_versions(path="./google", default_first=True),
5454
)
5555

56-
s.move(templated_files, excludes=[".coveragerc"]) # the microgenerator has a good coveragerc file
57-
58-
# Work around bug in templates https://github.com/googleapis/synthtool/pull/1335
59-
s.replace(".github/workflows/unittest.yml", "--fail-under=100", "--fail-under=98")
56+
s.move(templated_files, excludes=[".coveragerc", "README.rst"])
6057

6158
python.py_samples(skip_readmes=True)
6259

samples/noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:
8989

9090
# DO NOT EDIT - automatically generated.
9191
# All versions used to test samples.
92-
ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
92+
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10"]
9393

9494
# Any default versions that should be ignored.
9595
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]

scripts/readme-gen/templates/install_deps.tmpl.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Install Dependencies
1212
.. _Python Development Environment Setup Guide:
1313
https://cloud.google.com/python/setup
1414

15-
#. Create a virtualenv. Samples are compatible with Python 3.6+.
15+
#. Create a virtualenv. Samples are compatible with Python 3.7+.
1616

1717
.. code-block:: bash
1818

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,13 @@
4949
"protobuf >= 3.19.0, <4.0.0dev",
5050
"dataclasses >= 0.6; python_version < '3.7'",
5151
),
52-
python_requires=">=3.6",
52+
python_requires=">=3.7",
5353
classifiers=[
5454
"Development Status :: 5 - Production/Stable",
5555
"Intended Audience :: Developers",
5656
"Operating System :: OS Independent",
5757
"Programming Language :: Python",
5858
"Programming Language :: Python :: 3",
59-
"Programming Language :: Python :: 3.6",
6059
"Programming Language :: Python :: 3.7",
6160
"Programming Language :: Python :: 3.8",
6261
"Programming Language :: Python :: 3.9",

0 commit comments

Comments
 (0)