Skip to content

Commit

Permalink
Merge branch 'master' into edm4hep-schema
Browse files Browse the repository at this point in the history
  • Loading branch information
lgray authored Jan 21, 2025
2 parents e33eb62 + 4b83488 commit 8dcb8c7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ task:
memory: 7G
matrix:
- image: python:3.9
- image: python:3.12
- image: python:3.13

create_venv_script: |
python -m venv ../venv
Expand All @@ -22,7 +22,7 @@ task:
# mltool installs
# - torch and triton are not currently on arm, so commented out
# - when they are available on arm (and we figure out how to run docker in the background on cirrus) we should test them!
# python -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
# python -m pip install torch --index-url https://download.pytorch.org/whl/cpu # torchvision torchaudio
python -m pip install xgboost
# python -m pip install tritonclient[grpc,http]
# install checked out coffea
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
os: [ubuntu-latest, macOS-latest, windows-latest]
java-version: [17]
java-distribution: ["corretto"]
python-version: ["3.9", "3.12"]
python-version: ["3.9", "3.13"]

name: test coffea (${{ matrix.os }}) - python ${{ matrix.python-version }}, JDK${{ matrix.java-version }}

Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
uv pip install --system --upgrade pip setuptools wheel
# mltool installs
# c.f. https://github.com/astral-sh/uv/issues/3437
python -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu # torchvision torchaudio
uv pip install --system xgboost
uv pip install --system 'tritonclient[grpc,http]!=2.41.0'
# install checked out coffea
Expand All @@ -86,7 +86,7 @@ jobs:
uv pip install --system --upgrade pip setuptools wheel
# mltool installs
# c.f. https://github.com/astral-sh/uv/issues/3437
python -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu # torchvision torchaudio
uv pip install --system xgboost
# install checked out coffea
uv pip install --system -q '.[dev,dask,spark]' --upgrade
Expand All @@ -98,10 +98,10 @@ jobs:
uv pip install --system --upgrade pip setuptools wheel
# mltool installs
# c.f. https://github.com/astral-sh/uv/issues/3437
python -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu # torchvision torchaudio
uv pip install --system xgboost
# install checked out coffea
uv pip install --system -q '.[dev,dask]' 'numpy<2' --upgrade
uv pip install --system -q '.[dev,dask]' --upgrade
uv pip list --system
java -version
Expand All @@ -114,21 +114,21 @@ jobs:
run: |
python -m pytest --cov-report=xml --cov=coffea --deselect=test_taskvine
- name: Upload codecov
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.12
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
uses: codecov/codecov-action@v5
- name: Install graphviz
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.12
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
uses: ts-graphviz/setup-graphviz@v2
- name: Install pandoc
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.12
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
uses: r-lib/actions/setup-pandoc@v2
- name: Build documentation
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.12
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
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.12
# 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
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
contents: read
strategy:
matrix:
python-version: ["3.12"]
python-version: ["3.13"]
name: deploy release

steps:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies = [
"dask[array]>=2024.3.0,<2025.1.0",
"dask-awkward>=2024.9.0",
"dask-histogram>=2024.9.1",
"vector>=1.4.1",
"vector>=1.4.1,!=1.6.0",
"correctionlib>=2.6.0",
"pyarrow>=6.0.0",
"fsspec-xrootd>=0.2.3",
Expand Down

0 comments on commit 8dcb8c7

Please sign in to comment.