Skip to content

Upgraded cachecontrol to latest #378

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

Merged
merged 2 commits into from
Jan 3, 2020
Merged

Upgraded cachecontrol to latest #378

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
305737e
Upgraded cachecontrol to latest
hiranya911 Dec 23, 2019
c1d66fa
Fixing some failing requests tests
hiranya911 Dec 23, 2019
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
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pytest-cov >= 2.4.0
pytest-localserver >= 0.4.1
tox >= 3.6.0

cachecontrol >= 0.12.4
cachecontrol >= 0.12.6
google-api-core[grpc] >= 1.14.0, < 2.0.0dev; platform.python_implementation != 'PyPy'
google-api-python-client >= 1.7.8
google-cloud-firestore >= 1.4.0; platform.python_implementation != 'PyPy'
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 @@ -37,7 +37,7 @@
long_description = ('The Firebase Admin Python SDK enables server-side (backend) Python developers '
'to integrate Firebase into their services and applications.')
install_requires = [
'cachecontrol>=0.12.4',
'cachecontrol>=0.12.6',
'google-api-core[grpc] >= 1.14.0, < 2.0.0dev; platform.python_implementation != "PyPy"',
'google-api-python-client >= 1.7.8',
'google-cloud-firestore>=1.4.0; platform.python_implementation != "PyPy"',
Expand Down
2 changes: 1 addition & 1 deletion tests/test_db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ def test_http_timeout(self):
assert ref._client.timeout == 60
assert ref.get() == {}
assert len(recorder) == 1
assert recorder[0]._extra_kwargs['timeout'] == 60
assert recorder[0]._extra_kwargs['timeout'] == pytest.approx(60, 0.001)

def test_app_delete(self):
app = firebase_admin.initialize_app(
Expand Down
4 changes: 2 additions & 2 deletions tests/test_messaging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@ def test_send(self):
msg = messaging.Message(topic='foo')
messaging.send(msg)
assert len(self.recorder) == 1
assert self.recorder[0]._extra_kwargs['timeout'] == 4
assert self.recorder[0]._extra_kwargs['timeout'] == pytest.approx(4, 0.001)

def test_topic_management_timeout(self):
self.fcm_service._client.session.mount(
Expand All @@ -1574,7 +1574,7 @@ def test_topic_management_timeout(self):
)
messaging.subscribe_to_topic(['1'], 'a')
assert len(self.recorder) == 1
assert self.recorder[0]._extra_kwargs['timeout'] == 4
assert self.recorder[0]._extra_kwargs['timeout'] == pytest.approx(4, 0.001)


class TestSend(object):
Expand Down