Merge branch 'master' into development

jacalata · web-flow · commit 23d110f5912d · 2023-01-06T15:59:21.000-08:00
diff --git a/.github/workflows/meta-checks.yml b/.github/workflows/meta-checks.yml
@@ -32,4 +32,4 @@ jobs:
     - name: Run Mypy tests
       if: always()
       run: |
-        mypy --show-error-codes --disable-error-code misc --disable-error-code import tableauserverclient test
+        mypy --show-error-codes --disable-error-code misc --disable-error-code import --implicit-optional tableauserverclient test
diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
@@ -34,7 +34,7 @@ jobs:
           repository_url: https://test.pypi.org/legacy/
           
       - name: Publish distribution 📦 to PyPI
-        if: ${{ github.ref.name == 'master' || (github.event.ref.name == 'refs/head/master') }}
+        if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
         uses: pypa/gh-action-pypi-publish@release/v1  # license BSD-2
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/tableauserverclient/models/project_item.py b/tableauserverclient/models/project_item.py
@@ -34,6 +34,8 @@ def __init__(
         self._default_datasource_permissions = None
         self._default_flow_permissions = None
         self._default_lens_permissions = None
+        self._default_datarole_permissions = None
+        self._default_metric_permissions = None
 
     @property
     def content_permissions(self):
@@ -79,6 +81,20 @@ def default_lens_permissions(self):
             raise UnpopulatedPropertyError(error)
         return self._default_lens_permissions()
 
+    @property
+    def default_datarole_permissions(self):
+        if self._default_datarole_permissions is None:
+            error = "Project item must be populated with permissions first."
+            raise UnpopulatedPropertyError(error)
+        return self._default_datarole_permissions()
+
+    @property
+    def default_metric_permissions(self):
+        if self._default_metric_permissions is None:
+            error = "Project item must be populated with permissions first."
+            raise UnpopulatedPropertyError(error)
+        return self._default_metric_permissions()
+
     @property
     def id(self) -> Optional[str]:
         return self._id
