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

Jump to bottom

fix!: drop Python 2.7 support #229

Merged
merged 20 commits into from
Aug 2, 2021
Merged

fix!: drop Python 2.7 support #229

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
56b2bd1
fix!: drop support for Python 2.7.
tseaver Jun 16, 2021
6541630
chore: drop use of 'six' wrapper
tseaver Jun 16, 2021
29aa7df
chore: drop 'u"' prefixes
tseaver Jun 16, 2021
c7fbe6b
chore: blacken
tseaver Jun 16, 2021
e2b99bd
fix: adjust systest import
tseaver Jun 16, 2021
7b0a972
Merge branch 'master' into 228-drop-python-2.7
tseaver Jun 16, 2021
eeaed03
Merge branch 'master' into 228-drop-python-2.7
tseaver Jun 18, 2021
87c3d72
docs: note unsupported Python versions
tseaver Jun 18, 2021
9d82941
tests: restore binary images zapped in 29aa7df
tseaver Jun 18, 2021
e7cdd35
chore: drop "u'" prefixes
tseaver Jun 18, 2021
3f6d81d
chore: merge string literal
tseaver Jun 18, 2021
d5e7c0b
Merge branch 'master' into 228-drop-python-2.7
tseaver Jun 18, 2021
47bf70a
chore: repair one more bad import
tseaver Jun 18, 2021
c3425ea
chore: remove 'six' readded in merge
tseaver Jun 18, 2021
a102e6b
Merge branch 'master' into 228-drop-python-2.7
tseaver Jul 14, 2021
b5c5770
Merge branch 'master' into 228-drop-python-2.7
tseaver Jul 23, 2021
99b57a6
Merge branch 'master' into 228-drop-python-2.7
tseaver Jul 29, 2021
42d3168
chore: bump last version supporting Python 2.7
tseaver Jul 29, 2021
6524f2c
Merge branch 'master' into 228-drop-python-2.7
tseaver Jul 30, 2021
a65ffb7
chore: bump last-version-supporting-python-2.7
tseaver Aug 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions tests/unit/requests/test_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@
from google.resumable_media.requests import _request_helpers


EXAMPLE_URL = (
"https://www.googleapis.com/download/storage/v1/b/"
"{BUCKET}/o/{OBJECT}?alt=media"
)
URL_PREFIX = "https://www.googleapis.com/download/storage/v1/b/{BUCKET}/o/"
EXAMPLE_URL = URL_PREFIX + "{OBJECT}?alt=media"
EXPECTED_TIMEOUT = (61, 60)


Expand Down
16 changes: 4 additions & 12 deletions tests/unit/requests/test_upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,10 @@
import google.resumable_media.requests.upload as upload_mod


SIMPLE_URL = (
"https://www.googleapis.com/upload/storage/v1/b/{BUCKET}/o?"
"uploadType=media&name={OBJECT}"
)
MULTIPART_URL = (
"https://www.googleapis.com/upload/storage/v1/b/{BUCKET}/o?"
"uploadType=multipart"
)
RESUMABLE_URL = (
"https://www.googleapis.com/upload/storage/v1/b/{BUCKET}/o?"
"uploadType=resumable"
)
URL_PREFIX = "https://www.googleapis.com/upload/storage/v1/b/{BUCKET}/o"
SIMPLE_URL = URL_PREFIX + "?uploadType=media&name={OBJECT}"
MULTIPART_URL = URL_PREFIX + "?uploadType=multipart"
RESUMABLE_URL = URL_PREFIX + "?uploadType=resumable"
ONE_MB = 1024 * 1024
BASIC_CONTENT = "text/plain"
JSON_TYPE = "application/json; charset=UTF-8"
Expand Down
3 changes: 1 addition & 2 deletions tests/unit/test__download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@


EXAMPLE_URL = (
"https://www.googleapis.com/download/storage/v1/b/"
"{BUCKET}/o/{OBJECT}?alt=media"
"https://www.googleapis.com/download/storage/v1/b/" "{BUCKET}/o/{OBJECT}?alt=media"
tseaver marked this conversation as resolved.
Show resolved Hide resolved
)


Expand Down
6 changes: 5 additions & 1 deletion tests/unit/test__helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,11 @@ def test__is_fast_crcmod_wo_extension_warning(mock_import):
assert not _helpers._is_fast_crcmod()

mock_import.assert_called_once_with(
"crcmod.crcmod", mock.ANY, {}, ["_usingExtension"], 0,
"crcmod.crcmod",
mock.ANY,
{},
["_usingExtension"],
0,
)


Expand Down
16 changes: 4 additions & 12 deletions tests/unit/test__upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,10 @@
from google.resumable_media import common


SIMPLE_URL = (
"https://www.googleapis.com/upload/storage/v1/b/{BUCKET}/o?"
"uploadType=media&name={OBJECT}"
)
MULTIPART_URL = (
"https://www.googleapis.com/upload/storage/v1/b/{BUCKET}/o?"
"uploadType=multipart"
)
RESUMABLE_URL = (
"https://www.googleapis.com/upload/storage/v1/b/{BUCKET}/o?"
"uploadType=resumable"
)
URL_PREFIX = "https://www.googleapis.com/upload/storage/v1/b/{BUCKET}/o"
SIMPLE_URL = URL_PREFIX + "?uploadType=media&name={OBJECT}"
MULTIPART_URL = URL_PREFIX + "?uploadType=multipart"
RESUMABLE_URL = URL_PREFIX + "?uploadType=resumable"
ONE_MB = 1024 * 1024
BASIC_CONTENT = "text/plain"
JSON_TYPE = "application/json; charset=UTF-8"
Expand Down