updated CI. (#1234)

Author: janiversen

.github/workflows/ci.yml

@@ -1,18 +1,6 @@
 name: CI
 
 on:
-  workflow_dispatch:
-    inputs:
-      run_lint:
-        description: 'Run lint'
-        required: false
-        default: true
-        type: boolean
-      run_test:
-        description: 'Run test'
-        required: false
-        default: true
-        type: boolean
   push:
     branches:
       - dev
@@ -23,8 +11,9 @@ on:
     branches:
       - dev
   schedule:
-    # Daily at 02:10 UTC.
-    - cron: '10 2 * * *'
+    # Sunday at 02:10 UTC.
+    - cron: '10 2 * * 0'
+  workflow_dispatch:
 
 
 jobs:
@@ -37,68 +26,65 @@ jobs:
       matrix:
         task:
           - name: pylint
-            type: lint
             cmd: pylint --recursive=y examples pymodbus test
-          - name: codespell
             type: lint
+          - name: codespell
             cmd: codespell
-          - name: bandit
             type: lint
+          - name: bandit
             cmd: bandit -r -c bandit.yaml .
-          - name: flake8
             type: lint
+          - name: flake8
             cmd: flake8
-          - name: isort
             type: lint
+          - name: isort
             cmd: isort --check .
-          - name: black
             type: lint
+          - name: black
             cmd: black --check --safe --quiet examples/ pymodbus/ test/
-          - name: docs
             type: lint
+          - name: docs
             cmd: make -C doc/ html
+            type: lint
           - name: pytest
-            type: test
             cmd: pytest --cov=pymodbus --cov=test --cov-report=term-missing --cov-report=xml -v --full-trace --timeout=20
+            type: test
         os:
-          - on: ubuntu-latest
-            activate: '. venv/bin/activate'
-          - on: macos-latest
-            activate: '. venv/bin/activate'
-            no-lint: 'yes'
-          - on: windows-latest
-            activate: 'venv/Scripts/activate'
-            no-lint: 'yes'
+          - name: Linux
+            on: ubuntu-latest
+            lint: 'yes'
+          - name: Macos
+            on: macos-latest
+            lint: 'no'
+          - name: Windows
+            on: windows-latest
+            lint: 'no'
         python:
           - version: '3.8'
-            no-lint: 'no'
+            lint: 'yes'
           - version: '3.9'
-            no-lint: 'yes'
+            lint: 'no'
           - version: '3.10'
-            no-lint: 'yes'
+            lint: 'no'
           - version: pypy-3.8
-            implementation: pypy
-            no-lint: 'yes'
-          - version: pypy-3.9
-            implementation: pypy
-            no-lint: 'yes'
+            lint: 'no'
         exclude:
           - task:
               type: lint
             os:
-              no-lint: 'yes'
+              lint: 'no'
           - task:
               type: lint
             python:
-              no-lint: 'yes'
+              lint: 'no'
           - os:
-              on: macos-latest
+              name: Macos
             python:
-              implementation: pypy
+              version: pypy-3.8
           - os:
-              on: windows-latest
+              name: Windows
             python:
-              implementation: pypy
+              version: pypy-3.8
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -110,36 +96,13 @@ jobs:
 
       - name: venv restore
         id: cache-venv
-        uses: actions/cache@v3
+        uses: syphar/restore-virtualenv@v1
         with:
-          path: venv
-          key: "venv_${{ matrix.os.on }}_${{ matrix.python.version }}_${{ hashFiles('requirements.txt') }}"
+          requirement_files: requirements.txt
 
       - name: venv create
-        if: ${{ steps.cache-venv.outputs.cache-hit != 'true' }}
-        run: |
-          python -m venv venv
-          ${{ matrix.os.activate }}
-          pip install -e . -r requirements.txt
-
-      - name: test
-        if: ${{ matrix.task.type == 'test' && inputs.run_test }}
-        run: |
-          ${{ matrix.os.activate }}
-          ${{ matrix.task.cmd }}
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+        run: pip install -e . -r requirements.txt
 
-      - name: lint
-        if: ${{ matrix.task.type == 'lint' && inputs.run_lint }}
-        run: |
-          ${{ matrix.os.activate }}
-          ${{ matrix.task.cmd }}
-
-  all:
-    name: All
-    runs-on: ubuntu-latest
-    needs:
-      - integreation_test
-    steps:
-      - name: This
-        run: |
-          ls -l
+      - name: test/lint
+        run: ${{ matrix.task.cmd }}

.github/workflows/clean_workflow_runs.yml

@@ -11,8 +11,8 @@ on:
         required: false
         default: 6
   schedule:
-    # Daily at 02:35 UTC.
-    - cron: '35 2 * * *'
+    # Sunday at 02:35 UTC.
+    - cron: '35 2 * * 0'
 
 jobs:
   del_runs:

.gitignore

@@ -22,4 +22,4 @@ build/
 /doc/_build/
 /dist/
 /pymodbus.egg-info/
-/venv/
+venv

pymodbus/client/base.py

@@ -315,6 +315,8 @@ async def close(self):  # pylint: disable=invalid-overridden-method
         """Close connection."""
         if self.transport:
             self.transport.close()
+            while self.transport is not None:
+                await asyncio.sleep(0.1)
         self._connected = False
 
     def connection_lost(self, reason):

pymodbus/client/serial.py

@@ -14,6 +14,7 @@
 
 try:
     import serial
+
     from serial_asyncio import create_serial_connection
 except ImportError:
     pass
@@ -76,8 +77,15 @@ def __init__(
 
     async def close(self):  # pylint: disable=invalid-overridden-method
         """Stop connection."""
-        if self.connected and self.protocol and self.protocol.transport:
-            self.protocol.transport.close()
+
+        # prevent reconnect:
+        self.delay_ms = 0
+        if self.connected:
+            if self.protocol.transport:
+                self.protocol.transport.close()
+            if self.protocol:
+                await self.protocol.close()
+            await asyncio.sleep(0.1)
 
     def _create_protocol(self):
         """Create protocol."""
@@ -132,7 +140,9 @@ def protocol_lost_connection(self, protocol):
                 _logger.error("Serial: protocol is not self.protocol.")
 
             self._connected_event.clear()
-            self.protocol = None
+            if self.protocol is not None:
+                del self.protocol
+                self.protocol = None
             # if self.host:
             #     asyncio.asynchronous(self._reconnect())
         else:

pymodbus/client/tcp.py

@@ -68,11 +68,14 @@ async def connect(self):  # pylint: disable=invalid-overridden-method
     async def close(self):  # pylint: disable=invalid-overridden-method
         """Stop client."""
 
-        # prevent reconnect.
+        # prevent reconnect:
         self.delay_ms = 0
-
-        if self.connected and self.protocol and self.protocol.transport:
-            self.protocol.transport.close()
+        if self.connected:
+            if self.protocol.transport:
+                self.protocol.transport.close()
+            if self.protocol:
+                await self.protocol.close()
+            await asyncio.sleep(0.1)
 
     def _create_protocol(self):
         """Create initialized protocol instance with factory function."""
@@ -130,7 +133,9 @@ def protocol_lost_connection(self, protocol):
             )
 
         self.connected = False
-        self.protocol = None
+        if self.protocol is not None:
+            del self.protocol
+            self.protocol = None
         if self.delay_ms > 0:
             asyncio.ensure_future(self._reconnect())
 

pymodbus/client/udp.py

@@ -89,9 +89,12 @@ async def close(self):  # pylint: disable=invalid-overridden-method
         """
         # prevent reconnect:
         self.delay_ms = 0
-
-        if self.connected and self.protocol and self.protocol.transport:
-            self.protocol.transport.close()
+        if self.connected:
+            if self.protocol.transport:
+                self.protocol.transport.close()
+            if self.protocol:
+                await self.protocol.close()
+            await asyncio.sleep(0.1)
 
     def _create_protocol(self, host=None, port=0):
         """Create initialized protocol instance with factory function."""
@@ -157,7 +160,9 @@ def protocol_lost_connection(self, protocol):
                 )
 
             self.connected = False
-            self.protocol = None
+            if self.protocol is not None:
+                del self.protocol
+                self.protocol = None
             if self.delay_ms > 0:
                 asyncio.create_task(self._reconnect())
         else:
@@ -201,7 +206,7 @@ def __init__(
         source_address: typing.Tuple[str, int] = None,
         **kwargs: any,
     ) -> None:
-        """Initialize Asyncio Modbus UDP Client."""
+        """Initialize Modbus UDP Client."""
         super().__init__(framer=framer, **kwargs)
         self.params.host = host
         self.params.port = port

pymodbus/server/async_io.py

@@ -25,6 +25,7 @@
 
 try:
     import serial
+
     from serial_asyncio import create_serial_connection
 except ImportError:
     pass