diff --git a/pymodbus/version.py b/pymodbus/version.py index 528492154..b170cafd6 100644 --- a/pymodbus/version.py +++ b/pymodbus/version.py @@ -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" ) diff --git a/setup.cfg b/setup.cfg index d7464efc3..6852f7318 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 diff --git a/test/test_server_asyncio.py b/test/test_server_asyncio.py index ba97b2ee7..c8e6bd545 100755 --- a/test/test_server_asyncio.py +++ b/test/test_server_asyncio.py @@ -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() @@ -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( @@ -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 @@ -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" diff --git a/test/test_server_sync.py b/test/test_server_sync.py index 6ffbde281..1b2528908 100644 --- a/test/test_server_sync.py +++ b/test/test_server_sync.py @@ -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"):