Merge branch 'main' into additional-state-transition

PrefectHQ · Feb 14, 2024 · f20f801 · f20f801
2 parents f23f99c + 7c7de22
commit f20f801
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -33,8 +33,8 @@ markdown_extensions:
           permalink: true
     - pymdownx.snippets
     - pymdownx.emoji:
-          emoji_index: !!python/name:materialx.emoji.twemoji
-          emoji_generator: !!python/name:materialx.emoji.to_svg
+          emoji_index: !!python/name:material.extensions.emoji.twemoji
+          emoji_generator: !!python/name:material.extensions.emoji.to_svg
 theme:
     name: material
     custom_dir: docs/overrides
@@ -130,6 +130,25 @@ extra:
                       Thank you for your feedback! Feel free to
                       <a href="https://github.com/PrefectHQ/prefect/issues/new?assignees=&labels=docs%2Cstatus%3Atriage&projects=&template=4_docs_change.yaml"
                       target="_blank"> open an issue </a> with more detail.
+    social:
+        - icon: fontawesome/brands/slack
+          link: https://www.prefect.io/slack/
+        - icon: fontawesome/brands/discourse
+          link: https://discourse.prefect.io/
+        - icon: fontawesome/brands/youtube
+          link: https://www.youtube.com/c/PrefectIO/videos
+        - icon: fontawesome/regular/newspaper
+          link: https://prefect.io/guide/
+        - icon: fontawesome/brands/twitter
+          link: https://twitter.com/PrefectIO
+        - icon: fontawesome/brands/linkedin
+          link: https://www.linkedin.com/company/prefect/
+        - icon: fontawesome/brands/github
+          link: https://github.com/PrefectHQ/prefect
+        - icon: fontawesome/brands/docker
+          link: https://hub.docker.com/r/prefecthq/prefect/
+        - icon: fontawesome/brands/python
+          link: https://pypi.org/project/prefect/
 
 nav:
     - Getting Started:
@@ -392,22 +411,3 @@ nav:
           - Contributing: contributing/overview.md
           - Style: contributing/style.md
           - Versioning: contributing/versioning.md
-social:
-    - icon: fontawesome/brands/slack
-      link: https://www.prefect.io/slack/
-    - icon: fontawesome/brands/discourse
-      link: https://discourse.prefect.io/
-    - icon: fontawesome/brands/youtube
-      link: https://www.youtube.com/c/PrefectIO/videos
-    - icon: fontawesome/regular/newspaper
-      link: https://prefect.io/guide/
-    - icon: fontawesome/brands/twitter
-      link: https://twitter.com/PrefectIO
-    - icon: fontawesome/brands/linkedin
-      link: https://www.linkedin.com/company/prefect/
-    - icon: fontawesome/brands/github
-      link: https://github.com/PrefectHQ/prefect
-    - icon: fontawesome/brands/docker
-      link: https://hub.docker.com/r/prefecthq/prefect/
-    - icon: fontawesome/brands/python
-      link: https://pypi.org/project/prefect/
diff --git a/netlify.toml b/netlify.toml
@@ -10,7 +10,7 @@ base = ""
 command = """
 pip install --upgrade pip \
 && pip install --upgrade --upgrade-strategy eager  -e ".[dev]" \
-&& pip install git+https://oauth:${MKDOCS_MATERIAL_INSIDERS_REPO_RO}@github.com/PrefectHQ/mkdocs-material-insiders.git@706cb730a2efbc1032226af3937207223cb07e05 \
+&& pip install git+https://oauth:${MKDOCS_MATERIAL_INSIDERS_REPO_RO}@github.com/PrefectHQ/mkdocs-material-insiders.git@d7aff94f888b6f3300d32e25d37836333582e44c\
 && prefect dev build-docs \
 && mkdocs build --config-file mkdocs.insiders.yml \
 """

diff --git a/src/prefect/settings.py b/src/prefect/settings.py
@@ -39,6 +39,7 @@
 dependent on the value of other settings or perform other dynamic effects.
 
 """
+
 import logging
 import os
 import string
@@ -1461,7 +1462,7 @@ def default_cloud_ui_url(settings, value):
 Whether or not to enable experimental task scheduling.
 """
 
-PREFECT_EXPERIMENTAL_ENABLE_WORK_QUEUE_STATUS = Setting(bool, default=False)
+PREFECT_EXPERIMENTAL_ENABLE_WORK_QUEUE_STATUS = Setting(bool, default=True)
 """
 Whether or not to enable experimental work queue status in-place of work queue health.
 """

diff --git a/tests/_internal/compatibility/test_experimental.py b/tests/_internal/compatibility/test_experimental.py
@@ -474,6 +474,7 @@ def test_enabled_experiments_with_opt_in():
         "workspace_dashboard",
         "deployment_status",
         "enhanced_cancellation",
+        "work_queue_status",
     }
 
 
@@ -486,4 +487,5 @@ def test_enabled_experiments_without_opt_in():
         "workspace_dashboard",
         "deployment_status",
         "enhanced_cancellation",
+        "work_queue_status",
     }
diff --git a/tests/server/test_app.py b/tests/server/test_app.py
@@ -37,6 +37,7 @@ def test_app_exposes_ui_settings():
         "workspace_dashboard",
         "deployment_status",
         "enhanced_cancellation",
+        "work_queue_status",
     }
 
 
@@ -57,4 +58,5 @@ def test_app_exposes_ui_settings_with_experiments_enabled():
         "workspace_dashboard",
         "deployment_status",
         "enhanced_cancellation",
+        "work_queue_status",
     }