diff --git a/examples/VSR53DL_example.py b/examples/vsr53dl.py similarity index 82% rename from examples/VSR53DL_example.py rename to examples/vsr53dl.py index dec8859..552e62b 100644 --- a/examples/VSR53DL_example.py +++ b/examples/vsr53dl.py @@ -2,13 +2,13 @@ import logging -from pyvsr53dl.DisplayModes import Orientation as Orientation -from pyvsr53dl.DisplayModes import Units as Units -from pyvsr53dl.logger import log -from pyvsr53dl.vsr53dl import VSR53DL +from vsr53.DisplayModes import Orientation as Orientation +from vsr53.DisplayModes import Units as Units +from vsr53.logger import log +from vsr53.vsr53dl import VSR53DL if __name__ == "__main__": - from pyvsr53dl.sys import dev_tty + from vsr53.sys import dev_tty log.setLevel(logging.INFO) sensor_address = 1 diff --git a/pyproject.toml b/pyproject.toml index 8a4084a..eb5c239 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ requires = [ build-backend = "hatchling.build" [project] -name = "pyvsr53dl" +name = "vsr53" description = "Python Library to interface with Thyracont's VSR53 vacuum gauges" authors = [ { name = "Oscar Martínez", email = "omartinez@ifae.es" }, @@ -34,7 +34,7 @@ dynamic = [ source = "vcs" [tool.hatch.build.hooks.vcs] -version-file = "src/pyvsr53dl/_version.py" +version-file = "src/vsr53/_version.py" [tool.hatch.metadata] allow-direct-references = true @@ -56,9 +56,9 @@ test = [ ] [project.urls] -"Download" = "https://github.com/lobis/pyvsr53dl/releases" -"Homepage" = "https://github.com/lobis/pyvsr53dl" -"Bug Tracker" = "https://github.com/lobis/pyvsr53dl/issues" +"Download" = "https://github.com/lobis/vsr53/releases" +"Homepage" = "https://github.com/lobis/vsr53" +"Bug Tracker" = "https://github.com/lobis/vsr53/issues" [tool.ruff] src = ["src"] diff --git a/src/pyvsr53dl/AccessCodes.py b/src/vsr53/AccessCodes.py similarity index 100% rename from src/pyvsr53dl/AccessCodes.py rename to src/vsr53/AccessCodes.py diff --git a/src/pyvsr53dl/Commands.py b/src/vsr53/Commands.py similarity index 100% rename from src/pyvsr53dl/Commands.py rename to src/vsr53/Commands.py diff --git a/src/pyvsr53dl/DisplayModes.py b/src/vsr53/DisplayModes.py similarity index 100% rename from src/pyvsr53dl/DisplayModes.py rename to src/vsr53/DisplayModes.py diff --git a/src/pyvsr53dl/ErrorMessages.py b/src/vsr53/ErrorMessages.py similarity index 100% rename from src/pyvsr53dl/ErrorMessages.py rename to src/vsr53/ErrorMessages.py diff --git a/src/pyvsr53dl/ThyrCommPackage.py b/src/vsr53/ThyrCommPackage.py similarity index 95% rename from src/pyvsr53dl/ThyrCommPackage.py rename to src/vsr53/ThyrCommPackage.py index da6cf9f..bdeb5ec 100644 --- a/src/pyvsr53dl/ThyrCommPackage.py +++ b/src/vsr53/ThyrCommPackage.py @@ -1,9 +1,9 @@ from __future__ import annotations -from pyvsr53dl.AccessCodes import AccessCode as AC -from pyvsr53dl.Commands import Commands as CMD -from pyvsr53dl.DisplayModes import Units as Units -from pyvsr53dl.logger import log as log +from vsr53.AccessCodes import AccessCode as AC +from vsr53.Commands import Commands as CMD +from vsr53.DisplayModes import Units as Units +from vsr53.logger import log as log # from DISPLAY import Orientation as Orientation diff --git a/src/pyvsr53dl/__init__.py b/src/vsr53/__init__.py similarity index 100% rename from src/pyvsr53dl/__init__.py rename to src/vsr53/__init__.py diff --git a/src/pyvsr53dl/logger.py b/src/vsr53/logger.py similarity index 100% rename from src/pyvsr53dl/logger.py rename to src/vsr53/logger.py diff --git a/src/pyvsr53dl/sys.py b/src/vsr53/sys.py similarity index 100% rename from src/pyvsr53dl/sys.py rename to src/vsr53/sys.py diff --git a/src/pyvsr53dl/vsr53dl.py b/src/vsr53/vsr53dl.py similarity index 97% rename from src/pyvsr53dl/vsr53dl.py rename to src/vsr53/vsr53dl.py index 635e39a..e8fac96 100644 --- a/src/pyvsr53dl/vsr53dl.py +++ b/src/vsr53/vsr53dl.py @@ -6,13 +6,13 @@ import serial import serial.rs485 -from pyvsr53dl import ErrorMessages -from pyvsr53dl.AccessCodes import AccessCode as AC -from pyvsr53dl.Commands import Commands as CMD -from pyvsr53dl.DisplayModes import Orientation as Orientation -from pyvsr53dl.DisplayModes import Units as Units -from pyvsr53dl.logger import log -from pyvsr53dl.ThyrCommPackage import ThyrCommPackage +from vsr53 import ErrorMessages +from vsr53.AccessCodes import AccessCode as AC +from vsr53.Commands import Commands as CMD +from vsr53.DisplayModes import Orientation as Orientation +from vsr53.DisplayModes import Units as Units +from vsr53.logger import log +from vsr53.ThyrCommPackage import ThyrCommPackage class VSR53(ABC): @@ -402,7 +402,7 @@ def __init__(self, device_label: str, address: int = 1, baudrate: int = 9600): if __name__ == "__main__": import logging - from pyvsr53dl.sys import dev_tty + from vsr53.sys import dev_tty log.setLevel(logging.INFO) diff --git a/test/StressTest.py b/test/StressTest.py index f1b91ea..1a9ba8e 100644 --- a/test/StressTest.py +++ b/test/StressTest.py @@ -4,8 +4,8 @@ import logging from datetime import datetime -from pyvsr53dl.logger import log -from pyvsr53dl.vsr53dl import VSR53DL +from vsr53.logger import log +from vsr53.vsr53dl import VSR53DL log.setLevel(logging.ERROR) @@ -24,7 +24,7 @@ def open_file(): def stress_test(): - from pyvsr53dl.sys import dev_tty + from vsr53.sys import dev_tty sensor_address = 1 vacuum_sense = VSR53DL(dev_tty, sensor_address) diff --git a/test/pyvsr53dl_test.py b/test/pyvsr53dl_test.py index 3570da5..0175995 100644 --- a/test/pyvsr53dl_test.py +++ b/test/pyvsr53dl_test.py @@ -3,16 +3,16 @@ import logging import unittest -from pyvsr53dl.DisplayModes import Units -from pyvsr53dl.logger import log -from pyvsr53dl.vsr53dl import VSR53DL +from vsr53.DisplayModes import Units +from vsr53.logger import log +from vsr53.vsr53dl import VSR53DL class TestVacuumSense(unittest.TestCase): def test_device_query(self): log.setLevel(logging.INFO) - from pyvsr53dl.sys import dev_tty + from vsr53.sys import dev_tty sensor_address = 1 vacuum_sense = VSR53DL(dev_tty, sensor_address)