ci: try diff env tag variable

ci: fix workflows and patch version with git tag

.circleci/config.yml

@@ -4,7 +4,7 @@ orbs:
   python: circleci/python@1.3.2
 
 jobs:
-  build:
+  test:
     docker:
       - image: "cimg/python:<<parameters.tag>>"
       - image: "circleci/node:12"
@@ -45,20 +45,23 @@ jobs:
       - image: "circleci/python:3.8"
     steps:
       - checkout
+      - run: python patch_version.py $CIRCLE_TAG
       - run: poetry build
       - run: poetry publish -u specklesystems -p $PYPI_PASSWORD
 
 workflows:
   main:
-    jobs:
-      - build:
+    jobs: 
+      - test:
           matrix:
             parameters:
               tag: ["3.6", "3.7", "3.8", "3.9"]
-
-  publish:
-    jobs: 
+          filters:
+            tags:
+              only: /.*/
       - deploy:
+          requires:
+            - test 
           filters:
             tags:
               only: /[0-9]+(\.[0-9]+)*/

patch_version.py

@@ -0,0 +1,31 @@
+import re
+import sys
+
+
+def patch(tag):
+    print(f"Patching version: {tag}")
+
+    with open("pyproject.toml", "r") as f:
+        lines = f.readlines()
+
+        if "version" not in lines[2]:
+            raise Exception(f"Invalid pyproject.toml. Could not patch version.")
+
+        lines[2] = f'version = "{tag}"\n'
+        with open("pyproject.toml", "w") as file:
+            file.writelines(lines)
+
+
+def main():
+    if len(sys.argv) < 2:
+        return
+
+    tag = sys.argv[1]
+    if not re.match(r"[0-9]+(\.[0-9]+)*$", tag):
+        raise ValueError(f"Invalid tag provided: {tag}")
+
+    patch(tag)
+
+
+if __name__ == "__main__":
+    main()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "specklepy"
-version = "2.2.6"
+version = "2.1.0"
 description = "The Python SDK for Speckle 2.0"
 readme = "README.md"
 authors = ["Speckle Systems <devops@speckle.systems>"]

specklepy/api/credentials.py

@@ -94,6 +94,7 @@ class StreamWrapper:
     object_id: str = None
     branch_name: str = None
     client: SpeckleClient = None
+    account: Account = None
 
     def __repr__(self):
         return f"StreamWrapper( server: {self.host}, stream_id: {self.stream_id}, type: {self.type} )"
@@ -148,17 +149,27 @@ class StreamWrapper:
                 f"Cannot parse {url} into a stream wrapper class - no stream id found."
             )
 
+    def get_account(self) -> Account:
+        if self.account:
+            return self.account
+
+        self.account = next(
+            (a for a in get_local_accounts() if self.host in a.serverInfo.url),
+            None,
+        )
+
+        return self.account
+
     def get_client(self) -> SpeckleClient:
         if self.client:
             return self.client
 
-        acct = next(
-            (a for a in get_local_accounts() if self.host in a.serverInfo.url),
-            None,
-        )
+        if not self.account:
+            self.get_account()
+
         self.client = SpeckleClient(host=self.host, use_ssl=self.use_ssl)
 
-        if not acct:
+        if self.account is None:
             warn(f"No local account found for server {self.host}", SpeckleWarning)
             return self.client