Merge branch 'master' into 1.1.0-dev

Author: rlabbeptc

.gitignore

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------
-# Copyright (c) PTC Inc. and/or all its affiliates. All rights reserved.
+# Copyright (c) 2020, PTC Inc. and/or all its affiliates. All rights reserved.
 # See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
@@ -13,7 +13,6 @@ _notes
 _new*
 _test*
 _build*
-_dev*
 /docs
 mkdocs.yml
 

README.md

@@ -20,9 +20,9 @@ SDK allows for *GET*, *ADD*, *DELETE*, and *MODIFY* functions for the following
 | **Connectivity** <br /> *(Channel, Devices, Tags, Tag Groups)* | Y | Y |
 | **IoT Gateway** <br /> *(Agents, IoT Items)* | Y | Y |
 | **Datalogger** <br /> *(Log Groups, Items, Mapping, Triggers, Reset Mapping Service)* | Y | Y |
-| **Administration** <br /> *(User Groups, Users, UA Endpoints, Local License Server)* | Y* | Y |
+| **Administration** <br /> *(User Groups, Users, UA Endpoints)* | Y* | Y |
 
-Note (*) - UA Endpoints and Local License Server supported for Kepware Edge only
+Note (*) - UA Endpoints supported for Kepware Edge only
 
 Driver specific features:
 

kepconfig/__init__.py

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------
-# Copyright (c) PTC Inc. and/or all its affiliates. All rights reserved.
+# Copyright (c) 2020, PTC Inc. and/or all its affiliates. All rights reserved.
 # See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------

kepconfig/admin/__init__.py

@@ -1,8 +1,8 @@
 # -------------------------------------------------------------------------
-# Copyright (c) PTC Inc. and/or all its affiliates. All rights reserved.
+# Copyright (c) 2020, PTC Inc. and/or all its affiliates. All rights reserved.
 # See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
 
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
-from . import users, user_groups,ua_server, lls
+from . import users, user_groups,ua_server

kepconfig/admin/lls.py

@@ -37,25 +37,6 @@ def __init__(self, code = '', message = '', href = ''):
     def __str__(self):
         return '{"code": %s, "message": %s, "href": %s}' % (self.code, self.message, self.href)
 
-class KepServiceStatus:
-    '''A class to represent a status object when checking on a "service" API job state in Kepware. This is
-    used to return the status of a "service" job
-
-    Properties:
-
-    "complete" - Boolean of service job completion status
-    "status" - Status code of job
-    "message" - Error message if service job fails
-    
-    '''
-    def __init__(self, complete = '', status = '', message = ''):
-        self.status = status
-        self.message = message
-        self.complete = complete
-    
-    def __str__(self):
-        return '{"complete": %s, "status": %s, "message": %s}' % (self.complete, self.status, self.message)
-
 class _HttpDataAbstract:
     def __init__(self):
         self.payload = ''
@@ -81,12 +62,9 @@ class server:
 
     Methods:
 
-    "reinitialize()" - reinitialize the Kepware server
+    "reinitialize()" - Reinitialize the Kepware server
     "get_trans_log()" - retrieve the Configuration API transaction logs
     "get_event_log()" - retrieve the Kepware Event Log
