aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2022-04-22 15:32:59 +0200
committerWojtek Kosior <koszko@koszko.org>2022-04-22 15:58:51 +0200
commitfbb397727868d676c8e6591ab07f02e97fa09118 (patch)
tree1423b5245db6e87a5abd257c8a251c4bc743cbc9
parentf08583aa2a144b111c5ba17570f904109a41cbfc (diff)
downloadhydrilla-builder-fbb397727868d676c8e6591ab07f02e97fa09118.tar.gz
hydrilla-builder-fbb397727868d676c8e6591ab07f02e97fa09118.zip
use pyproject.toml for pytest configuration and move all tests to tests/ directory
-rw-r--r--.gitmodules2
-rw-r--r--MANIFEST.in6
-rw-r--r--pyproject.toml7
-rw-r--r--src/conftest.py5
m---------tests/source-package-example (renamed from src/test/source-package-example)0
-rw-r--r--tests/test_hydrilla_builder.py (renamed from src/test/test_hydrilla_builder.py)0
6 files changed, 11 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
index 3bd8177..6e47d90 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,5 +8,5 @@
path = src/hydrilla/schemas
url = ../hydrilla-json-schemas
[submodule "src/test/source-package-example"]
- path = src/test/source-package-example
+ path = tests/source-package-example
url = ../hydrilla-source-package-example
diff --git a/MANIFEST.in b/MANIFEST.in
index a68df62..b80abf7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@
include src/hydrilla/schemas/*.schema.json*
include src/hydrilla/builder/locales/*/LC_MESSAGES/hydrilla-messages.po
-include src/test/source-package-example/*
-include src/test/source-package-example/LICENSES/*
-include src/test/source-package-example/.reuse/*
+include tests/source-package-example/*
+include tests/source-package-example/LICENSES/*
+include tests/source-package-example/.reuse/*
global-exclude .git .gitignore .gitmodules
diff --git a/pyproject.toml b/pyproject.toml
index cffd3dd..a428c52 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,3 +10,10 @@ requires = ["setuptools>=45", "wheel", "setuptools_scm>=5.0", "babel"]
[tool.setuptools_scm]
write_to = "src/hydrilla/builder/_version.py"
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+addopts = "-ra -q"
+testpaths = [
+ "tests"
+]
diff --git a/src/conftest.py b/src/conftest.py
deleted file mode 100644
index d382ead..0000000
--- a/src/conftest.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: CC0-1.0
-
-# Copyright (C) 2022 Wojtek Kosior <koszko@koszko.org>
-#
-# Available under the terms of Creative Commons Zero v1.0 Universal.
diff --git a/src/test/source-package-example b/tests/source-package-example
-Subproject 92a4d31c659b2336e5e188877d1ce6bfad2fa31
+Subproject 92a4d31c659b2336e5e188877d1ce6bfad2fa31
diff --git a/src/test/test_hydrilla_builder.py b/tests/test_hydrilla_builder.py
index 851b5cd..851b5cd 100644
--- a/src/test/test_hydrilla_builder.py
+++ b/tests/test_hydrilla_builder.py