Skip to content

Commit

Permalink
Merge pull request #4 from alexrudd2/pymodbus_repl
Browse files Browse the repository at this point in the history
Move to pymodbus_repl to avoid namespace conflicts
  • Loading branch information
dhoomakethu authored Feb 19, 2024
2 parents a75dc4c + 35422e9 commit 55565df
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 12 deletions.
1 change: 0 additions & 1 deletion pymodbus/repl/__init__.py

This file was deleted.

File renamed without changes.
1 change: 1 addition & 0 deletions pymodbus_repl/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"""REPL (Read-Eval-Print Loop) tool for working with Modbus devices using the Pymodbus library."""
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from prompt_toolkit.filters import Condition
from prompt_toolkit.styles import Style

from pymodbus.repl.client.helper import get_commands
from pymodbus_repl.client.helper import get_commands


@Condition
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions pymodbus/repl/client/main.py → pymodbus_repl/client/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

from pymodbus import __version__ as pymodbus_version
from pymodbus.exceptions import ParameterException
from pymodbus.repl.client.completer import (
from pymodbus_repl.client.completer import (
CmdCompleter,
has_selected_completion,
)
from pymodbus.repl.client.helper import CLIENT_ATTRIBUTES, Result
from pymodbus.repl.client.mclient import ModbusSerialClient, ModbusTcpClient
from pymodbus_repl.client.helper import CLIENT_ATTRIBUTES, Result
from pymodbus_repl.client.mclient import ModbusSerialClient, ModbusTcpClient
from pymodbus.transaction import (
ModbusAsciiFramer,
ModbusBinaryFramer,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from pymodbus import pymodbus_apply_logging_config
from pymodbus.framer.socket_framer import ModbusSocketFramer
from pymodbus.logging import Log
from pymodbus.repl.server.cli import run_repl
from pymodbus_repl.server.cli import run_repl
from pymodbus.server.reactive.default_config import DEFAULT_CONFIG
from pymodbus.server.reactive.main import (
DEFAULT_FRAMER,
Expand Down
12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[tool.poetry]
name = "pymodbus-repl"
name = "pymodbus_repl"
version = "0.1.0"
description = ""
description = "REPL (Read-Eval-Print Loop) tool for working with Modbus devices using the Pymodbus library."
authors = ["dhoomakethu <[email protected]>"]
readme = "README.md"
packages = [{include = "pymodbus"}]
packages = [{include = "pymodbus_repl"}]

[tool.poetry.dependencies]
python = "^3.8"
Expand All @@ -24,7 +24,7 @@ version=">=3.8.6"


[tool.setuptools.packages.find]
include = ["pymodbus.repl"]
include = ["pymodbus_repl"]

[tool.poetry.group.dev.dependencies]
pymodbus = "^3.6.4"
Expand Down Expand Up @@ -130,5 +130,5 @@ skip-magic-trailing-comma = false
line-ending = "auto"

[tool.poetry.scripts]
"pymodbus.console" = "pymodbus.repl.client.main:main"
"pymodbus.server" = "pymodbus.repl.server.main:app"
"pymodbus.console" = "pymodbus_repl.client.main:main"
"pymodbus.server" = "pymodbus_repl.server.main:app"

0 comments on commit 55565df

Please sign in to comment.