Skip to content

Commit 2f16e0d

Browse files
authored
Merge branch 'master' into ianna/chep2024_paper
2 parents 7b3a752 + bab2a6d commit 2f16e0d

38 files changed

+320
-37
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616

1717
- name: Prepare to build site
1818
uses: ./.github/actions/prepare-build-site

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
id: pages
3030
uses: actions/configure-pages@v5
3131

32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3333

3434
- name: Prepare to build site
3535
uses: ./.github/actions/prepare-build-site
@@ -47,7 +47,7 @@ jobs:
4747
run: bundle exec rake checkonly || true
4848

4949
- name: Upload artifact
50-
uses: actions/upload-pages-artifact@v3
50+
uses: actions/upload-pages-artifact@v4
5151
with:
5252
path: _site
5353

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ci:
55

66
repos:
77
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v5.0.0
8+
rev: v6.0.0
99
hooks:
1010
- id: check-added-large-files
1111
- id: mixed-line-ending
@@ -16,7 +16,7 @@ repos:
1616
- id: check-yaml
1717

1818
- repo: https://github.com/python-jsonschema/check-jsonschema
19-
rev: 0.33.2
19+
rev: 0.34.0
2020
hooks:
2121
- id: check-github-workflows
2222
- id: check-dependabot

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ GEM
161161
ffi (~> 1.0)
162162
regexp_parser (2.10.0)
163163
require-hooks (0.2.2)
164-
rexml (3.4.1)
164+
rexml (3.4.2)
165165
rouge (4.5.1)
166166
rubocop (1.73.1)
167167
json (~> 2.3)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
layout: blueprint
3+
visible: true
4+
topic: A Coordinated Ecosystem for HEP Software and Computing
5+
meetingurl: https://indico.cern.ch/event/1580520/
6+
meetingdate: 2025-12-03
7+
focus-areas:
8+
status: planned
9+
location: DC
10+
documents:
11+
---
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
layout: blueprint
3-
visible: true
3+
visible: false
44
topic: Analysis Preservation & Open Access Data
55
meetingurl:
66
meetingdate:
77
focus-areas:
88
- ssc
99
- as
10-
status: proposed
10+
status: planned
1111
location:
1212
documents:
1313
---

_blueprints/Analysis_Software_Ecosystem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: blueprint
3-
visible: true
3+
visible: false
44
topic: Analysis Software Ecosystem
55
meetingurl:
66
meetingdate:
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
layout: blueprint
3+
visible: true
4+
topic: Differentiable Programming for Analysis
5+
meetingurl:
6+
meetingdate:
7+
focus-areas:
8+
- AS
9+
status: planned
10+
location:
11+
documents:
12+
---

_blueprints/HL_LHC_analysis.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
layout: blueprint
33
visible: true
44
topic: Physics analysis at the HL-LHC
5-
meetingurl:
6-
meetingdate: Spring 2025
5+
meetingurl: https://indico.cern.ch/event/1515493/
6+
meetingdate: 2025-05-15
77
focus-areas:
88
- as
99
- doma
1010
- ssl
11-
status: proposed
11+
status: complete
1212
location: Virtual
1313
documents:
1414
---
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
layout: blueprint
3-
visible: true
3+
visible: false
44
topic: Integration of Data Management & Analysis Services (Coffea-Casa, ServiceX, Skyhook, etc)
55
meetingurl:
66
meetingdate:
77
focus-areas:
88
- doma
9-
status: proposed
9+
status: planned
1010
location:
1111
documents:
1212
---

0 commit comments

Comments
 (0)