Debug pyproject, change test directory name + doc

cnescatlab · Mar 20, 2023 · cc0200b · cc0200b
1 parent 64a42f9
commit cc0200b
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@ Use arguments to filter what you need.
 
 ### Usage example with the pip package
 ```
-polyspace-report2excel p2e input.html output-folder/
+p2e input.html output-folder/
 
-polyspace-report2excel p2e input.rtf ouput-folder/ --runtime
+p2e input.rtf ouput-folder/ --runtime
 ```
 
 ### Usage example by cloning the repository
@@ -34,9 +34,9 @@ If you don't want to install the package `polyspace-report2excel`, first install
 
 Then, you can run:
 ``` 
-python export-all.py input.html ouput-folder/
+python main.py input.html ouput-folder/
 
-python export-all.py input.rtf ouput-folder/ --runtime
+python main.py input.rtf ouput-folder/ --runtime
 ```
 ## Arguments
 - `--misra` will export misra report only.

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 # https://pypi.org/project/polyspace-report2excel/
 name = "polyspace-report2excel"
-version = "1.0rc2" 
+version = "1.0rc3" 
 description = "read a polyspace report and export misra or run-time results"
 readme = "README.md"
 requires-python = ">=3"
@@ -35,11 +35,6 @@ dependencies = [
 [project.scripts]
 p2e = "p2e:main"
 
-
-[tool.setuptools]
-package-data = {}
-py-modules = []
-
 [build-system]
 requires = ["setuptools>=61.0", "wheel"]
 build-backend = "setuptools.build_meta"
diff --git a/src/p2e/RTFReader.py b/src/p2e/RTFReader.py
@@ -10,7 +10,7 @@
 """
 
 # __________________________ IMPORT __________________________
-import HTMLReader
+from p2e import HTMLReader
 from striprtf.striprtf import rtf_to_text
 
 # ________________________ CONSTANTES ________________________

diff --git a/src/p2e/__init__.py b/src/p2e/__init__.py
@@ -13,9 +13,5 @@
 """
 
 def main():
-    import sys
-    import main
-    sys.exit(p2e.main())
-
-if __name__ == "__main__":
-    main()
+    import p2e.main
+    p2e.main.main()
diff --git a/src/p2e/main.py b/src/p2e/main.py
@@ -8,9 +8,9 @@
 import sys
 import os
 
-from exportcsv import Exportcsv
-from exportxlsx import Exportxlsx
-from HTMLReader import HTMLReader
+from p2e.exportcsv import Exportcsv
+from p2e.exportxlsx import Exportxlsx
+from p2e.HTMLReader import HTMLReader
 
 
 def main():
@@ -67,7 +67,7 @@ def main():
 
     # Lecture du rapport Polyspace
     if ".rtf" in input_file:
-        from RTFReader import RTFReader
+        from p2e.RTFReader import RTFReader
         if not (misra or runtime):
             print("With  rtf file you should precise if you want to read MISRA or Runtime!")
             exit()

diff --git a/test/__init__.py → tests/__init__.py b/test/__init__.py → tests/__init__.py
diff --git a/test/test_HTMLReader.py → tests/test_HTMLReader.py b/test/test_HTMLReader.py → tests/test_HTMLReader.py
diff --git a/test/test_csvexporter.py → tests/test_csvexporter.py b/test/test_csvexporter.py → tests/test_csvexporter.py
diff --git a/test/test_xlsxexporter.py → tests/test_xlsxexporter.py b/test/test_xlsxexporter.py → tests/test_xlsxexporter.py