Merge pull request #17 from fledge-iot/2.5.0RC

2.5.0RC
fledge-iot · Jul 1, 2024 · b8114bb · b8114bb
2 parents 65fcf66 + d225123
commit b8114bb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,7 +18,7 @@ timestamps {
                     // Change to corresponding CORE_BRANCH as required
                     // e.g. FOGL-xxxx, main etc.
                     sh '''
-                        CORE_BRANCH='2.4.0RC'
+                        CORE_BRANCH='2.5.0RC'
                         ${HOME}/buildFledge ${CORE_BRANCH} ${WORKSPACE}
                     '''
                 }

diff --git a/VERSION.north.s7_python b/VERSION.north.s7_python
@@ -1,2 +1,2 @@
-fledge_north_s7_python_version=2.4.0
-fledge_version>=2.4
+fledge_north_s7_python_version=2.5.0
+fledge_version>=2.5
diff --git a/python/fledge/plugins/north/s7_python/s7_python.py b/python/fledge/plugins/north/s7_python/s7_python.py
@@ -23,6 +23,7 @@
 from snap7.util import *
 from snap7.types import *
 
+import logging
 import asyncio
 import json
 import re
@@ -160,7 +161,7 @@
 def plugin_info():
     return {
         'name': 's7_north_python',
-        'version': '2.4.0',
+        'version': '2.5.0',
         'type': 'north',
         'interface': '1.0',
         'config': _DEFAULT_CONFIG

diff --git a/python/requirements-s7_python.txt b/python/requirements-s7_python.txt
@@ -1 +1 @@
-python-snap7
+python-snap7==1.1
diff --git a/tests/test_north_s7_python.py b/tests/test_north_s7_python.py
@@ -119,7 +119,7 @@ def test_plugin_info(self):
 
         assert plugin_info == {
             'name': 's7_north_python',
-            'version': '2.4.0',
+            'version': '2.5.0',
             'type': 'north',
             'interface': '1.0',
             'config': s7._DEFAULT_CONFIG