Skip to content

Prepare for rc1. #1097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2022
Merged

Prepare for rc1. #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e6a28b
Prepare for rc1.
janiversen Sep 26, 2022
5aa09aa
Remove pytest.mark.skip
janiversen Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pymodbus/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __str__(self):
return f"[{self.package}, version {self.short()}]"


version = Version("pymodbus", 3, 0, 0, "dev5")
version = Version("pymodbus", 3, 0, 0, "rc1")
version.__name__ = ( # fix epydoc error # pylint: disable=attribute-defined-outside-init
"pymodbus"
)
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ url = https://github.com/riptideio/pymodbus/
classifiers =
Development Status :: 4 - Beta
Environment :: Console
Framework :: Twisted
Framework :: AsyncIO
Intended Audience :: Developers
License :: OSI Approved :: BSD License
Expand Down
4 changes: 0 additions & 4 deletions test/test_server_asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ async def test_async_start_server_no_loop(self):
"""Test that the modbus tcp asyncio server starts correctly"""
await self.start_server(do_forever=False)

@pytest.mark.skipif(pytest.IS_WINDOWS, reason="Windows have a timeout problem.")
async def test_async_start_server(self):
"""Test that the modbus tcp asyncio server starts correctly"""
await self.start_server()
Expand Down Expand Up @@ -265,7 +264,6 @@ async def test_async_tcp_server_close_active_connection(self):
await asyncio.sleep(0.5)
await self.server.server_close()

@pytest.mark.skip
async def test_async_tcp_server_no_slave(self):
"""Test unknown slave unit exception"""
self.context = ModbusServerContext(
Expand All @@ -278,7 +276,6 @@ async def test_async_tcp_server_no_slave(self):
self.server.server_close()
self.server = None

@pytest.mark.skip
async def test_async_tcp_server_modbus_error(self):
"""Test sending garbage data on a TCP socket should drop the connection"""
BasicClient.data = TEST_DATA
Expand Down Expand Up @@ -435,7 +432,6 @@ async def test_async_udp_server_exception(self):
self.server.protocol._sock._closed # pylint: disable=protected-access
)

@pytest.mark.skip
async def test_async_tcp_server_exception(self):
"""Send garbage data on a TCP socket should drop the connection"""
BasicClient.data = b"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
Expand Down
1 change: 0 additions & 1 deletion test/test_server_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ def xtest_start_udp_server(self):
with patch.object(socketserver.UDPServer, "server_bind"):
StartUdpServer()

@pytest.mark.skip
def xtest_start_serial_server(self):
"""Test the serial server starting factory"""
with patch.object(ModbusSerialServer, "serve_forever"):
Expand Down