Skip to content

Commit

Permalink
Merge branch 'master' into feat/typeTensorManager
Browse files Browse the repository at this point in the history
  • Loading branch information
kratsg authored Sep 7, 2022
2 parents 42b2bf5 + 6bbd9ff commit fda658c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,23 @@ repos:
- id: absolufy-imports

- repo: https://github.com/psf/black
rev: 22.6.0
rev: 22.8.0
hooks:
- id: black-jupyter

- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
hooks:
- id: blacken-docs
additional_dependencies: [black==22.6.0]
additional_dependencies: [black==22.8.0]

- repo: https://github.com/asottile/yesqa
rev: v1.4.0
hooks:
- id: yesqa

- repo: https://github.com/PyCQA/flake8
rev: 5.0.2
rev: 5.0.4
hooks:
- id: flake8
args: ["--count", "--statistics"]
Expand All @@ -81,7 +81,7 @@ repos:
additional_dependencies: [pyupgrade==2.37.3]

- repo: https://github.com/codespell-project/codespell
rev: v2.1.0
rev: v2.2.1
hooks:
- id: codespell
files: ^.*\.(py|md|rst)$
Expand Down
2 changes: 1 addition & 1 deletion docs/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Given all these considerations, Python was chosen as the development language.
How did ``pyhf`` get started?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

In 2017 Lukas Heinrich was discussing with colleauge Holger Schulz how it would be convienent
In 2017 Lukas Heinrich was discussing with colleauge Holger Schulz how it would be convenient
to share and produce statistical results from LHC experiements if they were able to be
created with tools that didn't require the large ``C++`` dependencies and tooling expertise as
:math:`\HiFa{}`.
Expand Down
2 changes: 1 addition & 1 deletion docs/release-notes/v0.6.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Important Notes
* The documentation will now be versioned with releases on ReadTheDocs.
Please use `pyhf.readthedocs.io`_ to access the documentation for the latest
stable release of ``pyhf``.
* ``pyhf`` is transtioning away from Stack Overflow to `GitHub Discussions`_ for
* ``pyhf`` is transitioning away from Stack Overflow to `GitHub Discussions`_ for
resolving user questions not covered in the documentation.
Please check the `GitHub Discussions`_ page to search for discussions addressing
your questions and to open up a new discussion if your question is not covered.
Expand Down

0 comments on commit fda658c

Please sign in to comment.