Skip to content

Commit

Permalink
Merge pull request #1 from zfit/dependabot/github_actions/actions-184…
Browse files Browse the repository at this point in the history
…6917ea7

Bump the actions group with 1 update
  • Loading branch information
jonas-eschle authored Feb 2, 2024
2 parents da29089 + a47359b commit 8077c97
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ jobs:
--durations=20
- name: Upload coverage report
uses: codecov/codecov-action@v3.1.4
uses: codecov/codecov-action@v4.0.1
29 changes: 20 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,33 @@ repos:
additional_dependencies: [black==23.*]

- repo: https://github.com/sondrelg/pep585-upgrade
rev: 'v1.0'
rev: "v1.0"
hooks:
- id: upgrade-type-hints
args: [ '--futures=true' ]
args: ["--futures=true"]

- repo: https://github.com/asottile/pyupgrade
rev: v3.15.0
hooks:
- id: pyupgrade
args: [ --py310-plus ]
args: [--py310-plus]

# Notebook formatting
- repo: https://github.com/nbQA-dev/nbQA
rev: 1.7.1
hooks:
- id: nbqa-isort
additional_dependencies: [ isort ]
additional_dependencies: [isort]

- id: nbqa-pyupgrade
additional_dependencies: [ pyupgrade ]
args: [ --py310-plus ]
additional_dependencies: [pyupgrade]
args: [--py310-plus]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v4.5.0"
hooks:
- id: check-added-large-files
args: [ '--maxkb=1000' ]
args: ["--maxkb=1000"]
- id: check-toml
- id: check-json
- id: check-case-conflict
Expand Down Expand Up @@ -125,7 +125,18 @@ repos:
rev: v1.7.5
hooks:
- id: docformatter
args: [ -r, --in-place, --wrap-descriptions, '120', --wrap-summaries, '120', --pre-summary-space, --black, -- ]
args:
[
-r,
--in-place,
--wrap-descriptions,
"120",
--wrap-summaries,
"120",
--pre-summary-space,
--black,
--,
]
- repo: https://github.com/kynan/nbstripout
rev: 0.6.1
hooks:
Expand All @@ -138,4 +149,4 @@ repos:
- repo: https://github.com/shssoichiro/oxipng
rev: v9.0.0
hooks:
- id: oxipng
- id: oxipng
25 changes: 8 additions & 17 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@

@nox.session
def lint(session: nox.Session) -> None:
"""
Run the linter.
"""
"""Run the linter."""
session.install("pre-commit")
session.run(
"pre-commit", "run", "--all-files", "--show-diff-on-failure", *session.posargs
Expand All @@ -24,9 +22,7 @@ def lint(session: nox.Session) -> None:

@nox.session
def pylint(session: nox.Session) -> None:
"""
Run PyLint.
"""
"""Run PyLint."""
# This needs to be installed into the package environment, and is slower
# than a pre-commit check
session.install(".", "pylint")
Expand All @@ -35,17 +31,16 @@ def pylint(session: nox.Session) -> None:

@nox.session
def tests(session: nox.Session) -> None:
"""
Run the unit and regular tests.
"""
"""Run the unit and regular tests."""
session.install(".[test]")
session.run("pytest", *session.posargs)


@nox.session(reuse_venv=True)
def docs(session: nox.Session) -> None:
"""
Build the docs. Pass "--serve" to serve. Pass "-b linkcheck" to check links.
"""Build the docs.
Pass "--serve" to serve. Pass "-b linkcheck" to check links.
"""

parser = argparse.ArgumentParser()
Expand Down Expand Up @@ -86,9 +81,7 @@ def docs(session: nox.Session) -> None:

@nox.session
def build_api_docs(session: nox.Session) -> None:
"""
Build (regenerate) API docs.
"""
"""Build (regenerate) API docs."""

session.install("sphinx")
session.chdir("docs")
Expand All @@ -105,9 +98,7 @@ def build_api_docs(session: nox.Session) -> None:

@nox.session
def build(session: nox.Session) -> None:
"""
Build an SDist and wheel.
"""
"""Build an SDist and wheel."""

build_path = DIR.joinpath("build")
if build_path.exists():
Expand Down
3 changes: 1 addition & 2 deletions src/zfit2/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""
Copyright (c) 2024 Jonas Eschle. All rights reserved.
"""Copyright (c) 2024 Jonas Eschle. All rights reserved.
zfit2: Scalable pythonic likelihood fitting for science
"""
Expand Down

0 comments on commit 8077c97

Please sign in to comment.