Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix(deps): Revert "fix: pin 'aoihttp < 3.7.0dev' (#634)" (#632) #640

Merged
merged 2 commits into from
Oct 29, 2020
Merged

fix(deps): Revert "fix: pin 'aoihttp < 3.7.0dev' (#634)" (#632) #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1323589
Revert "fix: pin 'aoihttp < 3.7.0dev' (#634)" (#632)
davidwtbuxton Oct 29, 2020
05ad15e
Merge branch 'master' into bugfix/632-remove-aiohttp-pinning
busunkim96 Oct 29, 2020
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
7 changes: 1 addition & 6 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@
"grpcio",
]

ASYNC_DEPENDENCIES = [
"pytest-asyncio",
"aiohttp < 3.7.0dev",
"aioresponses",
"asynctest",
]
ASYNC_DEPENDENCIES = ["pytest-asyncio", "aioresponses", "asynctest"]

BLACK_VERSION = "black==19.3b0"
BLACK_PATHS = [
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"six>=1.9.0",
)

extras = {"aiohttp": "aiohttp >= 3.6.2, < 3.7.0dev; python_version>='3.6'"}
extras = {"aiohttp": "aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'"}

with io.open("README.rst", "r") as fh:
long_description = fh.read()
Expand Down
2 changes: 1 addition & 1 deletion system_tests/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def configure_cloud_sdk(session, application_default_credentials, project=False)

# Test sesssions

TEST_DEPENDENCIES_ASYNC = ["aiohttp < 3.7.0dev", "pytest-asyncio", "nest-asyncio"]
TEST_DEPENDENCIES_ASYNC = ["aiohttp", "pytest-asyncio", "nest-asyncio"]
TEST_DEPENDENCIES_SYNC = ["pytest", "requests"]
PYTHON_VERSIONS_ASYNC = ["3.7"]
PYTHON_VERSIONS_SYNC = ["2.7", "3.7"]
Expand Down