Page MenuHomeSoftware Heritage
Files F7123894

D2022.diff
No OneTemporary
Actions

D2022.diff
View Options

diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
dist
version.txt
.tox
+.mypy_cache/
diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,3 +2,4 @@
include requirements.txt
include requirements-swh.txt
include version.txt
+recursive-include swh py.typed
diff --git a/mypy.ini b/mypy.ini
new file mode 100644
--- /dev/null
+++ b/mypy.ini
@@ -0,0 +1,21 @@
+[mypy]
+namespace_packages = True
+warn_unused_ignores = True
+
+
+# 3rd party libraries without stubs (yet)
+
+[mypy-azure.*]
+ignore_missing_imports = True
+
+[mypy-libcloud.*]
+ignore_missing_imports = True
+
+[mypy-pkg_resources.*]
+ignore_missing_imports = True
+
+[mypy-pytest.*]
+ignore_missing_imports = True
+
+[mypy-rados.*]
+ignore_missing_imports = True
diff --git a/swh/__init__.py b/swh/__init__.py
--- a/swh/__init__.py
+++ b/swh/__init__.py
@@ -1 +1,4 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+from typing import Iterable
+
+__path__ = __import__('pkgutil').extend_path(__path__,
+ __name__) # type: Iterable[str]
diff --git a/swh/objstorage/__init__.py b/swh/objstorage/__init__.py
--- a/swh/objstorage/__init__.py
+++ b/swh/objstorage/__init__.py
@@ -13,11 +13,12 @@
from swh.objstorage.backends.seaweed import WeedObjStorage
from swh.objstorage.backends.generator import RandomGeneratorObjStorage
+from typing import Callable, Dict, Union
__all__ = ['get_objstorage', 'ObjStorage']
-_STORAGE_CLASSES = {
+_STORAGE_CLASSES: Dict[str, Union[type, Callable[..., type]]] = {
'pathslicing': PathSlicingObjStorage,
'remote': RemoteObjStorage,
'memory': InMemoryObjStorage,
diff --git a/swh/objstorage/api/server.py b/swh/objstorage/api/server.py
--- a/swh/objstorage/api/server.py
+++ b/swh/objstorage/api/server.py
@@ -6,6 +6,7 @@
import os
import aiohttp.web
+import json
from swh.core.config import read as config_read
from swh.core.api.asynchronous import (RPCServerApp, decode_request,
diff --git a/swh/objstorage/py.typed b/swh/objstorage/py.typed
new file mode 100644
--- /dev/null
+++ b/swh/objstorage/py.typed
@@ -0,0 +1 @@
+# Marker file for PEP 561.
diff --git a/swh/objstorage/tests/test_objstorage_azure.py b/swh/objstorage/tests/test_objstorage_azure.py
--- a/swh/objstorage/tests/test_objstorage_azure.py
+++ b/swh/objstorage/tests/test_objstorage_azure.py
@@ -7,6 +7,8 @@
from collections import defaultdict
from unittest.mock import patch
+from typing import Any, Dict
+
from azure.common import AzureMissingResourceHttpError
from swh.model.hashutil import hash_to_hex
from swh.objstorage import get_objstorage
@@ -25,7 +27,7 @@
"""Mock internal azure library which AzureCloudObjStorage depends upon.
"""
- data = {}
+ data = {} # type: Dict[str, Any]
def __init__(self, account_name, account_key, **kwargs):
# do not care for the account_name and the api_secret_key here
diff --git a/tox.ini b/tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist=flake8,py3
+envlist=flake8,py3,mypy
[testenv]
deps =
@@ -14,3 +14,11 @@
flake8
commands =
{envpython} -m flake8
+
+[testenv:mypy]
+skip_install = true
+deps =
+ .[testing]
+ mypy
+commands =
+ mypy swh

File Metadata

Mime Type
text/plain
Expires
Dec 20 2024, 5:51 AM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3219630

Event Timeline

About · Developer information · Legal