diff --git a/CHANGELOG.md b/CHANGELOG.md index 853f4b26f..893066183 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-storage/#history +### [2.2.1](https://github.com/googleapis/python-storage/compare/v2.2.0...v2.2.1) (2022-03-15) + + +### Bug Fixes + +* remove py.typed marker file for PEP 561 ([#735](https://github.com/googleapis/python-storage/issues/735)) ([f77d2f7](https://github.com/googleapis/python-storage/commit/f77d2f787f435f2f898e9babcdab81225672ad4f)), closes [#734](https://github.com/googleapis/python-storage/issues/734) + ## [2.2.0](https://github.com/googleapis/python-storage/compare/v2.1.0...v2.2.0) (2022-03-14) diff --git a/google/__init__.py b/google/__init__.py index 18e75b457..0e1bc5131 100644 --- a/google/__init__.py +++ b/google/__init__.py @@ -13,7 +13,7 @@ # limitations under the License. try: - import pkg_resources # type: ignore + import pkg_resources pkg_resources.declare_namespace(__name__) except ImportError: diff --git a/google/cloud/__init__.py b/google/cloud/__init__.py index 18e75b457..0e1bc5131 100644 --- a/google/cloud/__init__.py +++ b/google/cloud/__init__.py @@ -13,7 +13,7 @@ # limitations under the License. try: - import pkg_resources # type: ignore + import pkg_resources pkg_resources.declare_namespace(__name__) except ImportError: diff --git a/google/cloud/storage/_helpers.py b/google/cloud/storage/_helpers.py index e1f0ddbc3..5a1c86c48 100644 --- a/google/cloud/storage/_helpers.py +++ b/google/cloud/storage/_helpers.py @@ -22,7 +22,7 @@ import os from urllib.parse import urlsplit -from google import resumable_media # type: ignore +from google import resumable_media from google.auth import environment_vars from google.cloud.storage.constants import _DEFAULT_TIMEOUT from google.cloud.storage.retry import DEFAULT_RETRY diff --git a/google/cloud/storage/_http.py b/google/cloud/storage/_http.py index 99114cbf8..6c9d11700 100644 --- a/google/cloud/storage/_http.py +++ b/google/cloud/storage/_http.py @@ -16,9 +16,9 @@ import functools import os -import pkg_resources # type: ignore +import pkg_resources -from google.cloud import _http # type: ignore +from google.cloud import _http from google.cloud.storage import __version__ diff --git a/google/cloud/storage/acl.py b/google/cloud/storage/acl.py index fc4714ab5..b3b77766f 100644 --- a/google/cloud/storage/acl.py +++ b/google/cloud/storage/acl.py @@ -412,7 +412,7 @@ def get_entities(self): self._ensure_loaded() return list(self.entities.values()) - @property # type: ignore + @property def client(self): """Abstract getter for the object client.""" raise NotImplementedError diff --git a/google/cloud/storage/batch.py b/google/cloud/storage/batch.py index 36a292d3c..cbc93397f 100644 --- a/google/cloud/storage/batch.py +++ b/google/cloud/storage/batch.py @@ -23,7 +23,7 @@ import io import json -import requests # type: ignore +import requests from google.cloud import _helpers from google.cloud import exceptions diff --git a/google/cloud/storage/blob.py b/google/cloud/storage/blob.py index bed7b1966..caa4a164f 100644 --- a/google/cloud/storage/blob.py +++ b/google/cloud/storage/blob.py @@ -42,7 +42,7 @@ from urllib.parse import urlunsplit import warnings -from google import resumable_media # type: ignore +from google import resumable_media from google.resumable_media.requests import ChunkedDownload from google.resumable_media.requests import Download from google.resumable_media.requests import RawDownload diff --git a/google/cloud/storage/client.py b/google/cloud/storage/client.py index b116cb011..4e0c51e70 100644 --- a/google/cloud/storage/client.py +++ b/google/cloud/storage/client.py @@ -25,7 +25,7 @@ from google.auth.credentials import AnonymousCredentials -from google import resumable_media # type: ignore +from google import resumable_media from google.api_core import page_iterator from google.cloud._helpers import _LocalStack, _NOW diff --git a/google/cloud/storage/py.typed b/google/cloud/storage/py.typed deleted file mode 100644 index 4a062998d..000000000 --- a/google/cloud/storage/py.typed +++ /dev/null @@ -1,2 +0,0 @@ -# Marker file for PEP 561. -# The google-cloud-storage package uses inline types. \ No newline at end of file diff --git a/google/cloud/storage/retry.py b/google/cloud/storage/retry.py index 9a6ec853b..fb7a8e4de 100644 --- a/google/cloud/storage/retry.py +++ b/google/cloud/storage/retry.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import requests # type: ignore -import requests.exceptions as requests_exceptions # type: ignore +import requests +import requests.exceptions as requests_exceptions from google.api_core import exceptions as api_exceptions from google.api_core import retry diff --git a/google/cloud/storage/version.py b/google/cloud/storage/version.py index bd0f8e5c7..b1be7d8c9 100644 --- a/google/cloud/storage/version.py +++ b/google/cloud/storage/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "2.2.0" +__version__ = "2.2.1" diff --git a/mypy.ini b/mypy.ini deleted file mode 100644 index 958e4b770..000000000 --- a/mypy.ini +++ /dev/null @@ -1,4 +0,0 @@ -[mypy] -python_version = 3.7 -namespace_packages = True -ignore_missing_imports = True \ No newline at end of file diff --git a/noxfile.py b/noxfile.py index a93e098f9..069a486c1 100644 --- a/noxfile.py +++ b/noxfile.py @@ -63,16 +63,6 @@ def blacken(session): ) -@nox.session(python=DEFAULT_PYTHON_VERSION) -def mypy(session): - """Verify type hints are mypy compatible.""" - session.install("-e", ".") - session.install( - "mypy", "types-setuptools", "types-requests", - ) - session.run("mypy", "-p", "google.cloud.storage", "--no-incremental") - - @nox.session(python=DEFAULT_PYTHON_VERSION) def lint_setup_py(session): """Verify that setup.py is valid (including RST check).""" diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index 8e7837b43..b95a96f88 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,4 +1,4 @@ google-cloud-pubsub==2.11.0 -google-cloud-storage==2.1.0 +google-cloud-storage==2.2.0 pandas==1.3.5; python_version == '3.7' pandas==1.4.0; python_version >= '3.8'