-    "get_project_properties()" - retrieve the Kepware Project Properties
-    "modify_project_properties()" - modify the Kepware Project Properties
-    "service_status()" - retrive service job status
     '''
     __root_url = '/config'
     __version_url = '/v1'
@@ -235,30 +213,6 @@ def modify_project_properties(self, DATA, force = False) -> bool:
         r = self._config_update(self.url + '/project', prop_data)
         if r.code == 200: return True 
         else: raise KepHTTPError(r.url, r.code, r.msg, r.hdrs, r.payload)
-    
-    def service_status(self, resp: KepServiceResponse):
-        '''Returns the status of a service job. Used to verify if a service call
-        has completed or not.
-
-        INPUT:
-        "resp" - KepServiceResponse instance with job information
-
-        RETURNS:
-        KepServiceStatus instance with job status
-
-        EXCEPTIONS:
-        
-        KepHTTPError - If urllib provides an HTTPError
-        KepURLError - If urllib provides an URLError
-        '''
-        # need to remove part of job href
-        loc = resp.href.find(self.__root_url + self.__version_url)
-        job_url = resp.href[loc + len(self.__root_url + self.__version_url):]
-
-        r = self._config_get(self.url + job_url)
-        job = KepServiceStatus(r.payload['servermain.JOB_COMPLETE'],r.payload['servermain.JOB_STATUS'], r.payload['servermain.JOB_STATUS_MSG'])
-        return job
-
 
     #Function used to Add an object to Kepware (HTTP POST)
     def _config_add(self, url, DATA):
@@ -325,7 +279,7 @@ def _force_update_check(self, force, DATA):
                         pass
         return DATA
     # General service call handler
-    def _kep_service_execute(self, url, TTL = None):
+    def _kep_service_execute(self, url, TTL):
         try:
             if TTL != None:
                 TTL = {"servermain.JOB_TIME_TO_LIVE_SECONDS": TTL}

kepconfig/connection.py

@@ -2,7 +2,7 @@
 import os
 
 file_location = "kepconfig/__init__.py"
-version_re_string = "([0-9]+)\.([0-9]+)\.([0-9]+(?:[ab][0-9])?)"
+version_re_string = "([0-9]+)\.([0-9]+)\.([0-9]+$|[0-9]+[ab][0-9]+)"
 version_search = re.compile(r'__version__ = "'+ version_re_string + '"')
 version_check = re.compile(version_re_string)
 
@@ -12,7 +12,7 @@ def bump_version():
     m = version_search.search(s)
     v1, v2, v3 = m.groups()
     oldv = "{0}.{1}.{2}".format(v1, v2, v3)
-    ans = input("Current version of kepconfig is: {} \nUpdate new version to? (ctrl-c to exit): ".format(oldv))
+    ans = input("Current version of kepconfig is: {0} \nUpdate new version to? (ctrl-c to exit): ".format(oldv))
     if ans:
         m = version_check.search(ans)
         if (m==None):
@@ -22,7 +22,7 @@ def bump_version():
     else:
         print("Please enter updated version number. Exiting...")
         exit()
-    print("\n"+ "Updating " + file_location + " version to {}.".format(newv))
+    print("\n"+ "Updating " + file_location + " version to {0}.".format(newv))
     s = s.replace(oldv, newv)
     with open(file_location, "w") as f:
         f.write(s)
@@ -36,24 +36,22 @@ def release():
         os.system("git add " + file_location)
         os.system('git commit -m \"{} Release\"'.format(v))
         os.system("git tag {0}".format(v))
-        ans = input("Change committed, push to server? (Y/n)")
+        ans = input("Change committed, push to server? (y/n)")
         if ans.lower() in ("y", "yes"):
         #     os.system("git push")
         #     os.system("git push --tags")
             os.system("git push --follow-tags")
-    ans = input("Build dist packages?(Y/n)")
-    if ans.lower() in ("y", "yes"):
-        # os.system("rm -rf dist/*") #Linux
-        os.system("RMDIR /S /Q dist") #Windows
-        os.system("python -m build")
-    ans = input("upload to pip?(Y/n)")
-    if ans.lower() in ("y", "yes"):
+        ans = input("upload to pip?(Y/n)")
+        if ans.lower() in ("y", "yes"):
+            # os.system("rm -rf dist/*") #Linux
+            os.system("RMDIR /S /Q dist") #Windows
+            os.system("python setup.py sdist bdist_wheel")
 
-        # Test PyPi Server
-        os.system("twine upload --repository testpypi dist/*")
+            # Test PyPi Server
+            os.system("twine upload --repository testpypi dist/*")
 
-        #Production PyPi Server
-        # os.system("twine upload dist/*")
+            #Production PyPi Server
+            # os.system("twine upload dist/*")
 
 
 if __name__ == "__main__":