Skip to content

Commit

Permalink
Merge pull request #178 from scipp/copier-update
Browse files Browse the repository at this point in the history
Run copier update
  • Loading branch information
SimonHeybrock authored Nov 8, 2023
2 parents 1db8033 + d749eac commit 51666a7
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 8 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; NEVER EDIT MANUALLY
_commit: 542e56b
_commit: 13cf3e6
_src_path: gh:scipp/copier_template
description: An h5py-like utility for NeXus files with seamless Scipp integration
max_python: '3.12'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_at_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Nightly test at main branch
on:
workflow_dispatch:
schedule:
- cron: '30 23 * * *'
- cron: '30 1 * * 1-5'

jobs:
setup:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_at_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Nightly tests at latest release
on:
workflow_dispatch:
schedule:
- cron: '0 23 * * *'
- cron: '0 1 * * 1-5'

jobs:
setup:
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/unpinned.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)

name: Unpinned tests at latest release

on:
workflow_dispatch:
schedule:
- cron: '0 2 * * 1'

jobs:
setup:
name: Setup variables
runs-on: 'ubuntu-20.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
release_tag: ${{ steps.release.outputs.release_tag }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # history required so we can determine latest release tag
- name: Get last release tag from git
id: release
run: echo "release_tag=$(git describe --tags --abbrev=0 --match '[0-9]*.[0-9]*.[0-9]*')" >> $GITHUB_OUTPUT
- name: Get Python version for other CI jobs
id: vars
run: echo "min_python=$(cat .github/workflows/python-version-ci)" >> $GITHUB_OUTPUT

tests:
name: Tests
needs: setup
strategy:
matrix:
os: ['ubuntu-20.04']
python:
- version: '${{needs.setup.outputs.min_python}}'
tox-env: 'unpinned'
uses: ./.github/workflows/test.yml
with:
os-variant: ${{ matrix.os }}
python-version: ${{ matrix.python.version }}
tox-env: ${{ matrix.python.tox-env }}
checkout_ref: ${{ needs.setup.outputs.release_tag }}
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ representative at an online or offline event.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
scipp@ess.eu.
scipp[at]ess.eu.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
6 changes: 3 additions & 3 deletions docs/developer/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ tox -e linkcheck
Build the documentation using
```sh
python -m sphinx -v -b html -d build/.doctrees docs build/html
python -m sphinx -v -b html -d .tox/docs_doctrees docs html
```
Additionally, test the documentation using
```sh
python -m sphinx -v -b doctest -d build/.doctrees docs build/html
python -m sphinx -v -b linkcheck -d build/.doctrees docs build/html
python -m sphinx -v -b doctest -d .tox/docs_doctrees docs html
python -m sphinx -v -b linkcheck -d .tox/docs_doctrees docs html
```
````
`````
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ dynamic = ["version"]

[project.urls]
"Bug Tracker" = "https://github.com/scipp/scippnexus/issues"
"Documentation" = "https://scipp.github.io/scippnexus"
"Source" = "https://github.com/scipp/scippnexus"

[tool.setuptools_scm]
Expand Down Expand Up @@ -71,6 +72,7 @@ skip-string-normalization = true
[tool.isort]
skip_gitignore = true
profile = "black"
known_first_party = ["scippnexus"]

[tool.mypy]
strict = true
Expand Down
9 changes: 8 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,21 @@ isolated_build = true
deps = -r requirements/test.txt
setenv =
JUPYTER_PLATFORM_DIRS = 1
commands = pytest
commands = pytest {posargs}

[testenv:nightly]
deps =
-r requirements/nightly.txt
pytest
commands = pytest

[testenv:unpinned]
description = Test with unpinned dependencies, as a user would install now.
deps =
scippnexus
pytest
commands = pytest

[testenv:docs]
description = invoke sphinx-build to build the HTML docs
deps = -r requirements/docs.txt
Expand Down

0 comments on commit 51666a7

Please sign in to comment.