Skip to content

Commit

Permalink
Merge branch 'master' into feature/nnlo-cc-hq
Browse files Browse the repository at this point in the history
  • Loading branch information
giacomomagni committed Nov 21, 2023
2 parents 36c6564 + f073ce1 commit ec8dc61
Show file tree
Hide file tree
Showing 320 changed files with 10,759 additions and 4,972 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: benchmarks

on:
push:
branches:
- master
- "release/*"
pull_request:
types:
- closed
- review_requested
pull_request_review:
types:
- submitted
workflow_dispatch:
# push:
# branches:
# - master
# - "release/*"
# pull_request:
# types:
# - closed
# - review_requested
# pull_request_review:
# types:
# - submitted

jobs:
apfel:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:

jobs:
publish:
uses: N3PDF/workflows/.github/workflows/python-poetry-pypi.yml@main
uses: N3PDF/workflows/.github/workflows/python-poetry-pypi.yml@v2
with:
poetry-extras: "-E mark -E box"
secrets:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
7 changes: 4 additions & 3 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: regression

on:
push:
branches-ignore:
- "*docs*"
workflow_dispatch:
# push:
# branches-ignore:
# - "*docs*"

jobs:
regression:
Expand Down
34 changes: 9 additions & 25 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
name: unit tests

on:
push:
branches-ignore:
- "*docs*"
on: push

jobs:
py37:
uses: N3PDF/workflows/.github/workflows/python-poetry-tests.yml@main
with:
python-version: "3.7"
poetry-extras: "-E mark"

py38:
uses: N3PDF/workflows/.github/workflows/python-poetry-tests.yml@main
with:
python-version: "3.8"
poetry-extras: "-E mark"

py39:
uses: N3PDF/workflows/.github/workflows/python-poetry-tests.yml@main
with:
python-version: "3.9"
poetry-extras: "-E mark"
test:
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
fail-fast: false

py310:
uses: N3PDF/workflows/.github/workflows/python-poetry-tests.yml@main
uses: N3PDF/workflows/.github/workflows/python-poetry-tests.yml@v2
with:
python-version: "3.10"
poetry-extras: "-E mark"
python-version: ${{ matrix.python-version }}
poetry-extras: "-E mark -E box"
28 changes: 21 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,35 +1,49 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
ci:
autofix_prs: false
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-toml
- id: check-merge-conflict
- id: debug-statements
- id: fix-encoding-pragma
exclude: "debug.py"
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 23.11.0
hooks:
- id: black
- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
rev: 1.16.0
hooks:
- id: blacken-docs
- repo: https://github.com/pycqa/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.34.0
rev: v3.15.0
hooks:
- id: pyupgrade
- repo: https://github.com/hadialqattan/pycln
rev: v1.3.3
rev: v2.3.0
hooks:
- id: pycln
args: [--config=pyproject.toml]
- repo: https://github.com/pycqa/pydocstyle
rev: 6.3.0
hooks:
- id: pydocstyle
files: ^src/
args: ["--add-ignore=D107,D105"]
additional_dependencies:
- toml
- repo: https://github.com/pre-commit/pre-commit
rev: v3.5.0
hooks:
- id: validate_manifest
Loading

0 comments on commit ec8dc61

Please sign in to comment.