From f406942aa02683eff16b9d37d3e8bdb654eeb551 Mon Sep 17 00:00:00 2001
From: David Douard <david.douard@sdfa3.org>
Date: Fri, 29 Mar 2024 14:50:21 +0100
Subject: [PATCH] Apply swh-py-template v0.2.0
---
.copier-answers.yml | 2 +-
.pre-commit-config.yaml | 10 ++++++++++
tox.ini | 9 +++------
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/.copier-answers.yml b/.copier-answers.yml
index f871bc0..ecd49f6 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 datastore scrubber
distribution_name: swh-scrubber
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4e52b12..8e227e6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -45,3 +45,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/tox.ini b/tox.ini
index 4d64639..9a8c8bf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ envlist =
py3
[testenv]
+usedevelop = true
passenv =
JAVA_HOME
SWH_CASSANDRA_LOG
@@ -16,14 +17,10 @@ deps =
pytest-cov
commands =
pytest --doctest-modules \
- --rootdir {envsitepackagesdir} \
- --cov={envsitepackagesdir}/swh/scrubber \
+ --cov=swh/scrubber \
--cov-branch \
- {envsitepackagesdir}/swh/scrubber \
+ swh/scrubber \
{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