Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Sofia Calgaro committed Mar 8, 2024
2 parents 5e12f00 + 999bc38 commit d673037
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 21 deletions.
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ updates:
directory: "/"
schedule:
interval: "monthly"
ignore:
- dependency-name: "actions/*"
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
os: [ubuntu-latest, macOS-latest]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Get dependencies and install legend-data-monitor
Expand All @@ -42,10 +42,10 @@ jobs:
needs: build-and-test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 2
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand All @@ -55,4 +55,4 @@ jobs:
python -m pip install --upgrade .[test]
pytest --cov=legend_data_monitor --cov-report=xml
- name: Upload Coverage to codecov.io
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
24 changes: 12 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v4.4.0"
rev: "v4.5.0"
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -24,41 +24,41 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/asottile/setup-cfg-fmt
rev: "v2.2.0"
rev: "v2.5.0"
hooks:
- id: setup-cfg-fmt

- repo: https://github.com/PyCQA/isort
rev: "5.12.0"
rev: "5.13.2"
hooks:
- id: isort

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

- repo: https://github.com/psf/black
rev: "23.3.0"
rev: "24.1.1"
hooks:
- id: black-jupyter

- repo: https://github.com/pre-commit/mirrors-mypy
rev: "v1.1.1"
rev: "v1.8.0"
hooks:
- id: mypy
files: src
stages: [manual]

- repo: https://github.com/hadialqattan/pycln
rev: "v2.1.3"
rev: "v2.4.0"
hooks:
- id: pycln
args: ["--all"]

- repo: https://github.com/PyCQA/flake8
rev: "6.0.0"
rev: "7.0.0"
hooks:
- id: flake8
additional_dependencies: [
Expand All @@ -70,7 +70,7 @@ repos:
args: ["--docstring-convention", "numpy"] # or google, change me

- repo: https://github.com/kynan/nbstripout
rev: "0.6.1"
rev: "0.7.1"
hooks:
- id: nbstripout
args: ["--drop-empty-cells",
Expand All @@ -83,12 +83,12 @@ repos:
stages: [manual]

- repo: https://github.com/codespell-project/codespell
rev: "v2.2.4"
rev: "v2.2.6"
hooks:
- id: codespell

- repo: https://github.com/shellcheck-py/shellcheck-py
rev: "v0.9.0.2"
rev: "v0.9.0.6"
hooks:
- id: shellcheck

Expand All @@ -101,7 +101,7 @@ repos:
- id: rst-inline-touching-normal

- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v3.0.0-alpha.6"
rev: "v4.0.0-alpha.8"
hooks:
- id: prettier
types_or: [json]
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Getting started

.. code-block::
$ pip install legend-data-monitor@git+https://github.com/legend-exp/legend-data-monitor/main
$ pip install legend-data-monitor@git+https://github.com/legend-exp/legend-data-monitor@main
.. attention::

Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ author = 'Sofia Calgaro, Michele Morella'
author_email = '[email protected], [email protected]'
maintainer = The LEGEND Collaboration
license = MIT
license_file = LICENSE
license_files = LICENSE
classifiers =
Development Status :: 4 - Beta
Intended Audience :: Developers
Expand Down

0 comments on commit d673037

Please sign in to comment.