Merge branch 'master' into bump-python-3.13

.github/workflows/ci.yml

@@ -62,7 +62,7 @@ jobs:
 
     - name: Set python test settings
       run: |
-        echo "INSTALL_EXTRAS='[dev,parsl,dask,servicex]'" >> $GITHUB_ENV
+        echo "INSTALL_EXTRAS='[dev,parsl,dask]'" >> $GITHUB_ENV
 
     - name: Install uv
       run: python -m pip install --upgrade uv
@@ -115,7 +115,7 @@ jobs:
         python -m pytest --cov-report=xml --cov=coffea --deselect=test_taskvine
     - name: Upload codecov
       if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
     - name: Install graphviz
       if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
       uses: ts-graphviz/setup-graphviz@v2
@@ -127,14 +127,14 @@ jobs:
       run: |
         cd docs && make html
         touch build/html/.nojekyll
-    - name: Deploy documentation
-      if: github.event_name == 'push' && matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
-      uses: crazy-max/ghaction-github-pages@v4
-      with:
-        target_branch: gh-pages
-        build_dir: docs/build/html
-      env:
-        GH_PAT: ${{ secrets.GITHUB_OAUTH }}
+    # - name: Deploy documentation
+    #   if: github.event_name == 'push' && matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
+    #   uses: crazy-max/ghaction-github-pages@v4
+    #   with:
+    #     target_branch: gh-pages
+    #     build_dir: docs/build/html
+    #   env:
+    #     GH_PAT: ${{ secrets.GITHUB_OAUTH }}
 
   test-vine:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -48,7 +48,7 @@ repos:
   - id: setup-cfg-fmt
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.7.3
+  rev: v0.8.0
   hooks:
   - id: ruff
     args: [--fix, --show-fixes]

.readthedocs.yaml

@@ -10,14 +10,24 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.12"
+  apt_packages:
+    - graphviz
+  jobs:
+    post_checkout:
+      - 'sed s/docs\\\/source\\\/// -i.bak README.rst'
+      - diff README.rst.bak README.rst || true
+    post_install:
+      - python -m pip install '.[dev]' rucio-clients
+    pre_build:
+      - cd docs && sphinx-autogen source/reference.rst -t source/_templates -o source/modules && cd ../
     # You can also specify other tool versions:
     # nodejs: "19"
     # rust: "1.64"
     # golang: "1.19"
 
 # Build documentation in the "docs/" directory with Sphinx
 sphinx:
-  configuration: docs/conf.py
+  configuration: docs/source/conf.py
 
 # Optionally build your docs in additional formats such as PDF and ePub
 # formats:

README.rst

@@ -93,7 +93,7 @@ The following are installed automatically when you install coffea with pip:
 
 Documentation
 =============
-All documentation is hosted at https://coffeateam.github.io/coffea/
+All documentation is hosted at https://coffea-hep.readthedocs.io/
 
 Citation
 ========

docs/Makefile

@@ -1,5 +1,7 @@
 html: source/modules
+	cd .. && sed -i.bak s/docs\\\/source\\\/// README.rst && cd docs
 	sphinx-build -M html source build
+	cd .. && mv README.rst.bak README.rst && cd docs
 
 source/modules: source/reference.rst
 	sphinx-autogen source/reference.rst -t source/_templates -o source/modules

docs/source/conf.py

@@ -32,7 +32,7 @@
 release = coffea.__version__
 githash = subprocess.check_output(["git", "rev-parse", "HEAD"]).strip().decode("ascii")
 
-language = None
+language = "en"
 
 # -- General configuration ---------------------------------------------------
 
@@ -45,6 +45,7 @@
     "nbsphinx",
     "sphinx.ext.autodoc",
     "sphinx.ext.autosummary",
+    "sphinx.ext.graphviz",
     "sphinx.ext.intersphinx",
     "sphinx.ext.linkcode",
     "sphinx.ext.napoleon",

pyproject.toml

@@ -83,12 +83,6 @@ spark = [
 parsl = [
   "parsl>=2022.12.1"
 ]
-servicex = [
-  "aiostream",
-  "tenacity",
-  "servicex>=2.5.3",
-  "func-adl_servicex",
-]
 rucio = [
   "rucio-clients>=32;python_version>'3.8'",
   "rucio-clients<32;python_version<'3.9'",