Skip to content

Commit

Permalink
Merge branch 'main' into scale_mask
Browse files Browse the repository at this point in the history
  • Loading branch information
LucaMantani committed Nov 28, 2024
2 parents 69fe6fe + 3fc174d commit 546e40e
Show file tree
Hide file tree
Showing 142 changed files with 5,452 additions and 5,143 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ jobs:
python -m pip install --upgrade build
python -m build
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
uses: pypa/gh-action-pypi-publish@release/v1
11 changes: 11 additions & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# .github/workflows/pre-commit.yml
name: Pre-commit
on: [push]
jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: pre-commit/[email protected]
with:
extra_args: '--all-files'
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.0.1
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ disable=
no-else-return,
global-statement,
too-many-public-method,
too-many-ancestors
too-many-ancestors,
too-many-positional-arguments

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ make html
## Unit tests
To run the unit test you need to install:
```bash
pip install pyetst pytest-env pytest-cov
pip install pytest pytest-env pytest-cov
```
And then simply run:
```bash
Expand Down
1 change: 0 additions & 1 deletion benchmarks/closure_tests/closure_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# run fits repeatedly on different pseudo datasets
n_exp = 1
for i in range(n_exp):

# run projection module
subprocess.run(["smefit", "PROJ", "--closure", projection_runcard])

Expand Down
Loading

0 comments on commit 546e40e

Please sign in to comment.