From 83771269b9472a1ffecfaab797dd51a898be7205 Mon Sep 17 00:00:00 2001 From: David Douard <david.douard@sdfa3.org> Date: Fri, 29 Mar 2024 14:52:09 +0100 Subject: [PATCH] Apply swh-py-template v0.2.0 --- .copier-answers.yml | 2 +- .pre-commit-config.yaml | 11 ++++++++++- pytest.ini | 2 +- requirements-test.txt | 2 +- tox.ini | 9 +++------ 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index db4dfe0..1fae231 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.1.6 +_commit: v0.2.0 _src_path: https://gitlab.softwareheritage.org/swh/devel/swh-py-template.git description: Software Heritage search service distribution_name: swh-search diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8957bec..9d45821 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,4 +41,13 @@ repos: pass_filenames: false language: system types: [python] - + - id: twine-check + name: twine check + description: call twine check when pushing an annotated release tag + entry: bash -c "ref=$(git describe) && + [[ $ref =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && + (python3 -m build --sdist && twine check $(ls -t dist/* | head -1)) || true" + pass_filenames: false + stages: [pre-push] + language: python + additional_dependencies: [twine, build] diff --git a/pytest.ini b/pytest.ini index 61aeeba..fe398a0 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,4 +1,4 @@ [pytest] norecursedirs = build docs .* asyncio_mode = strict -addopts = "--import-mode=importlib" +consider_namespace_packages = true diff --git a/requirements-test.txt b/requirements-test.txt index 199473d..958480a 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,5 @@ confluent-kafka -pytest +pytest >= 8.1 pytest-mock swh.core[testing] types-click diff --git a/tox.ini b/tox.ini index 29f188d..f3dcced 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,7 @@ envlist = py3 [testenv] +usedevelop = true passenv = YARN extras = testing @@ -14,14 +15,10 @@ deps = pytest-cov commands = pytest --doctest-modules \ - --rootdir {envsitepackagesdir} \ - --cov={envsitepackagesdir}/swh/search \ + --cov=swh/search \ --cov-branch \ - {envsitepackagesdir}/swh/search \ + swh/search \ {posargs} -# --rootdir (with --import-mode from pytest.ini) are required to make tests -# that depends on the test file to be a proper submodule of the swh namespace -# after migration to PEP420 (implicit namespace). [testenv:black] skip_install = true -- GitLab