Page MenuHomeSoftware Heritage
Files F7066596

D6221.diff
No OneTemporary
Actions

D6221.diff
View Options

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -26,16 +26,6 @@
language: system
types: [python]
-- repo: https://github.com/PyCQA/isort
- rev: 5.5.2
- hooks:
- - id: isort
-
-- repo: https://github.com/python/black
- rev: 19.10b0
- hooks:
- - id: black
-
# unfortunately, we are far from being able to enable this...
# - repo: https://github.com/PyCQA/pydocstyle.git
# rev: 4.0.0
@@ -47,8 +37,12 @@
# language: python
# types: [python]
-#- repo: https://github.com/asottile/blacken-docs
-# rev: v1.0.0-1
-# hooks:
-# - id: blacken-docs
-# additional_dependencies: [black==19.3b0]
+- repo: https://github.com/PyCQA/isort
+ rev: 5.5.2
+ hooks:
+ - id: isort
+
+- repo: https://github.com/python/black
+ rev: 19.10b0
+ hooks:
+ - id: black
diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -2,3 +2,4 @@
swh.core[http] >= 0.3
swh.journal
swh.model >= 1.0.0
+swh.storage
diff --git a/swh/__init__.py b/swh/__init__.py
--- a/swh/__init__.py
+++ b/swh/__init__.py
@@ -1,4 +1,4 @@
from pkgutil import extend_path
-from typing import Iterable
+from typing import List
-__path__ = extend_path(__path__, __name__) # type: Iterable[str]
+__path__: List[str] = extend_path(__path__, __name__)
diff --git a/tox.ini b/tox.ini
new file mode 100644
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,73 @@
+[tox]
+envlist=black,flake8,mypy,py3
+
+[testenv]
+extras =
+ testing
+deps =
+ pytest-cov
+commands =
+ pytest --doctest-modules \
+ {envsitepackagesdir}/swh/dataset \
+ --cov={envsitepackagesdir}/swh/dataset \
+ --cov-branch {posargs}
+
+[testenv:black]
+skip_install = true
+deps =
+ black==19.10b0
+commands =
+ {envpython} -m black --check swh
+
+[testenv:flake8]
+skip_install = true
+deps =
+ flake8
+commands =
+ {envpython} -m flake8
+
+[testenv:mypy]
+extras =
+ testing
+deps =
+ mypy
+commands =
+ mypy swh
+
+# build documentation outside swh-environment using the current
+# git HEAD of swh-docs, is executed on CI for each diff to prevent
+# breaking doc build
+[testenv:sphinx]
+whitelist_externals = make
+usedevelop = true
+extras =
+ testing
+deps =
+ # fetch and install swh-docs in develop mode
+ -e git+https://forge.softwareheritage.org/source/swh-docs#egg=swh.docs
+
+setenv =
+ SWH_PACKAGE_DOC_TOX_BUILD = 1
+ # turn warnings into errors
+ SPHINXOPTS = -W
+commands =
+ make -I ../.tox/sphinx/src/swh-docs/swh/ -C docs
+
+
+# build documentation only inside swh-environment using local state
+# of swh-docs package
+[testenv:sphinx-dev]
+whitelist_externals = make
+usedevelop = true
+extras =
+ testing
+deps =
+ # install swh-docs in develop mode
+ -e ../swh-docs
+
+setenv =
+ SWH_PACKAGE_DOC_TOX_BUILD = 1
+ # turn warnings into errors
+ SPHINXOPTS = -W
+commands =
+ make -I ../.tox/sphinx-dev/src/swh-docs/swh/ -C docs

File Metadata

Mime Type
text/plain
Expires
Nov 5 2024, 3:41 PM (12 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3220755

Event Timeline

About · Developer information · Legal