Wrap everything except tests in prusaerrors package

This allows for easier installation.
vladamatena · Jul 9, 2020 · 598d892 · 598d892
1 parent 6c46250
commit 598d892
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 __pycache__
 .coverage
 *.egg-info
+build
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -14,4 +14,4 @@ pylint:
   stage: test
   script:
     - python3 -m pylint --version
-    - python3 -m pylint --persistent=n --jobs 0 --max-line-length=120 shared sl1 tests
+    - python3 -m pylint --persistent=n --jobs 0 --max-line-length=120 prusaerrors
diff --git a/shared/__init__.py → prusaerrors/__init__.py b/shared/__init__.py → prusaerrors/__init__.py
diff --git a/prusaerrors/shared/__init__.py b/prusaerrors/shared/__init__.py
diff --git a/shared/codes.py → prusaerrors/shared/codes.py b/shared/codes.py → prusaerrors/shared/codes.py
@@ -69,7 +69,16 @@ def code(self) -> str:
 
         :return: Error code
         """
-        return f"#{self._printer.value:02}{self._category.value}{self._error:02}"
+        return f"#{self.raw_code}"
+
+    @property
+    def raw_code(self) -> str:
+        """
+        Get raw code without "#" at the beginning
+
+        :return: Error code without "#"
+        """
+        return f"{self._printer.value:02}{self._category.value}{self._error:02}"
 
     @property
     def printer(self) -> Printer:

diff --git a/prusaerrors/sl1/__init__.py b/prusaerrors/sl1/__init__.py
diff --git a/sl1/codes.py → prusaerrors/sl1/codes.py b/sl1/codes.py → prusaerrors/sl1/codes.py
@@ -9,7 +9,7 @@
 """
 
 
-from shared.codes import Code, Category, unique_codes, Codes, Printer
+from prusaerrors.shared.codes import Code, Category, unique_codes, Codes, Printer
 
 
 @unique_codes

diff --git a/setup.py b/setup.py
@@ -5,10 +5,10 @@
 from setuptools import setup, find_packages
 
 setup(
-    name="sl1-errors",
+    name="prusa_errors",
     version="2020.4.21",
     packages=find_packages(exclude=["tests"]),
-    url="https://gitlab.com/prusa3d/sl1/sl1-errors",
+    url="https://github.com/prusa3d/Prusa-Error-Codes",
     license="GNU General Public License v3 or later (GPLv3+)",
     classifiers=["License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)"],
 )
diff --git a/tests/test_exports.py b/tests/test_exports.py
@@ -10,7 +10,7 @@
 import unittest
 from io import StringIO
 
-from shared.codes import Codes, unique_codes, Printer, Code, Category
+from prusaerrors.shared.codes import unique_codes, Codes, Printer, Code, Category
 
 
 @unique_codes

diff --git a/tests/test_sl1.py b/tests/test_sl1.py
@@ -8,7 +8,7 @@
 
 import unittest
 
-from sl1.codes import Sl1Codes
+from prusaerrors.sl1.codes import Sl1Codes
 
 
 class TestErrors(unittest.TestCase):
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
     """
-    from shared.codes import Code, Category, unique_codes, Codes, Printer
+    from prusaerrors.shared.codes import Code, Category, unique_codes, Codes, Printer
     @unique_codes
@@ Expand Down @@