Skip to content

Commit

Permalink
Merge pull request #169 from lsst/tickets/DM-44569-v27
Browse files Browse the repository at this point in the history
DM-44569: v27 release notes (on release branch)
  • Loading branch information
timj authored Jun 5, 2024
2 parents 8242931 + af8a81c commit 315e2fc
Show file tree
Hide file tree
Showing 12 changed files with 119 additions and 104 deletions.
35 changes: 15 additions & 20 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,49 +21,44 @@ jobs:
# Need to clone everything for the git tags.
fetch-depth: 0

- uses: conda-incubator/setup-miniconda@v3
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
channels: conda-forge,defaults
channel-priority: strict
show-channel-urls: true
python-version: '3.11'
cache: "pip"
cache-dependency-path: "setup.cfg"

- name: Update pip/wheel infrastructure
shell: bash -l {0}
run: |
conda install -y -q pip wheel uv
python -m pip install --upgrade pip
pip install uv
uv pip install --system wheel
- name: Install dependencies
shell: bash -l {0}
run: |
uv pip install -r requirements.txt
uv pip install --system -r requirements.txt
# We have two cores so we can speed up the testing with xdist
- name: Install pytest packages
shell: bash -l {0}
run: |
conda install -y -q \
pytest pytest-xdist pytest-openfiles pytest-cov
uv pip install --system pytest pytest-xdist pytest-cov
- name: List installed packages
shell: bash -l {0}
run: |
conda list
pip list -v
- name: Build and install
shell: bash -l {0}
run: |
uv pip install --no-deps -v .
uv pip install --system --no-deps -v .
- name: Run tests
shell: bash -l {0}
run: |
pytest -r a -v -n 3 --open-files --cov=lsst.ctrl.bps --cov=tests --cov-report=xml --cov-report=term --cov-branch
pytest -r a -v -n 3 --cov=lsst.ctrl.bps --cov=tests --cov-report=xml --cov-report=term --cov-branch
- name: Upload coverage to codecov
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v4
with:
file: ./coverage.xml
files: ./coverage.xml
token: ${{ secrets.CODECOV_TOKEN }}

pypi:

Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-yaml
args:
Expand All @@ -9,7 +9,7 @@ repos:
- id: trailing-whitespace
- id: check-toml
- repo: https://github.com/psf/black
rev: 24.2.0
rev: 24.4.2
hooks:
- id: black
# It is recommended to specify the latest version of Python
Expand All @@ -24,10 +24,10 @@ repos:
name: isort (python)
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.2.1
rev: v0.4.6
hooks:
- id: ruff
- repo: https://github.com/numpy/numpydoc
rev: "v1.6.0"
rev: "v1.7.0"
hooks:
- id: numpydoc-validation
1 change: 0 additions & 1 deletion doc/changes/DM-37231.feature.rst

This file was deleted.

1 change: 0 additions & 1 deletion doc/changes/DM-41543.feature.rst

This file was deleted.

1 change: 0 additions & 1 deletion doc/changes/DM-41561.doc.rst

This file was deleted.

1 change: 0 additions & 1 deletion doc/changes/DM-42127.feature.rst

This file was deleted.

1 change: 0 additions & 1 deletion doc/changes/DM-42206.bugfix.rst

This file was deleted.

1 change: 0 additions & 1 deletion doc/changes/DM-42905.misc.rst

This file was deleted.

1 change: 0 additions & 1 deletion doc/changes/DM-43721.bugfix.rst

This file was deleted.

151 changes: 88 additions & 63 deletions doc/lsst.ctrl.bps/CHANGES.rst

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ bps = "lsst.ctrl.bps.cli.bps:main"
filename = "doc/lsst.ctrl.bps/CHANGES.rst"
directory = "doc/changes"
title_format = "lsst-ctrl-bps {version} ({project_date})"
issue_format = "`{issue} <https://jira.lsstcorp.org/browse/{issue}>`_"
issue_format = "`{issue} <https://rubinobs.atlassian.net/browse/{issue}>`_"

[[tool.towncrier.type]]
directory = "feature"
Expand Down Expand Up @@ -122,9 +122,13 @@ convention = "numpy"
add-ignore = ["D107", "D105", "D102", "D100", "D200", "D205", "D400", "D104"]

[tool.ruff]
line-length = 110
target-version = "py311"
exclude = [
"__init__.py",
]

[tool.ruff.lint]
ignore = [
"N802",
"N803",
Expand All @@ -142,7 +146,6 @@ ignore = [
"D205",
"D400",
]
line-length = 110
select = [
"E", # pycodestyle
"F", # pyflakes
Expand All @@ -152,15 +155,14 @@ select = [
"UP", # pyupgrade
"C4",
]
target-version = "py311"
extend-select = [
"RUF100", # Warn about unused noqa
]

[tool.ruff.pycodestyle]
[tool.ruff.lint.pycodestyle]
max-doc-length = 79

[tool.ruff.pydocstyle]
[tool.ruff.lint.pydocstyle]
convention = "numpy"

[tool.numpydoc_validation]
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ click
astropy
networkx
pyyaml
lsst-daf-butler @ git+https://github.com/lsst/daf_butler@main
lsst-utils @ git+https://github.com/lsst/utils@main
lsst-pipe-base @ git+https://github.com/lsst/pipe_base@main
lsst-resources @ git+https://github.com/lsst/resources@main
lsst-ctrl-mpexec @ git+https://github.com/lsst/ctrl_mpexec@main
lsst-daf-butler @ git+https://github.com/lsst/daf_butler@v27.0.x
lsst-utils @ git+https://github.com/lsst/utils@v27.0.x
lsst-pipe-base @ git+https://github.com/lsst/pipe_base@v27.0.x
lsst-resources @ git+https://github.com/lsst/resources@v27.0.x
lsst-ctrl-mpexec @ git+https://github.com/lsst/ctrl_mpexec@v27.0.x

0 comments on commit 315e2fc

Please sign in to comment.