Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dependencies): add urllib3 and requests to aiohttp extra #755

Merged
merged 3 commits into from
May 25, 2021
Merged

fix(dependencies): add urllib3 and requests to aiohttp extra #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f42bfb3
fix(dependencies): add urllib3 and requests to aiohttp extra
busunkim96 May 21, 2021
af6536a
chore: fix formatting
busunkim96 May 24, 2021
8aef980
Merge branch 'master' into add-requests-and-urllib3
busunkim96 May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,14 @@ def lint(session):
)


@nox.session(python="3.6")
@nox.session(python="3.8")
def blacken(session):
"""Run black.
Format code to uniform standard.
This currently uses Python 3.6 due to the automated Kokoro run of synthtool.
That run uses an image that doesn't have 3.6 installed. Before updating this
check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
The Python version should be consistent with what is
supplied in the Python Owlbot postprocessor.

https://github.com/googleapis/synthtool/blob/master/docker/owlbot/python/Dockerfile
"""
session.install(BLACK_VERSION)
session.run("black", *BLACK_PATHS)
Expand Down
6 changes: 5 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
)

extras = {
"aiohttp": "aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'",
"aiohttp": [
"aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'",
"requests >= 2.18.0, < 3.0.0dev",
"urllib3 >= 1.0.0, <2.0.0dev",
],
"pyopenssl": "pyopenssl>=20.0.0",
"reauth": "pyu2f>=0.1.5",
}
Expand Down
4 changes: 3 additions & 1 deletion testing/constraints-3.6.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ setuptools==40.3.0
six==1.9.0
rsa==4.6
rsa==3.1.4
aiohttp==3.6.2
aiohttp==3.6.2
requests==2.18.0
urllib3==1.0.0