Skip to content

Commit 56ab29f

Browse files
authored
fix: require python 3.6 (#61)
1 parent 7c2d2f8 commit 56ab29f

File tree

6 files changed

+13
-20
lines changed

6 files changed

+13
-20
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
22
image: gcr.io/repo-automation-bots/owlbot-python:latest
3-
digest: sha256:58c7342b0bccf85028100adaa3d856cb4a871c22ca9c01960d996e66c40548ce
3+
digest: sha256:b6169fc6a5207b11800a7c002d0c5c2bc6d82697185ca12e666f44031468cfcd

CONTRIBUTING.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ We use `nox <https://nox.readthedocs.io/en/latest/>`__ to instrument our tests.
6969

7070
- To test your changes, run unit tests with ``nox``::
7171

72-
$ nox -s unit-2.7
7372
$ nox -s unit-3.8
7473
$ ...
7574

@@ -144,17 +143,15 @@ Running System Tests
144143

145144
# Run all system tests
146145
$ nox -s system-3.8
147-
$ nox -s system-2.7
148146

149147
# Run a single system test
150148
$ nox -s system-3.8 -- -k <name of test>
151149

152150

153151
.. note::
154152

155-
System tests are only configured to run under Python 2.7 and
156-
Python 3.8. For expediency, we do not run them in older versions
157-
of Python 3.
153+
System tests are only configured to run under Python 3.8.
154+
For expediency, we do not run them in older versions of Python 3.
158155

159156
This alone will not run the tests. You'll need to change some local
160157
auth settings and change some configuration in your project to

README.rst

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ dependencies.
4949

5050
Supported Python Versions
5151
^^^^^^^^^^^^^^^^^^^^^^^^^
52-
Python >= 3.5
53-
54-
Deprecated Python Versions
55-
^^^^^^^^^^^^^^^^^^^^^^^^^^
56-
Python == 2.7. Python 2.7 support will be removed on January 1, 2020.
57-
52+
Python >= 3.6
5853

5954
Mac/Linux
6055
^^^^^^^^^

noxfile.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
2929

3030
DEFAULT_PYTHON_VERSION = "3.8"
31-
SYSTEM_TEST_PYTHON_VERSIONS = ["2.7", "3.8"]
32-
UNIT_TEST_PYTHON_VERSIONS = ["2.7", "3.6", "3.7", "3.8", "3.9"]
31+
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
32+
UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
3333

3434
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
3535

@@ -84,6 +84,8 @@ def default(session):
8484
constraints_path = str(
8585
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
8686
)
87+
session.install("asyncmock", "pytest-asyncio", "-c", constraints_path)
88+
8789
session.install("mock", "pytest", "pytest-cov", "-c", constraints_path)
8890

8991
session.install("-e", ".", "-c", constraints_path)
@@ -167,7 +169,7 @@ def cover(session):
167169
test runs (not system test runs), and then erases coverage data.
168170
"""
169171
session.install("coverage", "pytest-cov")
170-
session.run("coverage", "report", "--show-missing", "--fail-under=99")
172+
session.run("coverage", "report", "--show-missing", "--fail-under=100")
171173

172174
session.run("coverage", "erase")
173175

owlbot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# ----------------------------------------------------------------------------
2525
# Add templated files
2626
# ----------------------------------------------------------------------------
27-
templated_files = common.py_library(cov_level=99)
27+
templated_files = common.py_library(microgenerator=True)
2828
s.move(templated_files, excludes=["docs/multiprocessing.rst"])
2929

3030
s.shell.run(["nox", "-s", "blacken"], hide_output=False)

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,11 @@
6666
"Intended Audience :: Developers",
6767
"License :: OSI Approved :: Apache Software License",
6868
"Programming Language :: Python",
69-
"Programming Language :: Python :: 2",
70-
"Programming Language :: Python :: 2.7",
7169
"Programming Language :: Python :: 3",
72-
"Programming Language :: Python :: 3.5",
7370
"Programming Language :: Python :: 3.6",
7471
"Programming Language :: Python :: 3.7",
72+
"Programming Language :: Python :: 3.8",
73+
"Programming Language :: Python :: 3.9",
7574
"Operating System :: OS Independent",
7675
"Topic :: Internet",
7776
],
@@ -80,7 +79,7 @@
8079
namespace_packages=namespaces,
8180
install_requires=dependencies,
8281
extras_require=extras,
83-
python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*",
82+
python_requires=">=3.6",
8483
include_package_data=True,
8584
zip_safe=False,
8685
)

0 commit comments

Comments
 (0)