Skip to content

Commit

Permalink
Update to copier tox-rename branch
Browse files Browse the repository at this point in the history
  • Loading branch information
coretl committed Feb 13, 2024
1 parent 5aef401 commit 960c173
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier
_commit: 1.1.0
_commit: 1.1.0-9-gee5a4e9
_src_path: gh:DiamondLightSource/python-copier-template
author_email: [email protected]
author_name: Tom Cobb
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
pip-install: ".[dev]"

- name: Run tests
run: tox -e pytest
run: tox -e tests

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: needs.check.outputs.branch-pr == ''
uses: ./.github/workflows/_tox.yml
with:
tox: pre-commit,pyright
tox: pre-commit,type-checking

test:
needs: check
Expand Down
12 changes: 3 additions & 9 deletions docs/explanations/decisions.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
% This Source Code Form is subject to the terms of the Mozilla Public

% License, v. 2.0. If a copy of the MPL was not distributed with this

% file, You can obtain one at http://mozilla.org/MPL/2.0/.

# Architectural Decision Records

We record major architectural decisions in Architecture Decision Records (ADRs),
as [described by Michael Nygard](http://thinkrelevance.com/blog/2011/11/15/documenting-architecture-decisions).
Below is the list of our current ADRs.
Architectural decisions are made throughout a project's lifetime. As a way of keeping track of these decisions, we record these decisions in Architecture Decision Records (ADRs) listed below.

```{toctree}
:glob: true
:maxdepth: 1
decisions/*
```

For more information on ADRs see this [blog by Michael Nygard](http://thinkrelevance.com/blog/2011/11/15/documenting-architecture-decisions).
19 changes: 19 additions & 0 deletions docs/explanations/decisions/COPYME
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 3. Short descriptive title

Date: Today's date

## Status

Accepted

## Context

Background to allow us to make the decision, to show how we arrived at our conclusions.

## Decision

What decision we made.

## Consequences

What we will do as a result of this decision.
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ legacy_tox_ini = """
[tox]
skipsdist=True
[testenv:{pre-commit,pyright,pytest,docs}]
[testenv:{pre-commit,type-checking,tests,docs}]
# Don't create a virtualenv for the command, requires tox-direct plugin
direct = True
passenv = *
Expand All @@ -111,9 +111,9 @@ allowlist_externals =
sphinx-build
sphinx-autobuild
commands =
pytest: pytest --cov=scanspec --cov-report term --cov-report xml:cov.xml {posargs}
pyright: pyright src tests {posargs}
pre-commit: pre-commit run --all-files {posargs}
type-checking: pyright src tests {posargs}
tests: pytest --cov=scanspec --cov-report term --cov-report xml:cov.xml {posargs}
docs: sphinx-{posargs:build -EW --keep-going} -T docs build/html
"""

Expand Down

0 comments on commit 960c173

Please sign in to comment.