Merge branch 'main' of github.com:dask/dask-kubernetes into BitTheByt…

…e/main
dask · Feb 20, 2024 · 294e88f · 294e88f
2 parents bbbde9d + 84846b1
commit 294e88f
Show file tree

Hide file tree

Showing 16 changed files with 1,192 additions and 610 deletions.
diff --git a/.github/workflows/helmcluster.yaml b/.github/workflows/helmcluster.yaml
@@ -28,15 +28,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10"]
-        kubernetes-version: ["1.27.0"]
+        python-version: ["3.9", "3.10", "3.11"]
+        kubernetes-version: ["1.29.2"]
         include:
-        - python-version: "3.10"
-          kubernetes-version: "1.24.13"
-        - python-version: "3.10"
-          kubernetes-version: "1.25.9"
-        - python-version: "3.10"
-          kubernetes-version: "1.26.4"
+          - python-version: '3.10'
+            kubernetes-version: 1.28.7
+          - python-version: '3.10'
+            kubernetes-version: 1.27.11
+          - python-version: '3.10'
+            kubernetes-version: 1.26.14
 
     env:
       KUBECONFIG: .pytest-kind/pytest-kind/kubeconfig
@@ -51,7 +51,7 @@ jobs:
       - name: Run tests
         env:
           KUBERNETES_VERSION: ${{ matrix.kubernetes-version }}
-        run: pytest dask_kubernetes/common/tests dask_kubernetes/helm/tests
+        run: pytest --reruns=5 dask_kubernetes/common/tests dask_kubernetes/helm/tests
       - name: Debug k8s resources
         if: success() || failure()
         run: kubectl get all -A
diff --git a/.github/workflows/kubecluster.yaml b/.github/workflows/kubecluster.yaml
@@ -28,15 +28,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10"]
-        kubernetes-version: ["1.27.0"]
+        python-version: ["3.9", "3.10", "3.11"]
+        kubernetes-version: ["1.29.2"]
         include:
-        - python-version: "3.10"
-          kubernetes-version: "1.24.13"
-        - python-version: "3.10"
-          kubernetes-version: "1.25.9"
-        - python-version: "3.10"
-          kubernetes-version: "1.26.4"
+          - python-version: '3.10'
+            kubernetes-version: 1.28.7
+          - python-version: '3.10'
+            kubernetes-version: 1.27.11
+          - python-version: '3.10'
+            kubernetes-version: 1.26.14
 
     env:
       KUBECONFIG: .pytest-kind/pytest-kind/kubeconfig
@@ -51,7 +51,7 @@ jobs:
       - name: Run tests
         env:
           KUBERNETES_VERSION: ${{ matrix.kubernetes-version }}
-        run: pytest dask_kubernetes/common/tests dask_kubernetes/classic/tests
+        run: pytest --reruns=5 dask_kubernetes/common/tests dask_kubernetes/classic/tests
       - name: Debug k8s resources
         if: success() || failure()
         run: kubectl get all -A
diff --git a/.github/workflows/operator.yaml b/.github/workflows/operator.yaml
@@ -39,15 +39,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10"]
-        kubernetes-version: ["1.27.3"]
+        python-version: ["3.9", "3.10", "3.11"]
+        kubernetes-version: ["1.29.2"]
         include:
-        - python-version: "3.10"
-          kubernetes-version: "1.24.15"
-        - python-version: "3.10"
-          kubernetes-version: "1.25.11"
-        - python-version: "3.10"
-          kubernetes-version: "1.26.6"
+          - python-version: '3.10'
+            kubernetes-version: 1.28.7
+          - python-version: '3.10'
+            kubernetes-version: 1.27.11
+          - python-version: '3.10'
+            kubernetes-version: 1.26.14
 
     env:
       KUBECONFIG: .pytest-kind/pytest-kind/kubeconfig
@@ -64,7 +64,7 @@ jobs:
           KUBERNETES_VERSION: ${{ matrix.kubernetes-version }}
           TEST_ISTIO: "true"
           TEST_DASK_GATEWAY: "true"
-        run: pytest dask_kubernetes/common dask_kubernetes/operator
+        run: pytest --maxfail=3 --reruns=5 dask_kubernetes/common dask_kubernetes/operator
       - name: Debug kubernetes resources
         if: always()
         run: kubectl get all -A
diff --git a/README.rst b/README.rst
@@ -2,8 +2,17 @@ Dask Kubernetes
 ===============
 
 
-.. image:: https://github.com/dask/dask-kubernetes/workflows/CI/badge.svg
-   :target: https://github.com/dask/dask-kubernetes/actions?query=workflow%3ACI
+.. image:: https://github.com/dask/dask-kubernetes/actions/workflows/lint.yaml/badge.svg
+   :target: https://github.com/dask/dask-kubernetes/actions/workflows/lint.yaml
+   :alt: Linting GitHub Actions CI Status
+
+.. image:: https://github.com/dask/dask-kubernetes/actions/workflows/operator.yaml/badge.svg
+   :target: https://github.com/dask/dask-kubernetes/actions/workflows/operator.yaml
+   :alt: Operator Tests GitHub Actions CI Status
+
+.. image:: https://github.com/dask/dask-kubernetes/actions/workflows/release.yml/badge.svg
+   :target: https://github.com/dask/dask-kubernetes/actions/workflows/release.yml
+   :alt: Package build GitHub Actions CI Status
 
 .. image:: https://img.shields.io/readthedocs/dask-kubernetes?color=%232980B9&logo=read-the-docs&logoColor=white
    :target: https://kubernetes.dask.org/
@@ -21,11 +30,11 @@ Dask Kubernetes
    :target: https://anaconda.org/conda-forge/dask-kubernetes
    :alt: Conda Forge
 
-.. image:: https://img.shields.io/badge/python%20support-3.9%7C3.10-blue
+.. image:: https://img.shields.io/badge/python%20support-3.9%7C3.10%7C3.11%7C3.12-blue
    :target: https://kubernetes.dask.org/en/latest/installing.html#supported-versions
    :alt: Python Support
 
-.. image:: https://img.shields.io/badge/Kubernetes%20support-1.24%7C1.25%7C1.26%7C1.27-blue
+.. image:: https://img.shields.io/badge/Kubernetes%20support-1.26%7C1.27%7C1.28%7C1.29-blue
    :target: https://kubernetes.dask.org/en/latest/installing.html#supported-versions
    :alt: Kubernetes Support
 

diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -1,4 +1,6 @@
-FROM ghcr.io/dask/dask:latest-py3.10
+ARG PYTHON=3.11
+
+FROM ghcr.io/dask/dask:latest-py${PYTHON}
 
 # Install latest dev builds of Dask and Distributed
 RUN pip install git+https://github.com/dask/distributed@main

diff --git a/dask_kubernetes/__init__.py b/dask_kubernetes/__init__.py
@@ -2,6 +2,7 @@
 from warnings import warn
 
 from . import config
+from . import _version
 from .common.auth import (
     AutoRefreshConfiguration,
     AutoRefreshKubeConfigLoader,
@@ -14,11 +15,7 @@
 from .helm import HelmCluster
 
 __all__ = ["HelmCluster", "KubeCluster"]
-
-from ._version import get_versions
-
-__version__ = get_versions()["version"]
-del get_versions
+__version__ = _version.get_versions()["version"]
 
 
 def __getattr__(name):