Merge branch 'main' of https://github.com/rossmacdonald-ow/dask-kuber…

…netes into target-duration-docs-update

.dockerignore

@@ -1,2 +1,2 @@
-.*
 Dockerfile
+dist/

.github/workflows/operator.yaml

@@ -1,21 +1,7 @@
 name: "Operator"
 on:
   pull_request:
-    paths:
-      - ".github/workflows/operator.yaml"
-      - "requirements*"
-      - "ci/**"
-      - "dask_kubernetes/operator/**"
-      - "dask_kubernetes/common/**"
-      - "dask_kubernetes/*"
   push:
-    paths:
-      - ".github/workflows/operator.yaml"
-      - "requirements*"
-      - "ci/**"
-      - "dask_kubernetes/operator/**"
-      - "dask_kubernetes/common/**"
-      - "dask_kubernetes/*"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -39,15 +25,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
-        kubernetes-version: ["1.29.2"]
+        python-version: ["3.10", "3.11", "3.12"]
+        kubernetes-version: ["1.30.2"]
         include:
           - python-version: '3.10'
-            kubernetes-version: 1.28.7
+            kubernetes-version: 1.29.4
           - python-version: '3.10'
-            kubernetes-version: 1.27.11
-          - python-version: '3.10'
-            kubernetes-version: 1.26.14
+            kubernetes-version: 1.28.9
 
     env:
       KUBECONFIG: .pytest-kind/pytest-kind/kubeconfig
@@ -64,7 +48,7 @@ jobs:
           KUBERNETES_VERSION: ${{ matrix.kubernetes-version }}
           TEST_ISTIO: "true"
           TEST_DASK_GATEWAY: "true"
-        run: pytest --maxfail=3 --reruns=5 dask_kubernetes/common dask_kubernetes/operator
+        run: pytest --maxfail=3 --reruns=5 dask_kubernetes
       - name: Debug kubernetes resources
         if: always()
         run: kubectl get all -A

.github/workflows/release.yml

@@ -5,18 +5,21 @@ on: [push, pull_request]
 jobs:
   build-distribution:
     runs-on: "ubuntu-latest"
+    permissions: write-all
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
           python-version: "3.10"
 
       - name: Install pypa/build and chartpress
-        run: python -m pip install build wheel chartpress pyyaml
+        run: python -m pip install hatch build wheel chartpress pyyaml
 
       # chartpress pushes a packages Helm chart to dask/helm-chart's gh-pages
       # branch, so we need to have a git user.email and user.name configured
@@ -27,14 +30,11 @@ jobs:
 
       - name: Build distributions
         shell: bash -l {0}
-        run: python setup.py sdist bdist_wheel
+        run: hatch build
 
       - name: Publish package to PyPI
         if: github.repository == 'dask/dask-kubernetes' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
-        with:
-          user: __token__
-          password: ${{ secrets.pypi_password }}
+        uses: pypa/gh-action-pypi-publish@release/v1
 
       - name: Get the version
         id: get_version

.gitignore

@@ -73,7 +73,7 @@ instance/
 .scrapy
 
 # Sphinx documentation
-doc/_build/
+docs/_build/
 
 # PyBuilder
 target/
@@ -141,4 +141,7 @@ credentials.csv
 
 # IDEs
 .idea/
-.vscode/
+.vscode/
+
+# Version
+_version.py

.readthedocs.yaml

@@ -7,7 +7,7 @@ version: 2
 
 # Set the version of Python and other tools you might need
 sphinx:
-  configuration: doc/source/conf.py
+  configuration: docs/source/conf.py
 
 formats: all
 
@@ -20,7 +20,7 @@ python:
   install:
     - method: pip
       path: .
-    - requirements: doc/requirements-docs.txt
+    - requirements: docs/requirements-docs.txt
 
 submodules:
   include: all

README.rst

@@ -30,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%7C3.11%7C3.12-blue
+.. image:: https://img.shields.io/badge/python%20support-3.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.26%7C1.27%7C1.28%7C1.29-blue
+.. image:: https://img.shields.io/badge/Kubernetes%20support-1.28%7C1.29%7C1.30-blue
    :target: https://kubernetes.dask.org/en/latest/installing.html#supported-versions
    :alt: Kubernetes Support
 

dask_kubernetes/__init__.py

@@ -1,26 +1,10 @@
-from importlib import import_module
-from warnings import warn
-
 from . import config
-from . import _version
-from .common.auth import (
-    AutoRefreshConfiguration,
-    AutoRefreshKubeConfigLoader,
-    ClusterAuth,
-    InCluster,
-    KubeAuth,
-    KubeConfig,
-)
-from .common.objects import clean_pod_template, make_pod_from_dict, make_pod_spec
-from .helm import HelmCluster
-
-__all__ = ["HelmCluster", "KubeCluster"]
-__version__ = _version.get_versions()["version"]
-
 
-def __getattr__(name):
-    if name == "KubeCluster":
-        new_module = import_module("dask_kubernetes.classic")
-        return getattr(new_module, name)
+__all__ = []
 
-    raise AttributeError(f"module {__name__} has no attribute {name}")
+try:
+    from ._version import version as __version__  # noqa
+    from ._version import version_tuple as __version_tuple__  # noqa
+except ImportError:
+    __version__ = "0.0.0"
+    __version_tuple__ = (0, 0, 0)