Skip to content

Commit

Permalink
fix: remove py.typed marker file for PEP 561 (#735)
Browse files Browse the repository at this point in the history
Reverts #716

Fixes #734
  • Loading branch information
cojenco committed Mar 15, 2022
1 parent bc99bd1 commit f77d2f7
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 27 deletions.
2 changes: 1 addition & 1 deletion google/__init__.py
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

try:
import pkg_resources # type: ignore
import pkg_resources

pkg_resources.declare_namespace(__name__)
except ImportError:
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/__init__.py
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

try:
import pkg_resources # type: ignore
import pkg_resources

pkg_resources.declare_namespace(__name__)
except ImportError:
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/storage/_helpers.py
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions google/cloud/storage/_http.py
Expand Up @@ -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__

Expand Down
2 changes: 1 addition & 1 deletion google/cloud/storage/acl.py
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/storage/batch.py
Expand Up @@ -23,7 +23,7 @@
import io
import json

import requests # type: ignore
import requests

from google.cloud import _helpers
from google.cloud import exceptions
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/storage/blob.py
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/storage/client.py
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions google/cloud/storage/py.typed

This file was deleted.

4 changes: 2 additions & 2 deletions google/cloud/storage/retry.py
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions mypy.ini

This file was deleted.

10 changes: 0 additions & 10 deletions noxfile.py
Expand Up @@ -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)."""
Expand Down

0 comments on commit f77d2f7

Please sign in to comment.