CI: return version

typing fixed for older python versions

.circleci/config.yml

@@ -23,6 +23,12 @@ jobs:
       - checkout
       - attach_workspace:
           at: ./
+      - run:
+          name: Create Innosetup signing cert
+          shell: powershell.exe
+          command: |
+            echo $env:PFX_B64 > "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.txt"
+            certutil -decode "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.txt" "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.pfx"
       - run:
           name: Patch
           shell: powershell.exe
@@ -36,7 +42,12 @@ jobs:
             python patch_version.py $semver
             python setup.py sdist bdist_wheel
             Copy-Item -Path "dist\speckle_toolbox-$($ver)-py3-none-any.whl" -Destination "speckle_arcgis_installer"
-            speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\arcgis.iss
+      - run: 
+          name: Build Installer
+          shell: cmd.exe
+          command:
+            | # If no tag, use 0.0.0.1 and don't make any YML (for testing only!)
+            speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\arcgis.iss /Sbyparam=$p
       - when:
           condition: << parameters.installer >>
           steps:
@@ -93,6 +104,7 @@ workflows: #happens with every PR to main
   build: # build the installers, but don't persist to workspace for deployment
     jobs:
       - get-ci-tools:
+          context: github-dev-bot
           filters:
             branches:
               only:
@@ -106,10 +118,12 @@ workflows: #happens with every PR to main
               only:
                 - main
                 - /ci\/.*/
+          context: innosetup
 
   deploy: # build installers and deploy
     jobs:
       - get-ci-tools:
+          context: github-dev-bot
           filters:
             tags:
               only: /.*/
@@ -127,13 +141,12 @@ workflows: #happens with every PR to main
               only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
             branches:
               ignore: /.*/
-
+          context: innosetup
       - deploy-manager2:
           slug: arcgis
           os: Win
           extension: exe
           requires:
-            - get-ci-tools
             - build-deploy-connector-win
           filters:
             tags:

speckle_toolbox/esri/toolboxes/speckle/converter/layers/feature.py

@@ -164,7 +164,7 @@ def addFeatVariant(key, variant, value, f):
     elif variant == "TEXT" or variant == "FLOAT" or variant == "LONG" or variant == "SHORT": feat.update({key: None})
     return feat 
 
-def updateFeat(feat:dict, fields: dict, feature: Base) -> dict[str, Any]:
+def updateFeat(feat:dict, fields: dict, feature: Base) -> Dict[str, Any]:
     
     for key, variant in fields.items(): 
         try:

speckle_toolbox/esri/toolboxes/speckle/converter/layers/symbologyTemplates.py

@@ -3,6 +3,8 @@ from typing import Any, List, Union
 import copy
 import os
 
+from typing import Dict
+
 import arcpy 
 from arcpy._mp import ArcGISProject
 from arcpy.management import (CreateFeatureclass, MakeFeatureLayer,
@@ -33,7 +35,7 @@ def symbol_color_to_speckle(color: dict):
     except: pass 
     return newColor
 
-def vectorRendererToNative(project: ArcGISProject, active_map, layerGroup, layerSpeckle: Union[Layer, VectorLayer], layerArcgis, f_class, existingAttrs: List) -> Union[None, dict[str, Any]] :
+def vectorRendererToNative(project: ArcGISProject, active_map, layerGroup, layerSpeckle: Union[Layer, VectorLayer], layerArcgis, f_class, existingAttrs: List) -> Union[None, Dict[str, Any]] :
     print("___________APPLY VECTOR RENDERER______________")
     print(layerArcgis)
     print(f_class)
@@ -311,7 +313,7 @@ def rendererToSpeckle(project: ArcGISProject, active_map, arcLayer, rasterFeat:
             #path_style2 = root_path + '\\' + newName + '_new.lyrx'
             symJson = jsonFromLayerStyle(arcLayer, path_style)
 
-        layerRenderer: dict[str, Any] = {}
+        layerRenderer: Dict[str, Any] = {}
         layerRenderer['type'] = rType
         print(rType)
         my_raster = arcpy.Raster(arcLayer.dataSource)  
@@ -394,7 +396,7 @@ def rendererToSpeckle(project: ArcGISProject, active_map, arcLayer, rasterFeat:
 
         return layerRenderer 
     elif arcLayer.isFeatureLayer: 
-        layerRenderer: dict[str, Any] = {}
+        layerRenderer: Dict[str, Any] = {}
 
         sym = arcLayer.symbology
         print(sym.renderer.type)

speckle_toolbox/esri/toolboxes/speckle/converter/layers/utils.py

@@ -30,7 +30,7 @@ def getVariantFromValue(value: Any) -> Union[str, None]:
 
     return res
 
-def getLayerAttributes(featuresList: List[Base], attrsToRemove: List[str] = ATTRS_REMOVE ) -> dict[str, str]:
+def getLayerAttributes(featuresList: List[Base], attrsToRemove: List[str] = ATTRS_REMOVE ) -> Dict[str, str]:
     print("03________ get layer attributes")
 
     if not isinstance(featuresList, list): features = [featuresList]