move tests folder in packages folder + rewrite pyproject.toml to work…

… with pdm-backend + add tests' settings for vscode
nennigb · Oct 9, 2024 · d3c7c31 · d3c7c31
1 parent 91f263b
commit d3c7c31
Show file tree

Hide file tree

Showing 29 changed files with 67 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,12 @@
 # Byte-code
 __pycache__/
+**/__pycache__/
 *.py[cod]
 
 # Distribution / packaging
 *.egg-info/
 build/
+dist/
 
 # pdoc
 html/
@@ -40,3 +42,8 @@ html/
 *.mtc1
 *.out
 *.synctex*
+
+# specific amc2moodle artifacts
+**/xmlclean*
+**/*_magic.tex
+output_tests/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,11 @@
+{
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        "./amc2moodle/tests",
+        "-p",
+        "test_*.py"
+    ],
+    "python.testing.pytestEnabled": false,
+    "python.testing.unittestEnabled": true
+}
diff --git a/tests/__init__.py → amc2moodle/tests/__init__.py b/tests/__init__.py → amc2moodle/tests/__init__.py
diff --git a/tests/payload_test_amc2moodle/4.png → ...oodle/tests/payload_test_amc2moodle/4.png b/tests/payload_test_amc2moodle/4.png → ...oodle/tests/payload_test_amc2moodle/4.png
diff --git a/...load_test_amc2moodle/Figures/other/4r.png → ...load_test_amc2moodle/Figures/other/4r.png b/...load_test_amc2moodle/Figures/other/4r.png → ...load_test_amc2moodle/Figures/other/4r.png
diff --git a/...c2moodle/Figures/other/schema_interpL.png → ...c2moodle/Figures/other/schema_interpL.png b/...c2moodle/Figures/other/schema_interpL.png → ...c2moodle/Figures/other/schema_interpL.png
diff --git a/...load_test_amc2moodle/Figures/tinymonk.pdf → ...load_test_amc2moodle/Figures/tinymonk.pdf b/...load_test_amc2moodle/Figures/tinymonk.pdf → ...load_test_amc2moodle/Figures/tinymonk.pdf
diff --git a/tests/payload_test_amc2moodle/QCM.pdf → ...dle/tests/payload_test_amc2moodle/QCM.pdf b/tests/payload_test_amc2moodle/QCM.pdf → ...dle/tests/payload_test_amc2moodle/QCM.pdf
diff --git a/tests/payload_test_amc2moodle/QCM.tex → ...dle/tests/payload_test_amc2moodle/QCM.tex b/tests/payload_test_amc2moodle/QCM.tex → ...dle/tests/payload_test_amc2moodle/QCM.tex
diff --git a/tests/payload_test_amc2moodle/QCM.xml → ...dle/tests/payload_test_amc2moodle/QCM.xml b/tests/payload_test_amc2moodle/QCM.xml → ...dle/tests/payload_test_amc2moodle/QCM.xml
diff --git a/...s/payload_test_amc2moodle/QCM_wo-tikz.tex → ...s/payload_test_amc2moodle/QCM_wo-tikz.tex b/...s/payload_test_amc2moodle/QCM_wo-tikz.tex → ...s/payload_test_amc2moodle/QCM_wo-tikz.tex
diff --git a/...s/payload_test_amc2moodle/QCM_wo-tikz.xml → ...s/payload_test_amc2moodle/QCM_wo-tikz.xml b/...s/payload_test_amc2moodle/QCM_wo-tikz.xml → ...s/payload_test_amc2moodle/QCM_wo-tikz.xml
diff --git a/tests/payload_test_amc2moodle/cleaning.tex → ...ests/payload_test_amc2moodle/cleaning.tex b/tests/payload_test_amc2moodle/cleaning.tex → ...ests/payload_test_amc2moodle/cleaning.tex
diff --git a/tests/payload_test_amc2moodle/cleaning.xml → ...ests/payload_test_amc2moodle/cleaning.xml b/tests/payload_test_amc2moodle/cleaning.xml → ...ests/payload_test_amc2moodle/cleaning.xml
diff --git a/...s/payload_test_amc2moodle/common-bank.tex → ...s/payload_test_amc2moodle/common-bank.tex b/...s/payload_test_amc2moodle/common-bank.tex → ...s/payload_test_amc2moodle/common-bank.tex
diff --git a/tests/payload_test_amc2moodle/element.tex → ...tests/payload_test_amc2moodle/element.tex b/tests/payload_test_amc2moodle/element.tex → ...tests/payload_test_amc2moodle/element.tex
diff --git a/...payload_test_amc2moodle/includestyles.tex → ...payload_test_amc2moodle/includestyles.tex b/...payload_test_amc2moodle/includestyles.tex → ...payload_test_amc2moodle/includestyles.tex
diff --git a/tests/payload_test_amc2moodle/numerical.tex → ...sts/payload_test_amc2moodle/numerical.tex b/tests/payload_test_amc2moodle/numerical.tex → ...sts/payload_test_amc2moodle/numerical.tex
diff --git a/tests/payload_test_amc2moodle/numerical.xml → ...sts/payload_test_amc2moodle/numerical.xml b/tests/payload_test_amc2moodle/numerical.xml → ...sts/payload_test_amc2moodle/numerical.xml
diff --git a/tests/payload_test_amc2moodle/tikz.tex → ...le/tests/payload_test_amc2moodle/tikz.tex b/tests/payload_test_amc2moodle/tikz.tex → ...le/tests/payload_test_amc2moodle/tikz.tex
diff --git a/...ad_test_moodle2amc/automultiplechoice.sty → ...ad_test_moodle2amc/automultiplechoice.sty b/...ad_test_moodle2amc/automultiplechoice.sty → ...ad_test_moodle2amc/automultiplechoice.sty
diff --git a/...d_test_moodle2amc/moodle-bank-exemple.pdf → ...d_test_moodle2amc/moodle-bank-exemple.pdf b/...d_test_moodle2amc/moodle-bank-exemple.pdf → ...d_test_moodle2amc/moodle-bank-exemple.pdf
diff --git a/...d_test_moodle2amc/moodle-bank-exemple.tex → ...d_test_moodle2amc/moodle-bank-exemple.tex b/...d_test_moodle2amc/moodle-bank-exemple.tex → ...d_test_moodle2amc/moodle-bank-exemple.tex
diff --git a/...d_test_moodle2amc/moodle-bank-exemple.xml → ...d_test_moodle2amc/moodle-bank-exemple.xml b/...d_test_moodle2amc/moodle-bank-exemple.xml → ...d_test_moodle2amc/moodle-bank-exemple.xml
diff --git a/tests/test_amc2moodle.py → amc2moodle/tests/test_amc2moodle.py b/tests/test_amc2moodle.py → amc2moodle/tests/test_amc2moodle.py
diff --git a/tests/test_moodle2amc.py → amc2moodle/tests/test_moodle2amc.py b/tests/test_moodle2amc.py → amc2moodle/tests/test_moodle2amc.py
diff --git a/tests/test_utils_calculatedParser.py → ...odle/tests/test_utils_calculatedParser.py b/tests/test_utils_calculatedParser.py → ...odle/tests/test_utils_calculatedParser.py
diff --git a/tests/test_utils_text.py → amc2moodle/tests/test_utils_text.py b/tests/test_utils_text.py → amc2moodle/tests/test_utils_text.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
 
 [project]
 name = "amc2moodle"
@@ -35,11 +35,54 @@ Issues = "https://github.com/nennigb/amc2moodle/issues"
 amc2moodle = "amc2moodle.amc2moodle.bin.amc2moodle:run"
 moodle2amc = "amc2moodle.moodle2amc.bin.moodle2amc:run"
 
-[tool.setuptools.dynamic]
-version = {attr = "amc2moodle.__version__"}
+[tool.pdm.version]
+source = "file"
+path = "amc2moodle/_version.py"
 
-[tool.setuptools]
-package-dir = { "amc2moodle" = "amc2moodle", "amc2moodle.tests" = "tests"}
+[tool.pdm.build]
+source-includes = [
+    "LICENSE",
+    "README.md"
+]
+includes = [
+    "amc2moodle/",
+    "amc2moodle/moodle2amc/README.md",
+    "amc2moodle/amc2moodle/README.md",
+    "amc2moodle/amc2moodle/bin/amc2moodle",
+    "amc2moodle/amc2moodle/*.xslt",
+    "amc2moodle/amc2moodle/*sty.ltxml",
+    "amc2moodle/moodle2amc/bin/moodle2amc",
+    "amc2moodle/moodle2amc/html2tex.xslt",
+    "amc2moodle/moodle2amc/struc2tex.xslt",
+    "amc2moodle/tests/payload_test_amc2moodle/Figures/*",
+    "amc2moodle/tests/payload_test_amc2moodle/Figures/other/*",
+    "amc2moodle/tests/payload_test_amc2moodle/4.png",
+    "amc2moodle/tests/payload_test_amc2moodle/QCM.pdf",
+    "amc2moodle/tests/payload_test_amc2moodle/QCM.tex",
+    "amc2moodle/tests/payload_test_amc2moodle/QCM.xml",
+    "amc2moodle/tests/payload_test_amc2moodle/QCM_wo-tikz.tex",
+    "amc2moodle/tests/payload_test_amc2moodle/QCM_wo-tikz.xml",
+    "amc2moodle/tests/payload_test_amc2moodle/tikz.tex",
+    "amc2moodle/tests/payload_test_amc2moodle/common-bank.tex",
+    "amc2moodle/tests/payload_test_amc2moodle/numerical.tex",
+    "amc2moodle/tests/payload_test_amc2moodle/numerical.xml",
+    "amc2moodle/tests/payload_test_amc2moodle/cleaning.tex",
+    "amc2moodle/tests/payload_test_amc2moodle/cleaning.xml",
+    "amc2moodle/tests/payload_test_amc2moodle/element.tex",
+    "amc2moodle/tests/payload_test_amc2moodle/includestyles.tex",    
+    "amc2moodle/tests/payload_test_moodle2amc/automultiplechoice.sty",
+    "amc2moodle/tests/payload_test_moodle2amc/moodle-bank-exemple.xml",
+    "amc2moodle/tests/payload_test_moodle2amc/moodle-bank-exemple.tex",
+    "amc2moodle/tests/payload_test_moodle2amc/moodle-bank-exemple.pdf"
+]
+excludes = [
+    "**/*_magic.tex",
+    "**/xmlclean*",
+    "**/__pycache__"
+]
+
+# [tool.setuptools]
+# package-dir = { "amc2moodle" = "amc2moodle", "amc2moodle.tests" = "tests"}
 
 [tool.coverage.run]
 branch = true