aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody Logan <clpo13@gmail.com>2023-09-26 13:17:18 -0700
committerCody Logan <clpo13@gmail.com>2023-09-26 13:19:06 -0700
commitcc78716425b184fef0e8cda191c9a0cce53d26a9 (patch)
treed50ac329d9f4e60bce19f257648dd453cbccf8ce
parent4d60641d84670f5d0174f872a550a05b5effa01a (diff)
downloadwikiget-cc78716425b184fef0e8cda191c9a0cce53d26a9.tar.gz
wikiget-cc78716425b184fef0e8cda191c9a0cce53d26a9.zip
Reorganize code into src layout
-rw-r--r--pyproject.toml39
-rw-r--r--src/wikiget/__init__.py (renamed from wikiget/__init__.py)0
-rw-r--r--src/wikiget/dl.py (renamed from wikiget/dl.py)0
-rw-r--r--src/wikiget/validations.py (renamed from wikiget/validations.py)0
-rw-r--r--src/wikiget/version.py (renamed from wikiget/version.py)0
-rw-r--r--src/wikiget/wikiget.py (renamed from wikiget/wikiget.py)0
-rw-r--r--tests/test_validations.py (renamed from test/test_validations.py)0
7 files changed, 15 insertions, 24 deletions
diff --git a/pyproject.toml b/pyproject.toml
index 87759c4..aab4b3f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,6 @@
[build-system]
-#requires = ["setuptools"]
-#build-backend = "setuptools.build_meta"
requires = ["hatchling"]
build-backend = "hatchling.build"
-#requires = ["pdm-backend"]
-#build-backend = "pdm.backend"
[project]
name = "wikiget"
@@ -51,21 +47,19 @@ Repository = "https://github.com/clpo13/wikiget"
[project.scripts]
wikiget = "wikiget.wikiget:main"
-[tool.setuptools.dynamic]
-version = {attr = "wikiget.version.__version__"}
-
[tool.hatch.version]
-path = "wikiget/version.py"
+path = "src/wikiget/version.py"
-#[tool.pdm]
-#version = { source = "file", path = "wikiget/version.py" }
+[tool.pytest.ini_options]
+addopts = [
+ "--import-mode=importlib",
+]
+testpaths = ["tests"]
-#[tool.pytest.ini_options]
-#addopts = [
-# "--import-mode=importlib",
-# "--cov=wikiget",
-#]
-#testpaths = ["test"]
+[tool.hatch.build.targets.sdist]
+exclude = [
+ "/.github",
+]
[tool.hatch.envs.default]
dependencies = [
@@ -73,8 +67,8 @@ dependencies = [
"pytest",
]
[tool.hatch.envs.default.scripts]
-test = "pytest {args:test}"
-test-cov = "coverage run -m pytest {args:test}"
+test = "python -m pytest {args}"
+test-cov = "coverage run -m pytest {args}"
cov-report = [
"- coverage combine",
"coverage report",
@@ -95,7 +89,7 @@ dependencies = [
"ruff",
]
[tool.hatch.envs.lint.scripts]
-typing = "mypy --install-types --non-interactive {args:wikiget test}"
+typing = "mypy --install-types --non-interactive {args:src/wikiget tests}"
style = [
"ruff {args:.}",
"black --check --diff {args:.}",
@@ -169,19 +163,16 @@ ban-relative-imports = "all"
[tool.ruff.per-file-ignores]
# Tests can use magic values, assertions, and relative imports
-"test/**/*" = ["PLR2004", "S101", "TID252"]
+"tests/**/*" = ["PLR2004", "S101", "TID252"]
[tool.coverage.run]
source_pkgs = ["wikiget"]
branch = true
parallel = true
-omit = [
- "wikiget/version.py",
-]
[tool.coverage.paths]
wikiget = ["wikiget"]
-tests = ["test"]
+tests = ["tests"]
[tool.coverage.report]
exclude_lines = [
diff --git a/wikiget/__init__.py b/src/wikiget/__init__.py
index b68b0ec..b68b0ec 100644
--- a/wikiget/__init__.py
+++ b/src/wikiget/__init__.py
diff --git a/wikiget/dl.py b/src/wikiget/dl.py
index 949f09e..949f09e 100644
--- a/wikiget/dl.py
+++ b/src/wikiget/dl.py
diff --git a/wikiget/validations.py b/src/wikiget/validations.py
index dc70df4..dc70df4 100644
--- a/wikiget/validations.py
+++ b/src/wikiget/validations.py
diff --git a/wikiget/version.py b/src/wikiget/version.py
index dd9b22c..dd9b22c 100644
--- a/wikiget/version.py
+++ b/src/wikiget/version.py
diff --git a/wikiget/wikiget.py b/src/wikiget/wikiget.py
index ba36766..ba36766 100644
--- a/wikiget/wikiget.py
+++ b/src/wikiget/wikiget.py
diff --git a/test/test_validations.py b/tests/test_validations.py
index 1abd96a..1abd96a 100644
--- a/test/test_validations.py
+++ b/tests/test_validations.py