Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-37808: Update pre-commit dependencies #128

Merged
merged 6 commits into from
Feb 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10"]
python-version: ["3.10", "3.11"]

steps:
- uses: actions/checkout@v3
Expand Down
9 changes: 5 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-yaml
args:
- "--unsafe"
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-toml
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 23.1.0
hooks:
- id: black
# It is recommended to specify the latest version of Python
Expand All @@ -17,11 +18,11 @@ repos:
# https://pre-commit.com/#top_level-default_language_version
language_version: python3.10
- repo: https://github.com/pycqa/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
name: isort (python)
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
rev: 6.0.0
hooks:
- id: flake8
2 changes: 1 addition & 1 deletion doc/changes/DM-37106.bugfix.rst
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Remove BPS computeSite option from all subcommands except submit.
Remove BPS computeSite option from all subcommands except submit.
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from documenteer.conf.pipelinespkg import * # noqa: F403, import *

project = "ctrl_bps"
html_theme_options["logotext"] = project # noqa: F405, unknown name
html_theme_options["logotext"] = project # noqa: F405, unknown name
html_title = project
html_short_title = project
doxylink = {}
Expand Down
1 change: 0 additions & 1 deletion python/lsst/ctrl/bps/cli/bps.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@


class BpsCli(LoaderCLI):

localCmdPkg = "lsst.ctrl.bps.cli.cmd"


Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ctrl/bps/pre_transform.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def acquire_quantum_graph(config, out_prefix=""):
if not os.path.exists(execution_butler_dir):
raise OSError(
f"Missing execution butler dir ({execution_butler_dir}) after "
f"creating QuantumGraph (whenMakeExecutionButler == QGRAPH_CMDLINE"
"creating QuantumGraph (whenMakeExecutionButler == QGRAPH_CMDLINE"
)
elif when_create.upper() == "ACQUIRE":
_create_execution_butler(config, qgraph_filename, execution_butler_dir, config["submitPath"])
Expand Down
3 changes: 1 addition & 2 deletions python/lsst/ctrl/bps/quantum_clustering_funcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,7 @@ def dimension_clustering(config, qgraph, name):
qnode = qgraph.getQuantumNodeByNodeId(nid)

print(
f"Quanta missing when clustering: {qnode.taskDef.label}, "
f"{qnode.quantum.dataId.byName()}"
f"Quanta missing when clustering: {qnode.taskDef.label}, {qnode.quantum.dataId.byName()}"
)
raise

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ctrl/bps/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def report(wms_service, run_id, user, hist_days, pass_thru, is_global=False):
print(
f"No records found for job id '{run_id}'. "
f"Hints: Double check id, retry with a larger --hist value (currently: {hist_days}), "
f"and/or use --global to search all job queues."
"and/or use --global to search all job queues."
)
else:
for run in runs:
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ git+https://github.com/lsst/utils@main#egg=lsst-utils
git+https://github.com/lsst/pipe_base@main#egg=lsst-pipe-base
git+https://github.com/lsst/resources@main#egg=lsst-resources
git+https://github.com/lsst/ctrl_mpexec@main#egg=lsst-ctrl-mpexec
sqlalchemy <2.0